修复发改委

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/fgw/FgwCommonServiceImpl.java

@@ -16,7 +16,7 @@ import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.ruoyi.common.constant.CommonConstants.THR;
+import static com.ruoyi.common.constant.CommonConstants.*;
 
 /**
  * @Author: tjf
@@ -43,6 +43,11 @@ public class FgwCommonServiceImpl implements IFgwCommonService {
     @Override
     public AjaxResult index() {
         Map<String, Object> map = new HashMap<>();
+        map.put("wtxm", 0);
+        map.put("sbxm", 0);
+        map.put("xmk", 0);
+        map.put("zfxm", 0);
+        map.put("zsxm", 0);
 
         FgwXmsb xmsb = new FgwXmsb();
         List<FgwXmsb> fgwXmsbs = fgwXmsbService.selectFgwXmsbList(xmsb);
@@ -52,7 +57,17 @@ public class FgwCommonServiceImpl implements IFgwCommonService {
                 List<FgwXmsb> fgwXmsbsWt = collect.get(THR);
                 if (fgwXmsbsWt != null && fgwXmsbsWt.size() > 0) {
                     map.put("wtxm", fgwXmsbsWt.size());
-
+                }
+            }
+            Map<String, List<FgwXmsb>> collectType = fgwXmsbs.stream().collect(Collectors.groupingBy(FgwXmsb::getType));
+            if (collectType != null && collectType.size() > 0) {
+                List<FgwXmsb> fgwXmsbsSb = collectType.get(ONE);
+                if (fgwXmsbsSb != null && fgwXmsbsSb.size() > 0) {
+                    map.put("sbxm", fgwXmsbsSb.size());
+                }
+                List<FgwXmsb> fgwXmsbsXmk = collectType.get(TWO);
+                if (fgwXmsbsXmk != null && fgwXmsbsXmk.size() > 0) {
+                    map.put("xmk", fgwXmsbsXmk.size());
                 }
             }
             map.put("zfxm", fgwXmsbs.size());