Browse Source

优化查询N天的称重数据明细。

zhuoning 3 years ago
parent
commit
1ecf803cad

+ 5 - 2
huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/WeightController.java

@@ -121,16 +121,19 @@ public class WeightController {
     //分页查询每次称重记录
     //分页查询每次称重记录
     @RequestMapping(value = "/getEveryWeightOnPage")
     @RequestMapping(value = "/getEveryWeightOnPage")
     public Result getEveryWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
     public Result getEveryWeightOnPage(@RequestParam(value = "farmId", required = true) Integer farmId, @RequestParam(value = "pageSize", required = true) Integer pageSize,
-                                        @RequestParam(value = "pageNo", required = true) Integer pageNo,
+                                        @RequestParam(value = "pageNo", required = true) Integer pageNo,@RequestParam(value = "days", required = false) Integer days,
                                         @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate) throws ParseException {
                                         @RequestParam(value = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate) throws ParseException {
         log.info("farmId>>" + farmId);
         log.info("farmId>>" + farmId);
         log.info("pageNo>>" + pageNo);
         log.info("pageNo>>" + pageNo);
         log.info("pageSize>>" + pageSize);
         log.info("pageSize>>" + pageSize);
+        if(days == null || days.toString().length()==0){
+            days = 7;
+        }
         if(startDate == null){
         if(startDate == null){
             startDate = dateUtil.getTodayDateText();
             startDate = dateUtil.getTodayDateText();
         }
         }
         if(endDate == null){
         if(endDate == null){
-            endDate = dateUtil.getPastDate(7);
+            endDate = dateUtil.getPastDate(days);
         }
         }
         log.info("startDate>>" + startDate);
         log.info("startDate>>" + startDate);
         log.info("endDate>>" + endDate);
         log.info("endDate>>" + endDate);