From b03bea4745315d5c1381e070cafa06ca19bff952 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 8 Aug 2022 14:03:45 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E9=87=87=E9=9B=86=E8=AF=A6=E6=83=85=E6=B7=BB=E5=8A=A0=E7=A4=BE?=
 =?UTF-8?q?=E5=8C=BAid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/form/CollectDetailResultDTO.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
index 9bdac7a9a4..3f2f2f728b 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/CollectDetailResultDTO.java
@@ -13,6 +13,11 @@ public class CollectDetailResultDTO implements Serializable {
 
     private String id;
 
+    /**
+     * 组织Id
+     */
+    private String agencyId;
+
     /**
      * 所属小区ID
      */

From 098b9ec2a2940d34b603bacd90a781eaa9dec91b Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Mon, 8 Aug 2022 16:17:00 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=88=91=E7=9A=84=E7=99=BB=E8=AE=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8=E5=8E=9F?=
 =?UTF-8?q?=E5=9B=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/dto/result/CollectPageListDTO.java   | 5 +++++
 .../src/main/resources/mapper/IcResiCollectDao.xml           | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java
index 2435748e79..a25dbcdfec 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CollectPageListDTO.java
@@ -42,6 +42,11 @@ public class CollectPageListDTO implements Serializable {
      */
     private String checkStateName;
 
+    /**
+     * 审核原因
+     */
+    private String checkReason;
+
     /**
      * 提交时间
      */
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 d3d6b955d4..8e35bf93fe 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
@@ -116,12 +116,14 @@
 						 '居民登记' as title,
 						 ADDRESS,
 						 CHECK_STATE,
+
 						 case CHECK_STATE
 						 when '0' then '待审核'
 						 when '1' then '审核不通过'
 						 when '2' then '审核通过'
 						 else ''
 						 end as checkStateName,
+						 CHECK_REASON,
 						 CREATED_TIME
 			from ic_resi_collect
 			where DEL_FLAG='0'
@@ -134,6 +136,7 @@
 						 ADDRESS,
 						 '2' as checkState,
 						 '审核通过' as checkStateName,
+						 '' as checkReason,
 						 CREATED_TIME
 			from ic_resi_collect_visitor
 			where DEL_FLAG='0'