工程現場 接口修改

src/main/java/com/project/zcustom/service/unit/impl/LargeProjectServiceImpl.java

@@ -194,7 +194,7 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
     }
 
     public Map<String, Object> getProjectNumZ(){
-        List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001"));
+        List<String> appOrg = new ArrayList<>(Arrays.asList("1A003", "1B001", "1C001", "1D001", "1E001", "1F001", "1K001", "1L001", "1H001", "1M001", "1J001", "10001"));
         List<LargeProject> list = largeProjectMapper.getProjectNumZ(appOrg);
         Map<String, Object> map = new HashMap<>();
         List<Integer> list1 = new ArrayList<>();
@@ -211,8 +211,14 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
                     }
                 }
             }
-            list1.add(x);
-            list2.add(y);
+            if (!app.equals("10001")){
+                list1.add(x);
+                list2.add(y);
+            }
+            else {
+                list1.set(0, list1.get(0) + x);
+                list2.set(0, list2.get(0) + y);
+            }
             map.put("list1", list1);
             map.put("list2", list2);
         }

src/main/resources/mapper/zcustom/unit/LargeProjectMapper.xml

@@ -124,7 +124,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             a.del_flag = '0'
           AND b.del_flag = '0'
         <if test="appOrg != '10001'">AND ( b.app_parent_org = #{appOrg} OR b.app_org = #{appOrg} )</if>
-          AND subdivision >= 10
+          AND subdivision > 10
         GROUP BY
             subdivision
     </select>