|
@@ -372,11 +372,17 @@ public class SpecificService {
|
|
|
|
|
|
//封装最终返回结果
|
|
|
monthresultList.stream().forEach(i->{
|
|
|
+ i.setOrdernum(wpmap.get(i.getWpid()).getOrderNum());
|
|
|
i.setWpid(wpmap.get(i.getWpid()).getAname());
|
|
|
+
|
|
|
});
|
|
|
yearresultList.stream().forEach(i->{
|
|
|
+ i.setOrdernum(wpmap.get(i.getWpid()).getOrderNum());
|
|
|
i.setWpid(wpmap.get(i.getWpid()).getAname());
|
|
|
+
|
|
|
});
|
|
|
+ SortUtils.sort(monthresultList,"ordernum",SortUtils.ASC);
|
|
|
+ SortUtils.sort(yearresultList,"ordernum",SortUtils.ASC);
|
|
|
Map<String,List<SpecificCenterVo>> resultMap = new HashMap<>();
|
|
|
resultMap.put("当月",monthresultList);
|
|
|
resultMap.put("当年",yearresultList);
|