|
@@ -64,7 +64,8 @@ public class EmsProdplanYearController extends BaseRESTfulController {
|
|
|
@GetMapping(value = "/getList")
|
|
|
public RESTfulResult getlist(@RequestParam HashMap parmas,Integer pageNum, Integer pageSize){
|
|
|
// 因为有四种产品,所以页面返回参数乘4;
|
|
|
- pageSize = pageSize * 4;
|
|
|
+ Integer parentNum = parmas.get("parentNum") == null ? 4: Integer.valueOf(parmas.get("parentNum").toString().trim());
|
|
|
+ pageSize = pageSize * parentNum;
|
|
|
PageList<EmsProdplanYear> list = emsProdplanYearService.queryForPage(parmas, pageNum, pageSize);
|
|
|
// 根据月份汇总数据
|
|
|
Map<String,List<EmsProdplanYear>> stringListMap =
|
|
@@ -81,7 +82,7 @@ public class EmsProdplanYearController extends BaseRESTfulController {
|
|
|
mapList.add(sortListMap);
|
|
|
list.setList(mapList);
|
|
|
// 返回实际行数
|
|
|
- list.setTotal(stringListMap.size());
|
|
|
+ list.setTotal(list.getTotal()/parentNum);
|
|
|
return success(list);
|
|
|
}
|
|
|
|