From fca4a97c48cbf4c6c8dcc15e62932f4b3dda706d Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 27 Apr 2020 11:08:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=85=E5=AE=A1=E6=A0=B8=E5=85=9A=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=EF=BC=8C=E5=AE=A1=E6=A0=B8=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/AuditedPartyMemberResultDTO.java   | 15 +++++++++++
 .../result/AuditingPartyMemberResultDTO.java  | 15 +++++++++++
 .../result/ReviewedParyMemberResultDTO.java   | 15 +++++++++++
 .../UnderReviewParyMemberResultDTO.java       | 15 +++++++++++
 .../partymember/PartymemberBaseInfoDao.xml    | 27 ++++++++++++++++---
 5 files changed, 83 insertions(+), 4 deletions(-)

diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
index a5558e101b..96cfa3ffe4 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditedPartyMemberResultDTO.java
@@ -42,5 +42,20 @@ public class AuditedPartyMemberResultDTO implements Serializable {
      * read已读unread未读
      */
     private String gridFullPath;
+
+    /**
+     * 党员认证信息表ID
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
 }
 
diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
index 5259b62602..b7fa6ff38d 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/AuditingPartyMemberResultDTO.java
@@ -43,5 +43,20 @@ public class AuditingPartyMemberResultDTO implements Serializable {
      * read已读unread未读
      */
     private String gridFullPath;
+
+    /**
+     * 党员认证信息表ID
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
 }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
index c73aeb5f52..704b9f9b7a 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/ReviewedParyMemberResultDTO.java
@@ -40,5 +40,20 @@ public class ReviewedParyMemberResultDTO {
      * 提交网格：XXX街道-XXX社区-XXX网格
      */
     private String gridFullPath;
+
+    /**
+     * 党员认证信息表ID
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
 }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
index baf6df1f52..f625e3117c 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/UnderReviewParyMemberResultDTO.java
@@ -43,5 +43,20 @@ public class UnderReviewParyMemberResultDTO implements Serializable {
      * 提交网格：XXX街道-XXX社区-XXX网格
      */
     private String gridFullPath;
+
+    /**
+     * 党员认证信息表ID
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
 }
 
diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
index 2f4819d69b..39e0ee43d4 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml
@@ -54,21 +54,27 @@
           AND DEL_FLAG = 0
     </select>
 
-    <!--  根据网格id分页查询待审核党员列表 -->
+    <!--  根据网格id分页查询待审核党员列表自动审核失败且已经填写补充信息的 -->
     <select id="selectListUnderReviewParyMember" parameterType="com.epmet.resi.partymember.dto.partymember.form.UnderReviewParyMemberFormDTO"
             resultType="com.epmet.resi.partymember.dto.partymember.result.UnderReviewParyMemberResultDTO">
         SELECT
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
             pi.CREATED_TIME AS applyTime,
-            pcm.READ_FLAG AS readFlag
+            pcm.READ_FLAG AS readFlag,
+            pi.id as partyMemberId,
+            pca.id as autoId,
+            pcm.id as manualId
         FROM
             partymember_info pi
             LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
         WHERE
             pi.DEL_FLAG = '0'
             AND pcm.DEL_FLAG = '0'
+            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT = 'auto_confirm_failed'
+            and pcm.AUDIT_STATUS='under_auditting'
             AND pi.EXTRA_ORGANIZATION IS NOT NULL
             AND pi.GRID_ID = #{gridId}
         ORDER BY
@@ -83,11 +89,16 @@
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
             pi.CREATED_TIME AS applyTime,
-            pi.CONFIRM_RESULT AS status
+            pi.CONFIRM_RESULT AS status,
+            pi.id as partyMemberId,
+            pca.id as autoId,
+            '' as manualId
         FROM
             partymember_info pi
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
         WHERE
             pi.DEL_FLAG = '0'
+            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT ='auto_confirm_failed'
             AND (pi.EXTRA_ORGANIZATION is null or trim(pi.EXTRA_ORGANIZATION)='')
             AND pi.GRID_ID = #{gridId}
@@ -96,12 +107,20 @@
             pi.USER_ID AS userId,
             concat( pi.SURNAME, pi.NAME ) AS realName,
             pi.CREATED_TIME AS applyTime,
-            pi.CONFIRM_RESULT AS status
+            pi.CONFIRM_RESULT AS status,
+            pi.id as partyMemberId,
+            pca.id as autoId,
+            pcm.id as manualId
         FROM
             partymember_info pi
+            LEFT JOIN partymember_confirm_manual pcm ON ( pi.id = pcm.PARTYMEMBER_INFO_ID )
+            LEFT JOIN partymember_confirm_auto pca ON(pi.id=pca.PARTYMEMBER_INFO_ID)
         WHERE
             pi.DEL_FLAG = '0'
+            AND pcm.del_flag='0'
+            AND pca.del_flag='0'
             AND pi.CONFIRM_RESULT ='rejected'
+            and pcm.AUDIT_STATUS='rejected'
             AND pi.EXTRA_ORGANIZATION IS NOT NULL
             AND pi.GRID_ID = #{gridId}
         ORDER BY