|
@@ -117,4 +117,24 @@ public class WeightController {
|
|
|
return weight.getBatchWeightOnPage2(farmId, dateUtil.parseDate(startDate),dateUtil.parseDate(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);
|
|
|
+ }
|
|
|
}
|