From a570c3fb34d3d5dcdf1bd43f74c8adff3491b129 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 8 Mar 2023 11:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=BD=E7=AB=A0=E8=AF=A6=E6=83=85=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E=E5=BE=BD=E7=AB=A0=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../result/CertificationDetailResultDTO.java  |  5 +++
 .../main/resources/mapper/UserBadgeDao.xml    | 45 ++++++++++---------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
index 0cab1b7039..abb08847ba 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/CertificationDetailResultDTO.java
@@ -65,6 +65,9 @@ public class CertificationDetailResultDTO implements Serializable {
 
     private String gridId;
     private String gridName;
+
+    private String badgeId;
+    private String badgeName;
     public CertificationDetailResultDTO() {
         this.surname = "";
         this.name = "";
@@ -78,5 +81,7 @@ public class CertificationDetailResultDTO implements Serializable {
         this.recordId = "";
         this.gridId="";
         this.gridName="";
+        this.badgeId="";
+        this.badgeName="";
     }
 }
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
index 62d272f323..3a19f2e354 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeDao.xml
@@ -102,32 +102,35 @@
     <!-- 查询单个徽章的认证记录 -->
     <select id="selectBadgeAuthRecord" resultType="com.epmet.dto.result.CertificationDetailResultDTO">
         SELECT
-            SURNAME,
-            NAME,
-            ID_NUM AS idcard,
-            ( CASE WHEN AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
-            MOBILE,
-            CERTIFICATION_IMG,
-            REMAEK AS remark,
-            CUSTOMER_ID,
-            BADGE_ID,
-            CERTIFICATION_IMG,
-            AUDIT_STATUS,
-            AUDIT_STATUS AS authResult,
-            AUDIT_REMARK AS authReason,
-            ID AS recordId,
-            GRID_ID as gridId
+            r.SURNAME,
+            r.NAME,
+            r.ID_NUM AS idcard,
+            ( CASE WHEN r.AUDIT_STATUS = 'approved' THEN 'yes' ELSE 'no' END ) AS isCertificated,
+            r.MOBILE,
+            r.CERTIFICATION_IMG,
+            r.REMAEK AS remark,
+            r.CUSTOMER_ID,
+            r.BADGE_ID,
+            r.CERTIFICATION_IMG,
+            r.AUDIT_STATUS,
+            r.AUDIT_STATUS AS authResult,
+            r.AUDIT_REMARK AS authReason,
+            r.ID AS recordId,
+            r.GRID_ID as gridId,
+            r.BADGE_ID as badgeId,
+            b.BADGE_NAME as badgeName
         FROM
-            user_badge_certificate_record
+            user_badge_certificate_record r
+        left join badge b  on(r.BADGE_ID=b.id)
         WHERE
-            DEL_FLAG = 0
-            AND BADGE_ID = #{badgeId}
+            r.DEL_FLAG = 0
+            AND r.BADGE_ID = #{badgeId}
             <if test="userId != null and userId != '' ">
-                AND USER_ID = #{userId}
-                AND IS_LAST = 'yes'
+                AND r.USER_ID = #{userId}
+                AND r.IS_LAST = 'yes'
             </if>
             <if test="recordId != null and recordId != ''">
-                AND ID = #{recordId}
+                AND r.ID = #{recordId}
             </if>
     </select>