Merge remote-tracking branch 'origin/dev_addcate_and_import' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/HouseController.java

@@ -289,7 +289,7 @@ public class HouseController implements ResultDataResolver {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportBuildingInfoListener.java

@@ -103,9 +103,7 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
                         nums.add(r.getNum());
-                        }
                         r.setExistStatus(true);
                     }
                 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportHouseInfoListener.java

@@ -133,8 +133,9 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
                         if (r.getExistStatus()){
-                            nums.add(r.getNum());
+
                         }
+                        nums.add(r.getNum());
                         r.setExistStatus(true);
                     }
                 }
@@ -147,9 +148,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             for (ImportGeneralDTO n : needInsertList) {
                 if ((n.getBuildingUnitId()+"_"+n.getDoorName()).equals(e)){
                     // 库里存在的
-                    if (n.getExistStatus()){
                     nums.add(n.getNum());
-                    }
                     n.setExistStatus(true);
                 }
             }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/model/ImportNeighborHoodInfoListener.java

@@ -96,9 +96,7 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
                         // 集合里重复的
-                        if (r.getExistStatus()){
                         nums.add(r.getNum());
-                        }
                         r.setExistStatus(true);
                     }
                 }

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/BuildingServiceImpl.java

@@ -429,7 +429,7 @@ public class BuildingServiceImpl implements BuildingService {
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     private List<IcBuildingExcel> searchAllBuilding(ListIcNeighborHoodFormDTO formDTO) {

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcNeighborHoodServiceImpl.java

@@ -419,7 +419,7 @@ public class IcNeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao
             s = s + "第"+nums.stream().map(String::valueOf).collect(Collectors.joining("、"))+"条导入失败";
             return new Result<>().error(9999,String.format(s,num,num - nums.size()));
         }
-        return new Result<>().ok(String.format(s,num,num));
+        return new Result<>().error(9999,String.format(s,num,num));
     }
 
     /**