再修改房屋导入

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

@@ -163,7 +163,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         if (StringUtils.isNotBlank(dto.getHouseType()) ){
             if( !"楼房".equals(dto.getHouseType()) && !dto.getHouseType().equals("平房") && !dto.getHouseType().equals("别墅") ){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,"房屋类型的值未填写或者所填写信息在系统中未找到");
                 return;
             }
         }
@@ -177,13 +177,13 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                 !dto.getPurpose().equals("商住混用") &&
                 !dto.getPurpose().equals("其他")) ){
             nums.add(num);
-            disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info, "房屋用途的值未填写或者所填写信息在系统中未找到");
             return;
         }
         dto.setPurpose(HousePurposeEnums.getKeyByValue(dto.getPurpose()));
         if (StringUtils.isNotBlank(dto.getRentFlagString()) && (!dto.getRentFlagString().equals("是") && !dto.getRentFlagString().equals("否"))){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,"是否出租的值未填写或者所填写信息在系统中未找到");
             return;
         }
         dto.setRentFlag(HouseRentFlagEnums.getCodeByName(dto.getRentFlagString()));
@@ -226,10 +226,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                 for (ImportGeneralDTO r : needInsertList) {
                     if (k.equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                         // 集合里重复的
-                        /*nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);*/
                         if (!r.getAddStatus()){
+                            nums.add(r.getNum());
+                            disposeErrorMsg(info,"文件中存在重复数据");
+                            r.setExistStatus(true);
+                        }
+                        /*if (!r.getAddStatus()){
                             for (ExistHouseInfoResultDTO existHouse : existHouses) {
                                 if (existHouse.getName().equals(r.getBuildingUnitId()+"_"+r.getDoorName())){
                                     r.setHouseId(existHouse.getHouseId());
@@ -239,7 +241,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
                             needUpdateList.add(r);
                             r.setAddStatus(true);
                             r.setExistStatus(true);
-                        }
+                        }*/
                     }
                 }
             }