Ver Fonte

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowHeatController.java
#	huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenHumidityController.java
#	huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowPigpenTemperatureController.java
#	huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowWaterController.java
yinhao há 4 anos atrás
pai
commit
6d18d8160a
100 ficheiros alterados com 410 adições e 103 exclusões
  1. 6 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BLaborRoomStateController.java
  2. 5 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BaoyvCountController.java
  3. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexAllController.java
  4. 8 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexBoardController.java
  5. 10 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexParameterController.java
  6. 10 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MAnimalHeatWarningController.java
  7. 8 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthProgressController.java
  8. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthRatioController.java
  9. 8 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthTimesController.java
  10. 4 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MCleanTimesController.java
  11. 2 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MConceptionRatioController.java
  12. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MElectricQuantityController.java
  13. 5 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MFattenAreaController.java
  14. 3 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MIncubatorHeatController.java
  15. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MLaborRomStateController.java
  16. 3 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MLaborRoomHeatController.java
  17. 4 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java
  18. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenHumidityController.java
  19. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigPigpenTemperatureController.java
  20. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigWaterController.java
  21. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletHealthCountController.java
  22. 2 3
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletLiveController.java
  23. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigletLiveRatioController.java
  24. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPlanImmunityController.java
  25. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPurchasePlanController.java
  26. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MResstrusRatioController.java
  27. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDayController.java
  28. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleDetailController.java
  29. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleMonthController.java
  30. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSaleYearController.java
  31. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartCountController.java
  32. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSmartWeightController.java
  33. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAblactationController.java
  34. 2 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAnimalHeatController.java
  35. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MSowAreaController.java
  36. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/SowCountController.java
  37. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/YvfeiCountController.java
  38. 2 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/BaoyvCountRepository.java
  39. 4 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexAllEntityRepository.java
  40. 8 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexBoardEntityRepository.java
  41. 8 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexParameterEntityRepository.java
  42. 8 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MAnimalHeatWarningEntityRepo.java
  43. 7 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MChildbirthProgressEntityRepo.java
  44. 9 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MChildbirthRatioEntityRepo.java
  45. 7 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MChildbirthTimesEntityRepo.java
  46. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MCleanTimesRepository.java
  47. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MConceptionRatioEntityRepo.java
  48. 8 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MElectricQuantityRepository.java
  49. 11 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MFattenAreaRepository.java
  50. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MIncubatorHeatEntityRepo.java
  51. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MLaborRomStateEntityRepo.java
  52. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MLaborRoomHeatEntityRepo.java
  53. 10 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MLaborRoomStateEntityRepo.java
  54. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenHumidityRepository.java
  55. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigPigpenTemperatureRepository.java
  56. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigWaterRepository.java
  57. 7 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletHealthCountEntityRepo.java
  58. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveEntityRepo.java
  59. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveRatioEntityRepo.java
  60. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPlanImmunityEntityRepo.java
  61. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPurchasePlanEntityRepo.java
  62. 6 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MReestrusRatioEntityRepo.java
  63. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDayRepository.java
  64. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDetailRepository.java
  65. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleMonthRepository.java
  66. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleYearRepository.java
  67. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartCountRepository.java
  68. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSmartWeightRepository.java
  69. 5 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAblactationEntityRepo.java
  70. 4 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAnimalHeatEntityRepo.java
  71. 9 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAreaRepository.java
  72. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/BLaborRoomStateService.java
  73. 4 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/BaoyvCountService.java
  74. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/IndexAllService.java
  75. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/IndexBoardService.java
  76. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/IndexParameterService.java
  77. 3 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MAnimalHeatWarningService.java
  78. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MChildbirthProgressService.java
  79. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MChildbirthRatioService.java
  80. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MChildbirthTimesService.java
  81. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MCleanTimesService.java
  82. 2 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MConceptionRatioService.java
  83. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MElectricQuantityService.java
  84. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MFattenAreaService.java
  85. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MIncubatorHeatService.java
  86. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MLaborRomStateService.java
  87. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MLaborRoomHeatService.java
  88. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenHumidityService.java
  89. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigPigpenTemperatureService.java
  90. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigWaterService.java
  91. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletHealthCountService.java
  92. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveRatioService.java
  93. 1 2
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPigletLiveService.java
  94. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPlanImmunityService.java
  95. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MPurchasePlanService.java
  96. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MResstrusRatioService.java
  97. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDayService.java
  98. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleDetailService.java
  99. 1 1
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleMonthService.java
  100. 0 0
      huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleYearService.java

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

@@ -31,7 +31,11 @@ public class BLaborRoomStateController {
     @RequestMapping("/update")
     public Result update(BLaborRoomStateEntity childcareEntity){ return childcareService.update(childcareEntity); }
 
-    @RequestMapping("/findAll")
-    public Result findAll(){ return childcareService.findAll(); }
+    /*@RequestMapping("/findAll")
+    public Result findAll(){ return childcareService.findAll(); }*/
 
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
+    }
 }

+ 5 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/BaoyvCountController.java

@@ -24,8 +24,12 @@ public class BaoyvCountController {
 	@RequestMapping("/update")
 	public Result update(BaoyvCount 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("/findAllById")
 	public Result findAllById(Integer id){ return service.findAllById(id); }

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/IndexAllController.java

@@ -31,9 +31,14 @@ public class IndexAllController {
         return allService.update(allEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return allService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return allService.findAll(name,pageNum,pageSize);
     }
 
 }

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

@@ -38,8 +38,14 @@ public class IndexBoardController {
         return boardService.update(BoardEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return boardService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return boardService.findAll(name,pageNum,pageSize);
+   }
+
+
 }

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

@@ -38,9 +38,17 @@ public class IndexParameterController {
         return parameterService.update(parameterEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return parameterService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return parameterService.findAll(name,pageNum,pageSize);
+   }
+
+
+
+
 
 }

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

@@ -40,10 +40,18 @@ public class MAnimalHeatWarningController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
-    }
+    }*/
+   @RequestMapping("/findAll")
+   public Result findAll(String name , Integer pageNum , Integer pageSize){
+       return childcareService.findAll(name,pageNum,pageSize);
+   }
+
+
+
+
 
     @RequestMapping("/findAllBy")
     public Result findAllBy(){

+ 8 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthProgressController.java

@@ -39,9 +39,16 @@ public class MChildbirthProgressController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+    /*@RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
+
 }

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthRatioController.java

@@ -38,10 +38,15 @@ public class MChildbirthRatioController {
     public Result update(MChildbirthRatioEntity childcareEntity){
         return childcareService.update(childcareEntity);
     }
-
+/*
     @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
 }

+ 8 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MChildbirthTimesController.java

@@ -39,9 +39,16 @@ public class MChildbirthTimesController {
         return childcareService.update(childcareEntity);
     }
 
-    @RequestMapping("/findAll")
+   /* @RequestMapping("/findAll")
     public Result findAll(){
         return childcareService.findAll();
+    }*/
+
+
+    @RequestMapping("/findAll")
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
 }

+ 4 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MCleanTimesController.java

@@ -25,7 +25,10 @@ public class MCleanTimesController {
 	@RequestMapping("/update")
 	public Result update(MCleanTimes 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 - 3
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MConceptionRatioController.java

@@ -40,8 +40,7 @@ public class MConceptionRatioController {
     }
 
     @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/MElectricQuantityController.java

@@ -26,6 +26,8 @@ public class MElectricQuantityController {
 	public Result update(MElectricQuantity 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);
+    }
 
 }

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

@@ -25,8 +25,11 @@ public class MFattenAreaController {
 	@RequestMapping("/update")
 	public Result update(MFattenArea 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(Integer locationId){ return service.findAllBy(locationId); }

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

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

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

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

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

@@ -38,10 +38,10 @@ public class MLaborRoomHeatController {
     public Result update(MLaborRoomHeatEntity childcareEntity){
         return childcareService.update(childcareEntity);
     }
-
     @RequestMapping("/findAll")
-    public Result findAll(){
-        return childcareService.findAll();
+    public Result findAll(String name , Integer pageNum , Integer pageSize){
+        return childcareService.findAll(name,pageNum,pageSize);
     }
 
+
 }

+ 4 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/controller/MPigFeedController.java

@@ -26,6 +26,9 @@ public class MPigFeedController {
 	public Result update(MPigFeed childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.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/MPigPigpenHumidityController.java

@@ -26,6 +26,8 @@ public class MPigPigpenHumidityController {
 	public Result update(MPigPigpenHumidity 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/MPigPigpenTemperatureController.java

@@ -26,6 +26,8 @@ public class MPigPigpenTemperatureController {
 	public Result update(MPigPigpenTemperature 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/MPigWaterController.java

@@ -26,6 +26,8 @@ public class MPigWaterController {
 	public Result update(MPigWater 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/MPigletHealthCountController.java

@@ -40,8 +40,8 @@ public class MPigletHealthCountController {
     }
 
     @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/MPigletLiveController.java

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

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

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

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

@@ -41,8 +41,8 @@ public class MPlanImmunityController {
     }
 
     @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/MPurchasePlanController.java

@@ -41,8 +41,8 @@ public class MPurchasePlanController {
     }
 
     @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/MResstrusRatioController.java

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

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleDay childcareEntity){ return service.update(childcareEntity); }
 
-@RequestMapping("/findAll")
-public Result findAll(){ return service.findAll(); }
+    @RequestMapping("/findAll")
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return service.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleDetail childcareEntity){ return service.update(childcareEntity); }
 
-@RequestMapping("/findAll")
-public Result findAll(){ return service.findAll(); }
+    @RequestMapping("/findAll")
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return service.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleMonth childcareEntity){ return service.update(childcareEntity); }
 
-@RequestMapping("/findAll")
-public Result findAll(){ return service.findAll(); }
+    @RequestMapping("/findAll")
+    public Result findAll(String name ,Integer pageNum , Integer pageSize){
+        return service.findAll(name,pageNum,pageSize);
+    }
 
 }

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

@@ -25,7 +25,9 @@ public Result add(Integer[] ids){ return service.remove(ids); }
 @RequestMapping("/update")
 public Result update(MSaleYear childcareEntity){ return service.update(childcareEntity); }
 
-@RequestMapping("/findAll")
-public Result findAll(){ return service.findAll(); }
+    @RequestMapping("/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/MSmartCountController.java

@@ -26,6 +26,8 @@ public class MSmartCountController {
 	public Result update(MSmartCount 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/MSmartWeightController.java

@@ -26,6 +26,8 @@ public class MSmartWeightController {
 	public Result update(MSmartWeight 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/MSowAblactationController.java

@@ -41,8 +41,8 @@ public class MSowAblactationController {
     }
 
     @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/MSowAnimalHeatController.java

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

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

@@ -26,7 +26,9 @@ public class MSowAreaController {
 	public Result update(MSowArea 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(Integer locationId){ return service.findAllBy(locationId); }

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

@@ -26,7 +26,9 @@ public class SowCountController {
 	public Result update(SowCount childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(){
+        return service.findAll();
+    }
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

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

@@ -26,7 +26,9 @@ public class YvfeiCountController {
 	public Result update(YvfeiCount childcareEntity){ return service.update(childcareEntity); }
 
 	@RequestMapping("/findAll")
-	public Result findAll(){ return service.findAll(); }
+    public Result findAll(){
+        return service.findAll();
+    }
 
 @RequestMapping("/findAllById")
 public Result findAllById(Integer id){ return service.findAllById(id); }

+ 2 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/BaoyvCountRepository.java

@@ -9,5 +9,7 @@ import java.util.List;
 
 public interface BaoyvCountRepository extends JpaRepository<BaoyvCount, Integer>,JpaSpecificationExecutor<BaoyvCount>{
 
+    @Query(nativeQuery = true ,value = "select * from baoyv_count where  date  like %?1% limit ?2 , ?3")
+    List<BaoyvCount> findAll(String name ,Integer startPage , Integer pageSize);
 
 }

+ 4 - 2
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexAllEntityRepository.java

@@ -3,6 +3,7 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexAllEntity;
 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;
 
@@ -11,5 +12,6 @@ public interface IndexAllEntityRepository extends JpaRepository<IndexAllEntity,
     IndexAllEntity findByDay(String day);
 
 //    List<IndexAllEntity
-
-}
+@Query(nativeQuery = true ,value = "select * from index_all where sow like %?1% limit ?2 , ?3")
+List<IndexAllEntity> findAll(String name ,Integer startPage , Integer pageSize);
+        }

+ 8 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexBoardEntityRepository.java

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexBoardEntity;
 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 IndexBoardEntityRepository extends JpaRepository<IndexBoardEntity, Integer>, JpaSpecificationExecutor<IndexBoardEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from index_board where name like %?1% limit ?2 , ?3")
+    List<IndexBoardEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
 }

+ 8 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/IndexParameterEntityRepository.java

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.IndexParameterEntity;
 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 IndexParameterEntityRepository extends JpaRepository<IndexParameterEntity, Integer>, JpaSpecificationExecutor<IndexParameterEntity> {
 
+
+    @Query(nativeQuery = true ,value = "select * from index_parameter where name like %?1% limit ?2 , ?3")
+    List<IndexParameterEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
 }

+ 8 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MAnimalHeatWarningEntityRepo.java

@@ -3,7 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MAnimalHeatWarningEntity;
 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 MAnimalHeatWarningEntityRepo extends JpaRepository<MAnimalHeatWarningEntity, Integer>, JpaSpecificationExecutor<MAnimalHeatWarningEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_animal_heat_warning where location like %?1% limit ?2 , ?3")
+    List<MAnimalHeatWarningEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
 }

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

@@ -3,10 +3,17 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthProgressEntity;
 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 MChildbirthProgressEntityRepo extends JpaRepository<MChildbirthProgressEntity, Integer>, JpaSpecificationExecutor<MChildbirthProgressEntity> {
     List findAllByRoomCode(String roomCode);
 
+
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_progress where birth_date like %?1% limit ?2 , ?3")
+    List<MChildbirthProgressEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
+
+
 }

+ 9 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MChildbirthRatioEntityRepo.java

@@ -3,7 +3,16 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthRatioEntity;
 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 MChildbirthRatioEntityRepo extends JpaRepository<MChildbirthRatioEntity, Integer>, JpaSpecificationExecutor<MChildbirthRatioEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_ratio where year like %?1% limit ?2 , ?3")
+    List<MChildbirthRatioEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
+
 }

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

@@ -3,7 +3,14 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MChildbirthTimesEntity;
 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 MChildbirthTimesEntityRepo extends JpaRepository<MChildbirthTimesEntity, Integer>, JpaSpecificationExecutor<MChildbirthTimesEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_childbirth_times where year like %?1% limit ?2 , ?3")
+    List<MChildbirthTimesEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
 }

+ 3 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MCleanTimesRepository.java

@@ -3,10 +3,12 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MCleanTimes;
 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 MCleanTimesRepository extends JpaRepository<MCleanTimes, Integer>,JpaSpecificationExecutor<MCleanTimes>{
-
+    @Query(nativeQuery = true ,value = "select * from m_clean_times where location_id like %?1% limit ?2 , ?3")
+    List<MCleanTimes> findAll(String name ,Integer startPage , Integer pageSize);
     List findAllByLocationId(Integer locationId);
 }

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MConceptionRatioEntityRepo.java

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

+ 8 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MElectricQuantityRepository.java

@@ -3,10 +3,18 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MElectricQuantity;
 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 MElectricQuantityRepository extends JpaRepository<MElectricQuantity, Integer>,JpaSpecificationExecutor<MElectricQuantity>{
 
     List findAllByLocationId(Integer locationId);
+
+
+    @Query(nativeQuery = true ,value = "select * from m_electric_quantity where electric_quantity like %?1% limit ?2 , ?3")
+    List<MElectricQuantity> findAll(String name ,Integer startPage , Integer pageSize);
+
+
+
 }

+ 11 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MFattenAreaRepository.java

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

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

@@ -3,10 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MIncubatorHeatEntity;
 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 MIncubatorHeatEntityRepo extends JpaRepository<MIncubatorHeatEntity, Integer>, JpaSpecificationExecutor<MIncubatorHeatEntity> {
 
     List findAllByRoomCode(String roomCode);
+
+    @Query(nativeQuery = true ,value = "select * from m_incubator_heat where room_code like %?1% limit ?2 , ?3")
+    List<MIncubatorHeatEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
 }

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

@@ -3,7 +3,12 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MLaborRomStateEntity;
 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 MLaborRomStateEntityRepo extends JpaRepository<MLaborRomStateEntity, Integer>, JpaSpecificationExecutor<MLaborRomStateEntity> {
+    @Query(nativeQuery = true ,value = "select * from m_labor_rom_state where room_state_name like %?1% limit ?2 , ?3")
+    List<MLaborRomStateEntity> findAll(String name , Integer startPage , Integer pageSize);
 
 }

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

@@ -3,10 +3,15 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.MLaborRoomHeatEntity;
 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 MLaborRoomHeatEntityRepo extends JpaRepository<MLaborRoomHeatEntity, Integer>, JpaSpecificationExecutor<MLaborRoomHeatEntity> {
 
     List<MLaborRoomHeatEntity> findAllByRoomCode(String roomCode);
+
+    @Query(nativeQuery = true ,value = "select * from m_labor_room_heat where room_code like %?1% limit ?2 , ?3")
+    List<MLaborRoomHeatEntity> findAll(String name ,Integer startPage , Integer pageSize);
+
 }

+ 10 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MLaborRoomStateEntityRepo.java

@@ -3,7 +3,17 @@ package com.huimv.production.repo;
 import com.huimv.production.domain.BLaborRoomStateEntity;
 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 MLaborRoomStateEntityRepo extends JpaRepository<BLaborRoomStateEntity, Integer>, JpaSpecificationExecutor<BLaborRoomStateEntity> {
+    @Query(nativeQuery = true ,value = "select * from b_labor_room_state where state_name like %?1% limit ?2 , ?3")
+    List<BLaborRoomStateEntity> findAll(String name , Integer startPage , Integer pageSize);
+
+
+
+
+
 
 }

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPigPigpenHumidity;
+import com.huimv.production.domain.MSowEntity;
 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 MPigPigpenHumidityRepository extends JpaRepository<MPigPigpenHumidity, Integer>,JpaSpecificationExecutor<MPigPigpenHumidity>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_pig_pigpen_humidity where pig_code like %?1% limit ?2 , ?3")
+    List<MPigPigpenHumidity> findAll(String name , Integer startPage , Integer pageSize);
 }

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPigPigpenTemperature;
+import com.huimv.production.domain.MSowEntity;
 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 MPigPigpenTemperatureRepository extends JpaRepository<MPigPigpenTemperature, Integer>,JpaSpecificationExecutor<MPigPigpenTemperature>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_pig_pigpen_temperature where pig_code like %?1% limit ?2 , ?3")
+    List<MPigPigpenTemperature> findAll(String name , Integer startPage , Integer pageSize);
 }

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPigWater;
+import com.huimv.production.domain.MSowEntity;
 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 MPigWaterRepository extends JpaRepository<MPigWater, Integer>,JpaSpecificationExecutor<MPigWater>{
     List findAllByLocationId(Integer locationId);
 
+    @Query(nativeQuery = true ,value = "select * from m_pig_water where pig_code like %?1% limit ?2 , ?3")
+    List<MPigWater> findAll(String name , Integer startPage , Integer pageSize);
+
 }

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

@@ -1,10 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPigletHealthCountEntity;
+import com.huimv.production.domain.MSowEntity;
 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 MPigletHealthCountEntityRepo extends JpaRepository<MPigletHealthCountEntity, Integer>, JpaSpecificationExecutor<MPigletHealthCountEntity> {
 
     Object findAllBySowCode(String sowCode);
+
+    @Query(nativeQuery = true ,value = "select * from m_piglet_health_count where sow_code like %?1% limit ?2 , ?3")
+    List<MPigletHealthCountEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveEntityRepo.java

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

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MPigletLiveRatioEntityRepo.java

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

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

@@ -1,13 +1,18 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPlanImmunityEntity;
+import com.huimv.production.domain.MSowEntity;
 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 MPlanImmunityEntityRepo extends JpaRepository<MPlanImmunityEntity, Integer>, JpaSpecificationExecutor<MPlanImmunityEntity> {
 
+    @Query(nativeQuery = true ,value = "select * from m_plan_immunity where location like %?1% limit ?2 , ?3")
+    List<MPlanImmunityEntity> findAll(String name , Integer startPage , Integer pageSize);
+
 
     List findAllByState(Integer state);
 

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MPurchasePlanEntity;
+import com.huimv.production.domain.MSowEntity;
 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 MPurchasePlanEntityRepo extends JpaRepository<MPurchasePlanEntity, Integer>, JpaSpecificationExecutor<MPurchasePlanEntity> {
 
     List<MPurchasePlanEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from m_purchase_plan where location like %?1% limit ?2 , ?3")
+    List<MPurchasePlanEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 6 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MReestrusRatioEntityRepo.java

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

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDayRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSaleDay;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MSaleDayRepository extends JpaRepository<MSaleDay, Integer>,JpaSpecificationExecutor<MSaleDay>{}
+import java.util.List;
+
+public interface MSaleDayRepository extends JpaRepository<MSaleDay, Integer>,JpaSpecificationExecutor<MSaleDay>{
+
+    @Query(nativeQuery = true ,value = "select * from m_sale_day where sale_date like %?1% limit ?2 , ?3")
+    List<MSaleDay> findAll(String name , Integer startPage , Integer pageSize);
+}

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleDetailRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSaleDetail;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MSaleDetailRepository extends JpaRepository<MSaleDetail, Integer>,JpaSpecificationExecutor<MSaleDetail>{}
+import java.util.List;
+
+public interface MSaleDetailRepository extends JpaRepository<MSaleDetail, Integer>,JpaSpecificationExecutor<MSaleDetail>{
+
+    @Query(nativeQuery = true ,value = "select * from m_sale_detail where sale_code like %?1% limit ?2 , ?3")
+    List<MSaleDetail> findAll(String name , Integer startPage , Integer pageSize);
+}

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleMonthRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSaleMonth;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MSaleMonthRepository extends JpaRepository<MSaleMonth, Integer>,JpaSpecificationExecutor<MSaleMonth>{}
+import java.util.List;
+
+public interface MSaleMonthRepository extends JpaRepository<MSaleMonth, Integer>,JpaSpecificationExecutor<MSaleMonth>{
+
+    @Query(nativeQuery = true ,value = "select * from m_sale_month where month like %?1% limit ?2 , ?3")
+    List<MSaleMonth> findAll(String name , Integer startPage , Integer pageSize);
+}

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSaleYearRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSaleYear;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MSaleYearRepository extends JpaRepository<MSaleYear, Integer>,JpaSpecificationExecutor<MSaleYear>{}
+import java.util.List;
+
+public interface MSaleYearRepository extends JpaRepository<MSaleYear, Integer>,JpaSpecificationExecutor<MSaleYear>{
+
+    @Query(nativeQuery = true ,value = "select * from m_sale_year where year like %?1% limit ?2 , ?3")
+    List<MSaleYear> findAll(String name , Integer startPage , Integer pageSize);
+}

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSmartCount;
+import com.huimv.production.domain.MSowEntity;
 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 MSmartCountRepository extends JpaRepository<MSmartCount, Integer>,JpaSpecificationExecutor<MSmartCount>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_smart_count where location like %?1% limit ?2 , ?3")
+    List<MSmartCount> findAll(String name , Integer startPage , Integer pageSize);
 }

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSmartWeight;
+import com.huimv.production.domain.MSowEntity;
 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 MSmartWeightRepository extends JpaRepository<MSmartWeight, Integer>,JpaSpecificationExecutor<MSmartWeight>{
 
     List findAllByLocationId(Integer locationId);
+
+    @Query(nativeQuery = true ,value = "select * from m_smart_weight where location_id like %?1% limit ?2 , ?3")
+    List<MSmartWeight> findAll(String name , Integer startPage , Integer pageSize);
 }

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

@@ -1,12 +1,17 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSowAblactationEntity;
+import com.huimv.production.domain.MSowEntity;
 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 MSowAblactationEntityRepo extends JpaRepository<MSowAblactationEntity, Integer>, JpaSpecificationExecutor<MSowAblactationEntity> {
 
     List<MSowAblactationEntity> findAllByState(int i);
+
+    @Query(nativeQuery = true ,value = "select * from MSowAblactationEntity where location like %?1% limit ?2 , ?3")
+    List<MSowAblactationEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 4 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAnimalHeatEntityRepo.java

@@ -1,6 +1,7 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSowAnimalHeatEntity;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Query;
@@ -13,4 +14,7 @@ public interface MSowAnimalHeatEntityRepo extends JpaRepository<MSowAnimalHeatEn
 
     @Query(nativeQuery = true,value = "SELECT AVG(heat), measure_time FROM `m_sow_animal_heat` GROUP BY measure_time")
     List<List> findAllBy();
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_animal_heat where location_id like %?1% limit ?2 , ?3")
+    List<MSowAnimalHeatEntity> findAll(String name , Integer startPage , Integer pageSize);
 }

+ 9 - 1
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/repo/MSowAreaRepository.java

@@ -1,7 +1,15 @@
 package com.huimv.production.repo;
 
 import com.huimv.production.domain.MSowArea;
+import com.huimv.production.domain.MSowEntity;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Query;
 
-public interface MSowAreaRepository extends JpaRepository<MSowArea, Integer>,JpaSpecificationExecutor<MSowArea>{}
+import java.util.List;
+
+public interface MSowAreaRepository extends JpaRepository<MSowArea, Integer>,JpaSpecificationExecutor<MSowArea>{
+
+    @Query(nativeQuery = true ,value = "select * from m_sow_area where location like %?1% limit ?2 , ?3")
+    List<MSowArea> findAll(String name , Integer startPage , Integer pageSize);
+}

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

@@ -20,6 +20,7 @@ public interface BLaborRoomStateService {
 
     Result update(BLaborRoomStateEntity fattenEntity);
 
-    Result findAll();
+   // Result findAll();
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -15,7 +15,10 @@ public interface BaoyvCountService  {
    Result update(BaoyvCount entity);
 
    //查询
-   Result findAll();
+  // Result findAll();
+
+   Result findAll(String name ,Integer pageNum , Integer pageSize);
+
 
    //根据id查找
    Result findAllById(Integer id);

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

@@ -15,5 +15,6 @@ public interface IndexAllService {
 
     Result update(IndexAllEntity allEntity);
 
-    Result findAll();
+    //Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

@@ -17,5 +17,7 @@ public interface IndexBoardService {
 
     Result update(IndexBoardEntity boardEntity);
 
-    Result findAll();
+    //Result findAll();
+
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

@@ -20,5 +20,6 @@ public interface IndexParameterService {
 
     Result update(IndexParameterEntity parameterEntity);
 
-    Result findAll();
+    //Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 }

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

@@ -21,7 +21,9 @@ public interface MAnimalHeatWarningService {
 
     Result update(MAnimalHeatWarningEntity fattenEntity);
 
-    Result findAll();
+   // Result findAll();
+
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
     Result findAllBy();
 }

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

@@ -20,6 +20,7 @@ public interface MChildbirthProgressService {
 
     Result update(MChildbirthProgressEntity fattenEntity);
 
-    Result findAll();
+    //Result findAll();
+    Result findAll(String name ,Integer pageNum , Integer pageSize);
 
 }

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

@@ -20,6 +20,7 @@ public interface MChildbirthRatioService {
 
     Result update(MChildbirthRatioEntity fattenEntity);
 
-    Result findAll();
+   // 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/MChildbirthTimesService.java

@@ -19,6 +19,6 @@ public interface MChildbirthTimesService {
 
     Result update(MChildbirthTimesEntity 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/MCleanTimesService.java

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

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

@@ -20,6 +20,7 @@ public interface MConceptionRatioService {
 
     Result update(MConceptionRatioEntity 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/MElectricQuantityService.java

@@ -15,5 +15,5 @@ public interface MElectricQuantityService  {
    Result update(MElectricQuantity 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/MFattenAreaService.java

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

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

@@ -20,6 +20,6 @@ public interface MIncubatorHeatService {
 
     Result update(MIncubatorHeatEntity 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/MLaborRomStateService.java

@@ -20,6 +20,6 @@ public interface MLaborRomStateService {
 
     Result update(MLaborRomStateEntity 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/MLaborRoomHeatService.java

@@ -20,6 +20,6 @@ public interface MLaborRoomHeatService {
 
     Result update(MLaborRoomHeatEntity 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/MPigPigpenHumidityService.java

@@ -15,5 +15,5 @@ public interface MPigPigpenHumidityService  {
    Result update(MPigPigpenHumidity 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/MPigPigpenTemperatureService.java

@@ -15,5 +15,5 @@ public interface MPigPigpenTemperatureService  {
    Result update(MPigPigpenTemperature 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/MPigWaterService.java

@@ -15,5 +15,5 @@ public interface MPigWaterService  {
    Result update(MPigWater 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/MPigletHealthCountService.java

@@ -20,6 +20,6 @@ public interface MPigletHealthCountService {
 
     Result update(MPigletHealthCountEntity 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/MPigletLiveRatioService.java

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

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

@@ -20,6 +20,5 @@ public interface MPigletLiveService {
 
     Result update(MPigletLiveEntity 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/MPlanImmunityService.java

@@ -19,7 +19,7 @@ public interface MPlanImmunityService {
 
     Result update(MPlanImmunityEntity 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/MPurchasePlanService.java

@@ -21,7 +21,7 @@ public interface MPurchasePlanService {
 
     Result update(MPurchasePlanEntity 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/MResstrusRatioService.java

@@ -20,6 +20,6 @@ public interface MResstrusRatioService {
 
     Result update(MReestrusRatioEntity 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/MSaleDayService.java

@@ -15,5 +15,5 @@ public interface MSaleDayService  {
    Result update(MSaleDay 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/MSaleDetailService.java

@@ -15,5 +15,5 @@ public interface MSaleDetailService  {
    Result update(MSaleDetail 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/MSaleMonthService.java

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

+ 0 - 0
huimv-ql-farm/huimv-ql-production/src/main/java/com/huimv/production/service/MSaleYearService.java


Alguns ficheiros não foram mostrados porque muitos ficheiros mudaram neste diff