具体错误信息修改

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

@@ -296,12 +296,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         // 排除不是本楼的
         if (!dto.getBuildingName().equals(buildingGeneralDTO.getBuildingName())){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,"所属楼栋的值未填写或者所填写信息在系统中未找到");
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(buildingGeneralDTO.getGridId());
             if (null == gridInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             // 排除 1、小区名不一样&&楼栋名一样 2、网格名不一样&&小区名一样&&楼名一样 3、组织名不一样&&网格名一样&&小区名一样&&楼名一样
@@ -319,7 +319,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -352,12 +352,12 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         //排除不是本小区的
         if (!dto.getNeighborHoodName().equals(neighborHoodGeneralDTO.getNeighborHoodName())){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,"所属小区的值未填写或者所填写信息在系统中未找到");
         }else {
             GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(neighborHoodGeneralDTO.getGridId());
             if (null == gridInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             // 1.排除网格名不一样但小区名一样 2.排除组织不一样，网格一样，小区一样
@@ -373,7 +373,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -394,7 +394,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(formDTO.getOrgId());
         if (null == gridInfo){
             nums.add(num);
-            disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info, "所属网格的值未填写或者所填写信息在系统中未找到");
             return;
         }
         //排除不是本网格的 gridName不一样排除，gridName一样但是agencyName不一样也得排除
@@ -408,7 +408,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             dto.setPid(agencyInfo.getPid());
@@ -429,21 +429,21 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
         //排除不是本组织的
         if (!dto.getAgencyName().equals(agencyName)){
             nums.add(num);
-            disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+            disposeErrorMsg(info,"所属组织的值未填写或者所填写信息在系统中未找到");
         }else {
             // 根据组织查询出所有网格，甩出不是本组织下的网格
             gridInfos = null == gridInfos ? getGridInfos(formDTO.getOrgId()) : gridInfos;
             if (null == gridInfos){
                 // 组织下确实不存在网格
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             // 根据网格名对比，没有找到的就把行号加入到未执行成功队列中
             Object cacheGridName = icHouseRedis.getTemporaryCacheGrid(formDTO.getCustomerId(), formDTO.getUserId(), dto.getGridName());
             if (null == cacheGridName){
                 nums.add(num);
-                disposeErrorMsg(info,ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info,"所属网格的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             dto.setGridId(cacheGridName.toString());
@@ -451,7 +451,7 @@ public class ImportHouseInfoListener extends AnalysisEventListener<HouseInfoMode
             AgencyInfoCache agencyInfo = CustomerOrgRedis.getAgencyInfo(dto.getAgencyId());
             if (null == agencyInfo){
                 nums.add(num);
-                disposeErrorMsg(info, ImportErrorMsgConstants.HOUSE_ERROR);
+                disposeErrorMsg(info, "所属组织的值未填写或者所填写信息在系统中未找到");
                 return;
             }
             dto.setPid(agencyInfo.getPid());