From 40980527f66e1ee4df73ea96794d732f903529af Mon Sep 17 00:00:00 2001
From: zxc <954985705@qq.com>
Date: Mon, 27 Apr 2020 13:29:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E5=B7=B2?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=85=9A=E5=91=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/CertifiedResultDTO.java  | 15 +++++++++++++
 .../epmet/service/ResiPartyMemberService.java |  3 +--
 .../result/CertifiedResultDTO.java            | 15 +++++++++++++
 .../mapper/partymember/PartymemberInfoDao.xml | 21 ++++++++++++-------
 .../epmet/dto/result/CertifiedResultDTO.java  | 15 +++++++++++++
 5 files changed, 59 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
index f7540d8b0b..db42fbe84d 100644
--- a/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
+++ b/epmet-module/gov-grid/gov-grid-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
@@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable {
      */
     private String gridFullPath;
 
+    /**
+     * 党员认证信息表id
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
+
 }
diff --git a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
index 7efe7528f3..0d274382e6 100644
--- a/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
+++ b/epmet-module/gov-grid/gov-grid-server/src/main/java/com/epmet/service/ResiPartyMemberService.java
@@ -1,12 +1,10 @@
 package com.epmet.service;
 
-import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.form.AuditedPartyMemberFormDTO;
 import com.epmet.dto.form.AuditingPartyMemberFormDTO;
 import com.epmet.dto.form.CertifiedFormDTO;
 import com.epmet.dto.result.CertifiedResultDTO;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.List;
 import com.epmet.dto.result.AuditedPartyMemberResultDTO;
@@ -36,6 +34,7 @@ public interface ResiPartyMemberService {
      * @Date 2020/4/26 23:32
      **/
     Result<List<AuditedPartyMemberResultDTO>> audited(AuditedPartyMemberFormDTO formDTO);
+
     /**
      *
      * @Description 获取已认证党员
diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java
index 9e5568441b..1c4dddc50c 100644
--- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java
+++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/result/CertifiedResultDTO.java
@@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable {
      */
     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/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
index ca2314e514..b30353f09d 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml
@@ -61,16 +61,21 @@
     <!-- 查询已认证党员 -->
     <select id="selectCertifiedList" resultType="com.epmet.dto.result.CertifiedResultDTO">
         SELECT
-            user_id AS userId,
-            CONCAT(surname,name) AS realName,
-            UNIX_TIMESTAMP( created_time ) AS applyTime
+            pi.user_id AS userId,
+            CONCAT(pi.surname,pi.name) AS realName,
+            UNIX_TIMESTAMP( pi.created_time ) AS applyTime,
+            pi.id AS partyMemberId,
+            IFNULL(pca.partymember_info_id,'') AS autoId,
+            IFNULL(pcm.partymember_info_id,'') AS manualId
         FROM
-            partymember_info
+            partymember_info pi
+        LEFT JOIN partymember_confirm_auto pca ON pi.id = pca.partymember_info_id
+        LEFT JOIN partymember_confirm_manual pcm ON pi.id = pcm.partymember_info_id
         WHERE
-            grid_id = #{gridId}
-            AND confirm_result IN ( 'auto_confirm_success', 'approved' )
-            AND del_flag = 0
-            LIMIT #{pageNo},#{pageSize}
+            pi.grid_id = #{gridId}
+            AND pi.confirm_result IN ( 'auto_confirm_success', 'approved' )
+            AND pi.del_flag = 0
+        LIMIT #{pageNo},#{pageSize}
     </select>
 
 
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
index f7540d8b0b..db42fbe84d 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertifiedResultDTO.java
@@ -39,4 +39,19 @@ public class CertifiedResultDTO implements Serializable {
      */
     private String gridFullPath;
 
+    /**
+     * 党员认证信息表id
+     */
+    private String partyMemberId;
+
+    /**
+     * 党员自动审核表ID
+     */
+    private String autoId;
+
+    /**
+     * 党员人工审核表ID
+     */
+    private String manualId;
+
 }