Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into wxz_resiimport_temp

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

epmet-module/gov-org/gov-org-client/src/main/java/com/epmet/dto/ImportGeneralDTO.java

@@ -140,6 +140,11 @@ public class ImportGeneralDTO implements Serializable {
 
     private Boolean addStatus = false;
 
+    /**
+     * 错误信息添加状态
+     */
+    private Boolean addStatus = false;
+
     /**
      * 楼栋重复状态
      */

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

@@ -142,10 +142,14 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" +
                             r.getNeighborHoodName() + "_" + r.getBuildingName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(r, BuildingInfoModel.class);
+                            disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -158,8 +162,12 @@ public class ImportBuildingInfoListener extends AnalysisEventListener<BuildingIn
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        BuildingInfoModel buildingInfoModel = ConvertUtils.sourceToTarget(e, BuildingInfoModel.class);
+                        disposeErrorMsg(buildingInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
+                        e.setAddStatus(true);
+                    }
                 });
             }
         }

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

@@ -136,10 +136,14 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             if (Integer.valueOf(v.toString()).compareTo(1) > 0){
                 for (ImportGeneralDTO r : needDisposeList) {
                     if (k.equals(r.getAgencyName() + "_" + r.getGridName() + "_" + r.getNeighborHoodName())){
-                        // 集合里重复的
-                        nums.add(r.getNum());
-                        disposeErrorMsg(info, ImportErrorMsgConstants.EXIST_ERROR);
-                        r.setExistStatus(true);
+                        if (!r.getAddStatus()){
+                            // 集合里重复的
+                            nums.add(r.getNum());
+                            NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(r, NeighborHoodInfoModel.class);
+                            disposeErrorMsg(neighborHoodInfoModel, ImportErrorMsgConstants.EXIST_ERROR);
+                            r.setExistStatus(true);
+                            r.setAddStatus(true);
+                        }
                     }
                 }
             }
@@ -152,8 +156,12 @@ public class ImportNeighborHoodInfoListener extends AnalysisEventListener<Neighb
             List<ImportGeneralDTO> existList = groupByBuildingExistStatus.get(true);
             if (!CollectionUtils.isEmpty(existList)){
                 existList.forEach(e -> {
-                    nums.add(e.getNum());
-                    disposeErrorMsg(info,ImportErrorMsgConstants.EXIST_ERROR);
+                    if (!e.getAddStatus()){
+                        nums.add(e.getNum());
+                        NeighborHoodInfoModel neighborHoodInfoModel = ConvertUtils.sourceToTarget(e, NeighborHoodInfoModel.class);
+                        disposeErrorMsg(neighborHoodInfoModel,ImportErrorMsgConstants.EXIST_ERROR);
+                        e.setAddStatus(true);
+                    }
                 });
             }
             List<ImportGeneralDTO> notExistList = groupByBuildingExistStatus.get(false);

epmet-module/gov-org/gov-org-server/src/main/resources/mapper/CustomerGridDao.xml

@@ -756,10 +756,11 @@
             cg.mobile,
             <!-- 网格没有经纬度时获取客户根组织下的 -->
             IFNULL(cg.longitude,ca.longitude) longitude,
-            IFNULL(cg.latitude,ca.latitude) latitude
+            IFNULL(cg.latitude,ca.latitude) latitude,
+            ca.ORGANIZATION_NAME agencyName
         FROM
             customer_grid cg
-        INNER JOIN customer_agency ca ON ca.pid = '0' AND ca.customer_id = cg.customer_id
+        INNER JOIN customer_agency ca ON (ca.ID = cg.PID AND ca.customer_id = cg.customer_id)
         WHERE
             cg.del_flag = '0'
         AND ca.del_flag = '0'