|
@@ -76,8 +76,12 @@ public class StaStatisticalSummaryController extends BaseController {
|
76
|
76
|
@RequestParam(required = false, defaultValue = "", value = "QS") String qs,
|
77
|
77
|
@RequestParam(required = false, defaultValue = "", value = "WC") String wc
|
78
|
78
|
) {
|
|
79
|
+ Map<String, String> map = new HashMap<>();
|
|
80
|
+ map.put("xmmc",xmmc);
|
|
81
|
+ map.put("qs",qs);
|
|
82
|
+ map.put("wc",wc);
|
79
|
83
|
PageHelper.startPage(pageNum, pageSize);
|
80
|
|
- List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(xmmc, qs, wc);
|
|
84
|
+ List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(map);
|
81
|
85
|
PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
|
82
|
86
|
List<HashMap<String, Object>> rows = pageinfo.getList();
|
83
|
87
|
int total = (int) pageinfo.getTotal();
|
|
@@ -93,7 +97,9 @@ public class StaStatisticalSummaryController extends BaseController {
|
93
|
97
|
@RequestMapping(value = "/getAll",method = RequestMethod.GET)
|
94
|
98
|
public BaseResult getAll(){
|
95
|
99
|
|
96
|
|
- List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay("", "", "");
|
|
100
|
+ Map<String, String> map = new HashMap<>();
|
|
101
|
+
|
|
102
|
+ List<HashMap<String, Object>> staFeasibilityreport = staStatisticalSummaryService.projectPay(map);
|
97
|
103
|
return BaseResult.success(staFeasibilityreport);
|
98
|
104
|
}
|
99
|
105
|
|