|
@@ -34,23 +34,23 @@ public class WeightController {
|
|
|
|
|
|
// 读取前N天的记录
|
|
// 读取前N天的记录
|
|
@GetMapping("/getManyDayWeight")
|
|
@GetMapping("/getManyDayWeight")
|
|
- public Result getManyDayWeight(@RequestParam("days") Integer days,
|
|
|
|
- @RequestParam("poundType") String poundType) throws ParseException {
|
|
|
|
|
|
+ public Result getManyDayWeight(@RequestParam(value = "days",required = true) Integer days,
|
|
|
|
+ @RequestParam(value = "poundType",required = true) String poundType) throws ParseException {
|
|
//
|
|
//
|
|
return weight.getManyDayWeight(days,poundType);
|
|
return weight.getManyDayWeight(days,poundType);
|
|
}
|
|
}
|
|
|
|
|
|
//读取蛋场称重明细明细
|
|
//读取蛋场称重明细明细
|
|
@GetMapping("/getWeightDetails")
|
|
@GetMapping("/getWeightDetails")
|
|
- public Result getWeightDetails(@RequestParam("poundType") String poundType,
|
|
|
|
- @RequestParam("carNumber") String carNumber,
|
|
|
|
- @RequestParam("consigner") String consigner,
|
|
|
|
- @RequestParam("consignee") String consignee,
|
|
|
|
- @RequestParam("variety") String variety,
|
|
|
|
- @RequestParam("startDate") String startDate,
|
|
|
|
- @RequestParam("endDate") String endDate,
|
|
|
|
- @RequestParam("pageNo") Integer pageNo,
|
|
|
|
- @RequestParam("pageSize") Integer pageSize) throws ParseException {
|
|
|
|
|
|
+ public Result getWeightDetails(@RequestParam(value = "poundType",required = false) String poundType,
|
|
|
|
+ @RequestParam(value = "carNumber",required = false) String carNumber,
|
|
|
|
+ @RequestParam(value = "consigner",required = false) String consigner,
|
|
|
|
+ @RequestParam(value = "consignee",required = false) String consignee,
|
|
|
|
+ @RequestParam(value = "variety",required = false) String variety,
|
|
|
|
+ @RequestParam(value = "startDate",required = false) String startDate,
|
|
|
|
+ @RequestParam(value = "endDate",required = false) String endDate,
|
|
|
|
+ @RequestParam(value = "pageNo",required = true) Integer pageNo,
|
|
|
|
+ @RequestParam(value = "pageSize",required = true) Integer pageSize) throws ParseException {
|
|
DateUtil du = new DateUtil();
|
|
DateUtil du = new DateUtil();
|
|
//
|
|
//
|
|
return weight.getWeightDetails(poundType, carNumber,consigner,consignee,variety, du.parseDate(startDate),du.parseDate(endDate),pageNo,pageSize);
|
|
return weight.getWeightDetails(poundType, carNumber,consigner,consignee,variety, du.parseDate(startDate),du.parseDate(endDate),pageNo,pageSize);
|