工程現場 接口修改

project-zcustom/src/main/java/com/project/zcustom/service/unit/ILargeProjectService.java

@@ -104,5 +104,5 @@ public interface ILargeProjectService extends IService<LargeProject> {
 
     public Map<String, Object> getProjectNumZ();
 
-    int upload(MultipartFile file);
+    public int upload(MultipartFile file);
 }

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

@@ -199,7 +199,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<>();
@@ -216,8 +216,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);
         }
@@ -282,8 +288,13 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
                         }
                         break;
                     case 1:
-                        if (cell != null && cell.getCellType() == CellType.STRING) {
-                            a.setAppOrg(cell.getStringCellValue());
+                        if (cell != null) {
+                            if (cell.getCellType() == CellType.STRING){
+                                a.setAppOrg(cell.getStringCellValue());
+                            }
+                            if (cell.getCellType() == CellType.NUMERIC){
+                                a.setAppOrg(String.valueOf((int)cell.getNumericCellValue()));
+                            }
                         }
                         break;
                     case 2:
@@ -293,7 +304,7 @@ public class LargeProjectServiceImpl extends ServiceImpl<LargeProjectMapper, Lar
                         break;
                     case 3:
                         if (cell != null && cell.getCellType() == CellType.STRING) {
-                            a.setSubdivision(mapSubdivision.get(cell.getStringCellValue()));
+                            a.setSubdivision(mapSubdivision.get(cell.getStringCellValue().trim().replaceAll("\\s+", "")));
                         }
                         break;
                     case 4:

project-zcustom/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>
@@ -197,7 +197,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <insert id="upload" parameterType="com.project.zcustom.domain.addional.LargeProject">
-        insert into large_plat_housing_land (supervision_unit,
+        insert into large_plat_project (supervision_unit,
         construction_unit,
         ordinate,
         abscissa,