yinhao 4 anos atrás
pai
commit
2f5e9df07d
49 arquivos alterados com 245 adições e 68 exclusões
  1. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowCopulationController.java
  2. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java
  3. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowNonpregnantController.java
  4. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowOestrusController.java
  5. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenHumidityController.java
  6. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenTemperatureController.java
  7. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPredeliveryController.java
  8. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPregnancyTestController.java
  9. 2 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowStateController.java
  10. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowWaterController.java
  11. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MTransferChildcareController.java
  12. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MTransferFattenController.java
  13. 1 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowCopulationEntity.java
  14. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowCopulationEntityRepo.java
  15. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowHeatRepository.java
  16. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowNonpregnantEntityRepo.java
  17. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowOestrusEntityRepo.java
  18. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenHumidityRepository.java
  19. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenTemperatureRepository.java
  20. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPredeliveryEntityRepo.java
  21. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPregnancyTestEntityRepo.java
  22. 7 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowStateEntityRepo.java
  23. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowWaterRepository.java
  24. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MTransferChildcareEntityRepo.java
  25. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MTransferFattenEntityRepo.java
  26. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowCopulationService.java
  27. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowHeatService.java
  28. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowNonpreganService.java
  29. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowOestrusService.java
  30. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPigpenHumidityService.java
  31. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPigpenTemperatureService.java
  32. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPredeliveryService.java
  33. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPregnancyTestService.java
  34. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowStateService.java
  35. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowWaterService.java
  36. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MTransferChildcareService.java
  37. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MTransferFattentService.java
  38. 20 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowCopulationServiceImpl.java
  39. 9 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowHeatServiceImpl.java
  40. 16 7
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowNonpreganServiceImpl.java
  41. 11 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowOestrusServiceImpl.java
  42. 11 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPigpenHumidityServiceImpl.java
  43. 11 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPigpenTemperatureServiceImpl.java
  44. 12 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPredeliveryServiceImpl.java
  45. 11 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPregnancyTestServiceImpl.java
  46. 11 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowStateServiceImpl.java
  47. 12 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowWaterServiceImpl.java
  48. 9 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MTransferChildcareServiceImpl.java
  49. 9 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MTransferFattentServiceImpl.java

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowCopulationController.java

@@ -40,8 +40,8 @@ public class MSowCopulationController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
 }

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java

@@ -26,7 +26,9 @@ public class MSowHeatController {
 	public Result update(MSowHeat childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+	public Result findAll(String name ,Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 	@RequestMapping("/findAllBy")
 	public Result findAllBy(String sowId){ return service.findAllBy(sowId); }

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowNonpregnantController.java

@@ -41,8 +41,8 @@ public class MSowNonpregnantController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
     @RequestMapping("/findAllBy")

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowOestrusController.java

@@ -41,8 +41,8 @@ public class MSowOestrusController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
     @RequestMapping("/findAllBy")

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenHumidityController.java

@@ -26,6 +26,8 @@ public class MSowPigpenHumidityController {
 	public Result update(MSowPigpenHumidity childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+	public Result findAll(String name ,Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 }

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenTemperatureController.java

@@ -26,6 +26,8 @@ public class MSowPigpenTemperatureController {
 	public Result update(MSowPigpenTemperature childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+	public Result findAll(String name ,Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 }

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPredeliveryController.java

@@ -41,8 +41,8 @@ public class MSowPredeliveryController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
     @RequestMapping("/findAllBy")

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPregnancyTestController.java

@@ -40,8 +40,8 @@ public class MSowPregnancyTestController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
 }

+ 2 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowStateController.java

@@ -40,8 +40,7 @@ public class MSowStateController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
-
 }

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowWaterController.java

@@ -26,6 +26,8 @@ public class MSowWaterController {
 	public Result update(MSowWater childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+	public Result findAll(String name ,Integer pageNum , Integer pageSize){
+		return service.findAll(name,pageNum,pageSize);
+	}
 
 }

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MTransferChildcareController.java

@@ -39,8 +39,8 @@ public class MTransferChildcareController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
     @RequestMapping("/findAllBy")

+ 2 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MTransferFattenController.java

@@ -41,8 +41,8 @@ public class MTransferFattenController {
     }
 
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
     @RequestMapping("/findAllBy")

+ 1 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/domain/MSowCopulationEntity.java

@@ -14,8 +14,7 @@ public class MSowCopulationEntity implements Serializable {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "id", nullable = false)
-    private Integer id;
+    @Column(name = "id", nullable = false)private Integer id;
 
     @Column(name = "sow_code")
     private String sowCode;

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowCopulationEntityRepo.java

@@ -1,8 +1,10 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSowCopulationEntity;
+import com.huimv.production.domain.MSowFeed;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -10,4 +12,7 @@ public interface MSowCopulationEntityRepo extends JpaRepository<MSowCopulationEn
 
     List findAllBySowCode(String sowCode);
 
+    @Query(nativeQuery = true ,value = "select * from m_sow_copulation where sow_code like %?1% limit ?2 , ?3")
+    List<MSowCopulationEntity> findAll(String name , Integer startPage , Integer pageSize);
+
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowHeatRepository.java

@@ -1,8 +1,10 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowHeat;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -10,4 +12,7 @@ public interface MSowHeatRepository extends JpaRepository<MSowHeat, Integer>,Jpa
 
     List findAllBySowCode(String sowCode);
 
+    @Query(nativeQuery = true ,value = "select * from m_sow_feed where animal_heat like %?1% limit ?2 , ?3")
+    List<MSowHeat> findAll(String name , Integer startPage , Integer pageSize);
+
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowNonpregnantEntityRepo.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowNonpregnantEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowNonpregnantEntityRepo extends JpaRepository<MSowNonpregnantEntity, Integer>, JpaSpecificationExecutor<MSowNonpregnantEntity> {
 
     List<MSowNonpregnantEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_nonpregnant where sow_code like %?1% limit ?2 , ?3")
+    List<MSowNonpregnantEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowOestrusEntityRepo.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowOestrusEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowOestrusEntityRepo extends JpaRepository<MSowOestrusEntity, Integer>, JpaSpecificationExecutor<MSowOestrusEntity> {
 
     List<MSowOestrusEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_oestrus where location like %?1% limit ?2 , ?3")
+    List<MSowOestrusEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenHumidityRepository.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPigpenHumidity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowPigpenHumidityRepository extends JpaRepository<MSowPigpenHumidity, Integer>,JpaSpecificationExecutor<MSowPigpenHumidity>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_pigpen_humidity where sow_code like %?1% limit ?2 , ?3")
+    List<MSowPigpenHumidity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPigpenTemperatureRepository.java

@@ -1,8 +1,10 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPigpenTemperature;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
@@ -10,4 +12,7 @@ public interface MSowPigpenTemperatureRepository extends JpaRepository<MSowPigpe
 
     List findAllByLocationId(Integer locationId);
 
+    @Query(nativeQuery = true ,value = "select * from m_sow_pigpen_temperature where sow_code like %?1% limit ?2 , ?3")
+    List<MSowPigpenTemperature> findAll(String name , Integer startPage , Integer pageSize);
+
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPredeliveryEntityRepo.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPredeliveryEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowPredeliveryEntityRepo extends JpaRepository<MSowPredeliveryEntity, Integer>, JpaSpecificationExecutor<MSowPredeliveryEntity> {
 
     List<MSowPredeliveryEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_predelivery where location like %?1% limit ?2 , ?3")
+    List<MSowPredeliveryEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowPregnancyTestEntityRepo.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPregnancyTestEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowPregnancyTestEntityRepo extends JpaRepository<MSowPregnancyTestEntity, Integer>, JpaSpecificationExecutor<MSowPregnancyTestEntity> {
     List findAllBySowCode(String sowCode);
 
+    @Query(nativeQuery = true ,value = "select * from m_sow_pregnancy_test where sow_code like %?1% or result like %?1% limit ?2 , ?3")
+    List<MSowPregnancyTestEntity> findAll(String name , Integer startPage , Integer pageSize);
+
 }

+ 7 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowStateEntityRepo.java

@@ -1,9 +1,16 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowStateEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
 
 public interface MSowStateEntityRepo extends JpaRepository<MSowStateEntity, Integer>, JpaSpecificationExecutor<MSowStateEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_sow_state where gravidity_birth like %?1% limit ?2 , ?3")
+    List<MSowStateEntity> findAll(String name , Integer startPage , Integer pageSize);
+
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowWaterRepository.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowWater;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MSowWaterRepository extends JpaRepository<MSowWater, Integer>,JpaSpecificationExecutor<MSowWater>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_water where sow_code like %?1% limit ?2 , ?3")
+    List<MSowWater> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MTransferChildcareEntityRepo.java

@@ -1,13 +1,18 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MTransferChildcareEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MTransferChildcareEntityRepo extends JpaRepository<MTransferChildcareEntity, Integer>, JpaSpecificationExecutor<MTransferChildcareEntity> {
 
     List<MTransferChildcareEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_transfer_childcare where location like %?1% limit ?2 , ?3")
+    List<MTransferChildcareEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 5 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MTransferFattenEntityRepo.java

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MTransferFattenEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
 public interface MTransferFattenEntityRepo extends JpaRepository<MTransferFattenEntity, Integer>, JpaSpecificationExecutor<MTransferFattenEntity> {
 
     List<MTransferFattenEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_transfer_fatten where location like %?1% limit ?2 , ?3")
+    List<MTransferFattenEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowCopulationService.java

@@ -19,6 +19,6 @@ public interface MSowCopulationService {
 
     Result update(MSowCopulationEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowHeatService.java

@@ -15,7 +15,7 @@ public interface MSowHeatService  {
    Result update(MSowHeat entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy(String sowId);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowNonpreganService.java

@@ -20,7 +20,7 @@ public interface MSowNonpreganService {
 
     Result update(MSowNonpregnantEntity mSowNonpregnantEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowOestrusService.java

@@ -20,7 +20,7 @@ public interface MSowOestrusService {
 
     Result update(MSowOestrusEntity sowOestrusEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPigpenHumidityService.java

@@ -15,5 +15,5 @@ public interface MSowPigpenHumidityService  {
    Result update(MSowPigpenHumidity entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPigpenTemperatureService.java

@@ -15,5 +15,5 @@ public interface MSowPigpenTemperatureService  {
    Result update(MSowPigpenTemperature entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPredeliveryService.java

@@ -20,7 +20,7 @@ public interface MSowPredeliveryService {
 
     Result update(MSowPredeliveryEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowPregnancyTestService.java

@@ -20,6 +20,6 @@ public interface MSowPregnancyTestService {
 
     Result update(MSowPregnancyTestEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowStateService.java

@@ -20,6 +20,6 @@ public interface MSowStateService {
 
     Result update(MSowStateEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSowWaterService.java

@@ -15,5 +15,5 @@ public interface MSowWaterService  {
    Result update(MSowWater entity);
 
    //查询
-   Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MTransferChildcareService.java

@@ -19,7 +19,7 @@ public interface MTransferChildcareService {
 
     Result update(MTransferChildcareEntity childcareEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 1 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MTransferFattentService.java

@@ -20,7 +20,7 @@ public interface MTransferFattentService {
 
     Result update(MTransferFattenEntity fattenEntity);
 
-    Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

+ 20 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowCopulationServiceImpl.java

@@ -1,13 +1,24 @@
 package com.huimv.production.service.impl;
 
+import com.alibaba.druid.util.StringUtils;
+import com.huimv.production.domain.BaoyvCount;
 import com.huimv.production.domain.MSowCopulationEntity;
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.repo.MSowCopulationEntityRepo;
 import com.huimv.production.result.Result;
 import com.huimv.production.service.MSowCopulationService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.stereotype.Service;
 
+import javax.persistence.criteria.Predicate;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -64,10 +75,16 @@ public class MSowCopulationServiceImpl implements MSowCopulationService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowCopulationEntity> all = childcareEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MSowCopulationEntity> all = childcareEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
+            return new Result(10000,"查询成功",map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 9 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowHeatServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowHeat;
 import com.huimv.production.repo.MSowHeatRepository;
 import com.huimv.production.repo.MSowLivenessRepository;
@@ -61,9 +62,15 @@ public class MSowHeatServiceImpl implements MSowHeatService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSowHeat> all = rep.findAll();
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<MSowHeat> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
 			return new Result(10000, ResultStatus.findSuccess,all);
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);

+ 16 - 7
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowNonpreganServiceImpl.java

@@ -1,9 +1,11 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowNonpregnantEntity;
 import com.huimv.production.domain.MTransferFattenEntity;
 import com.huimv.production.repo.MSowNonpregnantEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MSowNonpreganService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -67,13 +69,20 @@ public class MSowNonpreganServiceImpl implements MSowNonpreganService {
     }
 
     @Override
-    public Result findAll() {
-        try {
-            List<MSowNonpregnantEntity> all = nonpregnantEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
-        }catch (Exception e){
-            return new Result(10001,"查询失败",null);
-        }
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
+//		try {
+        Map map = new HashMap();
+        int size = nonpregnantEntityRepo.findAll().size() ;
+        Integer startPage = (pageNum-1) * pageSize;
+        List<MSowNonpregnantEntity> all = nonpregnantEntityRepo.findAll(name,startPage,pageSize);
+        map.put("total",size);
+        map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+        map.put("data",all);
+
+        return new Result(10000, ResultStatus.findSuccess,map);
+//		}catch (Exception e){
+//			return new Result(10001,ResultStatus.findFailed,null);
+//		}
     }
 
     @Override

+ 11 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowOestrusServiceImpl.java

@@ -1,9 +1,11 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowOestrusEntity;
 import com.huimv.production.domain.MTransferFattenEntity;
 import com.huimv.production.repo.MSowOestrusEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MSowOestrusService;
 import com.huimv.production.service.MTransferChildcareService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,10 +70,16 @@ public class MSowOestrusServiceImpl implements MSowOestrusService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowOestrusEntity> all = mSowOestrusEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = mSowOestrusEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MSowOestrusEntity> all = mSowOestrusEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
+            return new Result(10000, ResultStatus.findSuccess,map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 11 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPigpenHumidityServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPigpenHumidity;
 import com.huimv.production.repo.MSowPigpenHumidityRepository;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSowPigpenHumidityService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class MSowPigpenHumidityServiceImpl implements MSowPigpenHumidityService {
@@ -58,9 +61,15 @@ public class MSowPigpenHumidityServiceImpl implements MSowPigpenHumidityService
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSowPigpenHumidity> all = rep.findAll();
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<MSowPigpenHumidity> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
 			return new Result(10000, ResultStatus.findSuccess,all);
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);

+ 11 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPigpenTemperatureServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPigpenTemperature;
 import com.huimv.production.repo.MSowPigpenTemperatureRepository;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSowPigpenTemperatureService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class MSowPigpenTemperatureServiceImpl implements MSowPigpenTemperatureService {
@@ -58,9 +61,15 @@ public class MSowPigpenTemperatureServiceImpl implements MSowPigpenTemperatureSe
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSowPigpenTemperature> all = rep.findAll();
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<MSowPigpenTemperature> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
 			return new Result(10000, ResultStatus.findSuccess,all);
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);

+ 12 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPredeliveryServiceImpl.java

@@ -1,10 +1,12 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPredeliveryEntity;
 import com.huimv.production.domain.MTransferFattenEntity;
 import com.huimv.production.repo.MSowPredeliveryEntityRepo;
 import com.huimv.production.repo.MSowPredeliveryEntityRepo;
 import com.huimv.production.result.Result;
+import com.huimv.production.result.ResultStatus;
 import com.huimv.production.service.MSowPredeliveryService;
 import com.huimv.production.service.MTransferFattentService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -69,10 +71,17 @@ public class MSowPredeliveryServiceImpl implements MSowPredeliveryService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowPredeliveryEntity> all = fattenEntityRepo.findAll();
-            return new Result(10000,"查询成功",all);
+            Map map = new HashMap();
+            int size = fattenEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MSowPredeliveryEntity> all = fattenEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
+
+            return new Result(10000, ResultStatus.findSuccess,map);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);
         }

+ 11 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowPregnancyTestServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowPregnancyTestEntity;
 import com.huimv.production.repo.MSowPregnancyTestEntityRepo;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSowService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -65,9 +68,15 @@ public class MSowPregnancyTestServiceImpl implements MSowPregnancyTestService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowPregnancyTestEntity> all = childcareEntityRepo.findAll();
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MSowPregnancyTestEntity> all = childcareEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
             return new Result(10000,"查询成功",all);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);

+ 11 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowStateServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowStateEntity;
 import com.huimv.production.repo.MSowStateEntityRepo;
 import com.huimv.production.repo.MSowStateEntityRepo;
@@ -9,7 +10,9 @@ import com.huimv.production.service.MSowStateService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Project : huimv.shiwan
@@ -66,9 +69,15 @@ public class MSowStateServiceImpl implements MSowStateService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MSowStateEntity> all = childcareEntityRepo.findAll();
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MSowStateEntity> all = childcareEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
             return new Result(10000,"查询成功",all);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);

+ 12 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MSowWaterServiceImpl.java

@@ -1,5 +1,6 @@
 package com.huimv.production.service.impl;
 
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MSowWater;
 import com.huimv.production.repo.MSowWaterRepository;
 import com.huimv.production.result.Result;
@@ -8,7 +9,9 @@ import com.huimv.production.service.MSowWaterService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Service
 public class MSowWaterServiceImpl implements MSowWaterService {
@@ -58,10 +61,16 @@ public class MSowWaterServiceImpl implements MSowWaterService {
 	}
 
 	@Override
-	public Result findAll() {
+	public Result findAll(String name ,Integer pageNum , Integer pageSize) {
 		try {
-			List<MSowWater> all = rep.findAll();
-			return new Result(10000, ResultStatus.findSuccess,all);
+			Map map = new HashMap();
+			int size = rep.findAll().size() ;
+			Integer startPage = (pageNum-1) * pageSize;
+			List<MSowWater> all = rep.findAll(name,startPage,pageSize);
+			map.put("total",size);
+			map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+			map.put("data",all);
+			return new Result(10000,ResultStatus.findSuccess,map);
 		}catch (Exception e){
 			return new Result(10001, ResultStatus.findFailed,null);
 		}

+ 9 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MTransferChildcareServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MTransferChildcareEntity;
 import com.huimv.production.repo.MTransferChildcareEntityRepo;
 import com.huimv.production.result.Result;
@@ -68,9 +69,15 @@ public class MTransferChildcareServiceImpl implements MTransferChildcareService
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MTransferChildcareEntity> all = childcareEntityRepo.findAll();
+            Map map = new HashMap();
+            int size = childcareEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MTransferChildcareEntity> all = childcareEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
             return new Result(10000,"查询成功",all);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);

+ 9 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/impl/MTransferFattentServiceImpl.java

@@ -1,6 +1,7 @@
 package com.huimv.production.service.impl;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowFeed;
 import com.huimv.production.domain.MTransferFattenEntity;
 import com.huimv.production.repo.MTransferFattenEntityRepo;
 import com.huimv.production.result.Result;
@@ -68,9 +69,15 @@ public class MTransferFattentServiceImpl implements MTransferFattentService {
     }
 
     @Override
-    public Result findAll() {
+    public Result findAll(String name ,Integer pageNum , Integer pageSize) {
         try {
-            List<MTransferFattenEntity> all = fattenEntityRepo.findAll();
+            Map map = new HashMap();
+            int size = fattenEntityRepo.findAll().size() ;
+            Integer startPage = (pageNum-1) * pageSize;
+            List<MTransferFattenEntity> all = fattenEntityRepo.findAll(name,startPage,pageSize);
+            map.put("total",size);
+            map.put("totalPageNum",(size  +  pageSize  - 1) / pageSize);
+            map.put("data",all);
             return new Result(10000,"查询成功",all);
         }catch (Exception e){
             return new Result(10001,"查询失败",null);