修改首页 承接并到首谈

ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/projectV2/common/ZsyzCommonServiceImpL.java

@@ -451,7 +451,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
         }
         //对数据进行分组统计
         int st = 0;
-        int cj = 0;
+        //int cj = 0;
         int qy = 0;
         int kg = 0;
         int tc = 0;
@@ -465,7 +465,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             }
             List<ZsyzSbbzb> cjList = collect.get(TWO);
             if (stList != null) {
-                cj = cjList.size();
+                st = st + cjList.size();
             }
             List<ZsyzSbbzb> qyList = collect.get(THR);
             if (stList != null) {
@@ -482,7 +482,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             all = zsyzSbbzbs.size();
         }
         map.put(ST, st);
-        map.put(CJ, cj);
+        //map.put(CJ, cj);
         map.put(QY, qy);
         map.put(KG, kg);
         map.put(TC, tc);
@@ -566,7 +566,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
                 }
                 List<ZsyzSbbzb> cjList = collect.get(TWO);
                 if (stList != null) {
-                    cjNub = cjList.size();
+                    stNub = stNub +  cjList.size();
                 }
                 List<ZsyzSbbzb> qyList = collect.get(THR);
                 if (stList != null) {
@@ -588,7 +588,7 @@ public class ZsyzCommonServiceImpL implements IZsyzCommonService {
             }
         }
         yMpa.put(ST, st);
-        yMpa.put(CJ, cj);
+        //yMpa.put(CJ, cj);
         yMpa.put(QY, qy);
         yMpa.put(KG, kg);
         yMpa.put(TC, tc);