From 490390f9fc15fd3e2b18046be466b131531763ac Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 3 Apr 2023 17:05:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/dto/result/CertificationDetailResultDTO.java   | 6 ++++++
 .../java/com/epmet/dto/result/UserOperListResultDTO.java | 9 ++++++++-
 .../src/main/resources/mapper/UserBadgeDao.xml           | 6 +++---
 3 files changed, 17 insertions(+), 4 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 abb08847ba..575302ac5c 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
@@ -1,8 +1,10 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * @Author zxc
@@ -68,6 +70,9 @@ public class CertificationDetailResultDTO implements Serializable {
 
     private String badgeId;
     private String badgeName;
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+    private Date createdTime;
+
     public CertificationDetailResultDTO() {
         this.surname = "";
         this.name = "";
@@ -83,5 +88,6 @@ public class CertificationDetailResultDTO implements Serializable {
         this.gridName="";
         this.badgeId="";
         this.badgeName="";
+        this.createdTime=null;
     }
 }
diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java
index 49bbf6be77..88e7216b47 100644
--- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java
+++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/UserOperListResultDTO.java
@@ -51,10 +51,17 @@ public class UserOperListResultDTO implements Serializable {
 
     @JsonIgnore
     private String customerId;
+    /**
+     * 是否开启(点亮) 1:点亮；0:未点亮
+     */
     @JsonIgnore
     private String isOpened;
-    @JsonIgnore
+    /**
+     * 认证(审核)状态 待审核:auditing;审核通过: approved;驳回:rejected;
+     */
+    // @JsonIgnore
     private String auditStatus;
+
     @JsonIgnore
     private Integer sort;
 
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 f9f8390cd1..74eb17d92f 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
@@ -73,7 +73,7 @@
             CREATED_TIME DESC
     </select>
 
-    <!-- 查询徽章认证记录 -->
+    <!-- 查询徽章认证记录 AND CERTIFICATION_AUTID_STATUS = 'approved' -->
     <select id="selectAuthRecord" resultType="com.epmet.dto.result.UserOperListResultDTO">
         SELECT
             CUSTOMER_ID,
@@ -82,7 +82,6 @@
             IS_OPENED
         FROM resi_user_badge
         WHERE DEL_FLAG = 0
-          AND CERTIFICATION_AUTID_STATUS = 'approved'
           AND USER_ID = #{userId}
         order by created_time desc
     </select>
@@ -118,7 +117,8 @@
             r.ID AS recordId,
             r.GRID_ID as gridId,
             r.BADGE_ID as badgeId,
-            b.BADGE_NAME as badgeName
+            b.BADGE_NAME as badgeName,
+            r.CREATED_TIME as createdTime
         FROM
             user_badge_certificate_record r
         left join badge b  on(r.BADGE_ID=b.id and r.CUSTOMER_ID=b.CUSTOMER_ID)

From 2a01e968b28177de10bad78930c31dab9e5d72aa Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Mon, 3 Apr 2023 17:30:06 +0800
Subject: [PATCH 2/3] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/resi/mine/dto/result/OperListResultDTO.java    | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java
index d202918818..178c11390b 100644
--- a/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java
+++ b/epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/result/OperListResultDTO.java
@@ -48,4 +48,9 @@ public class OperListResultDTO implements Serializable {
      */
     private String badgeType;
 
+    /**
+     * 认证(审核)状态 待审核:auditing;审核通过: approved;驳回:rejected;
+     */
+    // @JsonIgnore
+    private String auditStatus;
 }

From 53584a65b62b1aadc62de50bcbe46e01ffa9adc7 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 4 Apr 2023 09:12:01 +0800
Subject: [PATCH 3/3] =?UTF-8?q?/resi/mine/badge/operlist=E8=BF=94=E5=9B=9E?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dao/UserBadgeCertificateRecordDao.java    |  2 ++
 .../service/impl/UserBadgeServiceImpl.java    | 30 +++++++++++++++++--
 .../mapper/UserBadgeCertificateRecordDao.xml  | 14 ++++++++-
 .../main/resources/mapper/UserBadgeDao.xml    |  3 +-
 4 files changed, 44 insertions(+), 5 deletions(-)

diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java
index 2d73b4bac6..947fc5fb02 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserBadgeCertificateRecordDao.java
@@ -40,4 +40,6 @@ public interface UserBadgeCertificateRecordDao extends BaseDao<UserBadgeCertific
      */
     Integer selectIsExist(@Param("badgeId")String badgeId,@Param("userId")String userId);
 
+    UserBadgeCertificateRecordEntity selectCertificateRecord(@Param("badgeId")String badgeId,@Param("userId")String userId);
+
 }
\ No newline at end of file
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
index 8d691d4252..3154e8c774 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserBadgeServiceImpl.java
@@ -3,6 +3,7 @@ package com.epmet.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.epmet.commons.tools.constant.NumConstant;
+import com.epmet.commons.tools.constant.StrConstant;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
@@ -26,6 +27,7 @@ import com.epmet.dto.UserBadgeCertificateRecordDTO;
 import com.epmet.dto.form.*;
 import com.epmet.dto.result.*;
 import com.epmet.entity.BadgeEntity;
+import com.epmet.entity.UserBadgeCertificateRecordEntity;
 import com.epmet.feign.EpmetMessageOpenFeignClient;
 import com.epmet.feign.EpmetUserOpenFeignClient;
 import com.epmet.feign.GovOrgFeignClient;
@@ -140,17 +142,39 @@ public class UserBadgeServiceImpl implements UserBadgeService {
                 u.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
                 u.setIsCertificated(BadgeConstant.NO);
                 u.setIsReject(false);
+                u.setAuditStatus(StrConstant.EPMETY_STR);
             });
             return userOperListResultDTOS;
         }
         userOperListResultDTOS.forEach(ub -> {
-            userAuthBadgeList.forEach(u -> {
-                if (ub.getBadgeId().equals(u.getBadgeId())){
+            Boolean authFlag=false;
+            for (UserOperListResultDTO u : userAuthBadgeList) {
+                ub.setAuditStatus(StrConstant.EPMETY_STR);
+                if (ub.getBadgeId().equals(u.getBadgeId())) {
                     ub.setIsReject(u.getAuditStatus().equals(BadgeConstant.REJECTED));
                     ub.setIsCertificated(u.getAuditStatus().equals(BadgeConstant.APPROVED) ? BadgeConstant.YES : BadgeConstant.NO);
                     ub.setIsLighted(u.getIsOpened().equals(NumConstant.ZERO_STR) ? BadgeConstant.NO : BadgeConstant.YES);
+                    ub.setAuditStatus(u.getAuditStatus());
+                    authFlag = true;
                 }
-            });
+            }
+            if (!authFlag) {
+                UserBadgeCertificateRecordEntity entity = userBadgeCertificateRecordDao.selectCertificateRecord(ub.getBadgeId(), userOperListFormDTO.getUserId());
+                if (null == entity) {
+                    //未申请
+                    ub.setIsReject(null);
+                    ub.setIsLighted(BadgeConstant.NO);
+                    ub.setAuditStatus(StrConstant.EPMETY_STR);
+                    ub.setIsCertificated(BadgeConstant.NO);
+                } else {
+                    //申请了
+                    ub.setIsReject(entity.getAuditStatus().equals(BadgeConstant.REJECTED));
+                    ub.setIsLighted(BadgeConstant.NO);
+                    ub.setAuditStatus(entity.getAuditStatus());
+                    ub.setIsCertificated(BadgeConstant.YES);
+                }
+            }
+
         });
         Map<String, List<UserOperListResultDTO>> collect = userOperListResultDTOS.stream().collect(Collectors.groupingBy(UserOperListResultDTO::getIsLighted));
         List<UserOperListResultDTO> result = collect.get(BadgeConstant.YES);
diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml
index 2a58027d9c..bd895279b0 100644
--- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml
+++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserBadgeCertificateRecordDao.xml
@@ -40,5 +40,17 @@
           AND (AUDIT_STATUS = 'approved' OR AUDIT_STATUS = 'auditing')
     </select>
 
-
+    <select id="selectCertificateRecord" parameterType="map" resultType="com.epmet.entity.UserBadgeCertificateRecordEntity">
+        SELECT
+            r.*
+        FROM
+            user_badge_certificate_record r
+        WHERE
+            r.DEL_FLAG = '0'
+          AND r.USER_ID = #{userId}
+          AND r.BADGE_ID = #{badgeId}
+        ORDER BY
+            r.CREATED_TIME DESC
+            LIMIT 1
+    </select>
 </mapper>
\ No newline at end of file
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 74eb17d92f..fb8acd52bb 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
@@ -73,7 +73,7 @@
             CREATED_TIME DESC
     </select>
 
-    <!-- 查询徽章认证记录 AND CERTIFICATION_AUTID_STATUS = 'approved' -->
+    <!-- 查询徽章认证记录  -->
     <select id="selectAuthRecord" resultType="com.epmet.dto.result.UserOperListResultDTO">
         SELECT
             CUSTOMER_ID,
@@ -82,6 +82,7 @@
             IS_OPENED
         FROM resi_user_badge
         WHERE DEL_FLAG = 0
+          AND CERTIFICATION_AUTID_STATUS = 'approved'
           AND USER_ID = #{userId}
         order by created_time desc
     </select>