xieshengjie 2 سال پیش
والد
کامیت
78e88abd93

+ 1 - 0
common/src/main/java/com/gyee/common/vo/specific/SpecificCenterVo.java

@@ -30,4 +30,5 @@ public class SpecificCenterVo implements Serializable {
     private Integer fwjslCompare;
     private Integer ztzhlCompare;
     private Integer xqjslCompare;
+    private Integer ordernum;
 }

+ 6 - 0
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -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);