Browse Source

数据中心:新增查询每天所有称重记录.

zhuoning 3 years ago
parent
commit
7a6a26410d

+ 20 - 0
huimv-farm-produce/src/main/java/com/huimv/produce/produce/controller/WeightController.java

@@ -117,4 +117,24 @@ public class WeightController {
         return weight.getBatchWeightOnPage2(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(endDate), pageNo, pageSize);
         return weight.getBatchWeightOnPage2(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(endDate), pageNo, pageSize);
 //        return weight.getBatchWeightOnPage4(farmId, startDate,endDate, pageNo, pageSize);
 //        return weight.getBatchWeightOnPage4(farmId, startDate,endDate, pageNo, pageSize);
     }
     }
+
+    //分页查询每次称重记录
+    @RequestMapping(value = "/getEveryWeightOnPage")
+    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 = "startDate", required = false) String startDate, @RequestParam(value = "endDate", required = false) String endDate) throws ParseException {
+        log.info("farmId>>" + farmId);
+        log.info("pageNo>>" + pageNo);
+        log.info("pageSize>>" + pageSize);
+        if(startDate == null){
+            startDate = dateUtil.getYearStart();
+        }
+        if(endDate == null){
+            endDate = dateUtil.getYearEnd();
+        }
+        log.info("startDate>>" + startDate);
+        log.info("endDate>>" + endDate);
+        //
+        return weight.getEveryTimeWeightOnPage(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(endDate), pageNo, pageSize);
+    }
 }
 }