Merge remote-tracking branch 'origin/feature/dev_information_register' into feature/dev_information_register

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
      */

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;
+
     /**
      * 提交时间
      */

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'