|
@@ -121,16 +121,19 @@ public class WeightController {
|
|
|
//分页查询每次称重记录
|
|
|
@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 = "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 {
|
|
|
log.info("farmId>>" + farmId);
|
|
|
log.info("pageNo>>" + pageNo);
|
|
|
log.info("pageSize>>" + pageSize);
|
|
|
+ if(days == null || days.toString().length()==0){
|
|
|
+ days = 7;
|
|
|
+ }
|
|
|
if(startDate == null){
|
|
|
startDate = dateUtil.getTodayDateText();
|
|
|
}
|
|
|
if(endDate == null){
|
|
|
- endDate = dateUtil.getPastDate(7);
|
|
|
+ endDate = dateUtil.getPastDate(days);
|
|
|
}
|
|
|
log.info("startDate>>" + startDate);
|
|
|
log.info("endDate>>" + endDate);
|