From b8a1fce5f5b508ec991a16f1b7f796f4968dceb9 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 9 Aug 2022 11:04:36 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=8F=E5=8C=BA=E7=A0=81=E3=80=81?=
 =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E7=A0=81=E6=B7=BB=E5=8A=A0=E7=A4=BE=E5=8C=BA?=
 =?UTF-8?q?=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/controller/AgencyController.java  |  3 ++-
 .../service/impl/NeighborHoodServiceImpl.java   | 17 ++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 333b3eb9d2..5fa092643e 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -424,7 +424,8 @@ public class AgencyController {
             name = customerAgencyDTO.getOrganizationName();
             //url组成:信息采集地址?社区id
             StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode());
-            path.append("?agencyId=").append(formDTO.getId());
+            path.append("?agencyId=").append(formDTO.getId())
+                    .append("&agencyName=").append(name);
             //需要发送的Json
             JSONObject data = new JSONObject();
             data.put("path", path.toString());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index 73dcd6f144..7b69614445 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -16,10 +16,7 @@ import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.HttpClientManager;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.NeighborhoodConstant;
-import com.epmet.dao.CustomerGridDao;
-import com.epmet.dao.IcNeighborHoodDao;
-import com.epmet.dao.IcNeighborHoodPropertyDao;
-import com.epmet.dao.IcOrganizationCodeInfoDao;
+import com.epmet.dao.*;
 import com.epmet.dto.CustomerAgencyDTO;
 import com.epmet.dto.IcNeighborHoodDTO;
 import com.epmet.dto.IcNeighborHoodPropertyDTO;
@@ -30,10 +27,7 @@ import com.epmet.dto.form.IcUserBelongToChangedFormDTO;
 import com.epmet.dto.result.IcNeighborHoodResultDTO;
 import com.epmet.dto.result.OrganizationCommunityDTO;
 import com.epmet.dto.result.UploadImgResultDTO;
-import com.epmet.entity.IcHouseEntity;
-import com.epmet.entity.IcNeighborHoodEntity;
-import com.epmet.entity.IcNeighborHoodPropertyEntity;
-import com.epmet.entity.IcOrganizationCodeInfoEntity;
+import com.epmet.entity.*;
 import com.epmet.enums.OrganizationTypeEnums;
 import com.epmet.excel.IcNeighborHoodExcel;
 import com.epmet.feign.EpmetUserOpenFeignClient;
@@ -85,6 +79,8 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
     private IcOrganizationCodeInfoServiceImpl icOrganizationCodeInfoServiceImpl;
     @Autowired
     private OssFeignClient ossFeignClient;
+    @Autowired
+    private CustomerAgencyDao customerAgencyDao;
 
 
     @Override
@@ -153,9 +149,12 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
             log.warn("获取accessToken失败，customerId:{}", entity.getCustomerId());
             throw new RenException("获取accessToken失败，customerId:{}", entity.getCustomerId());
         }
+        CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(entity.getAgencyId());
         //跳转的页面
         StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode());
-        path.append("?neiId=").append(entity.getId()).append("&agencyId=").append(entity.getAgencyId());
+        path.append("?neiId=").append(entity.getId())
+                .append("&agencyId=").append(entity.getAgencyId())
+                .append("&agencyName=").append(agencyEntity.getOrganizationName());
 
         //需要发送的Json
         JSONObject data = new JSONObject();

From 6ee6811f7b68f8a160a91de174ba9c082390f7fb Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 9 Aug 2022 14:09:18 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E5=88=9D=E5=A7=8B=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/epmet/controller/AgencyController.java  | 3 +--
 .../java/com/epmet/service/impl/NeighborHoodServiceImpl.java  | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
index 5fa092643e..333b3eb9d2 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/AgencyController.java
@@ -424,8 +424,7 @@ public class AgencyController {
             name = customerAgencyDTO.getOrganizationName();
             //url组成:信息采集地址?社区id
             StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode());
-            path.append("?agencyId=").append(formDTO.getId())
-                    .append("&agencyName=").append(name);
+            path.append("?agencyId=").append(formDTO.getId());
             //需要发送的Json
             JSONObject data = new JSONObject();
             data.put("path", path.toString());
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
index 7b69614445..a7d6cf0769 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/NeighborHoodServiceImpl.java
@@ -149,12 +149,10 @@ public class NeighborHoodServiceImpl extends BaseServiceImpl<IcNeighborHoodDao,I
             log.warn("获取accessToken失败，customerId:{}", entity.getCustomerId());
             throw new RenException("获取accessToken失败，customerId:{}", entity.getCustomerId());
         }
-        CustomerAgencyEntity agencyEntity = customerAgencyDao.selectById(entity.getAgencyId());
         //跳转的页面
         StringBuilder path = new StringBuilder(CollectUrlEnum.URL_PRE.getCode());
         path.append("?neiId=").append(entity.getId())
-                .append("&agencyId=").append(entity.getAgencyId())
-                .append("&agencyName=").append(agencyEntity.getOrganizationName());
+                .append("&agencyId=").append(entity.getAgencyId());
 
         //需要发送的Json
         JSONObject data = new JSONObject();

From 9a243aae5e27c4c2274e15590e93f6c8479ed755 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 9 Aug 2022 15:05:01 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E5=91=98?=
 =?UTF-8?q?=E5=AE=A2=E6=88=B7id?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/service/impl/IcResiCollectServiceImpl.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
index 998c1ecd4f..d130fee916 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiCollectServiceImpl.java
@@ -228,7 +228,7 @@ public class IcResiCollectServiceImpl extends BaseServiceImpl<IcResiCollectDao,
             if(StringUtils.isNotBlank(entity.getIdNum())){
                 if (MapUtils.isNotEmpty(memMap) && memMap.containsKey(entity.getIdNum())) {
                     entity.setIcResiCollectId(collectInfo.getId());
-                    entity.setCustomerId(memMap.get(entity.getIdNum()).getCustomerId());
+                    entity.setCustomerId(collectInfo.getCustomerId());
                     entity.setId(memMap.get(entity.getIdNum()).getId());
                     icResiMemberDao.updateById(entity);
                     continue;

From 4b1db66e5f60c122ea08e0bfc8d9f7f85d3e8e51 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Tue, 9 Aug 2022 15:28:56 +0800
Subject: [PATCH 4/4] =?UTF-8?q?collect=20sql=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/IcResiCollectDao.xml              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
index 8e35bf93fe..9d6d20ff22 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/IcResiCollectDao.xml
@@ -4,7 +4,7 @@
 <mapper namespace="com.epmet.dao.IcResiCollectDao">
 
     <select id="selectByAddress" parameterType="java.lang.String" resultType="com.epmet.entity.IcResiCollectEntity">
-        select c.id from ic_resi_collect c
+        select c.id,c.CUSTOMER_ID from ic_resi_collect c
         where  c.address=#{address}
         and c.DEL_FLAG='0'
     </select>