/resi/mine/badge/operlist返回时间和状态

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;
     }
 }

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;
 

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)