Merge remote-tracking branch 'origin_elink/yantai_zhengwu_master'

3 years ago · bd77c7f4e3
7 changed files with 64 additions and 7 deletions
--- 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;
 }
--- 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;
    }
 }
--- 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;

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

-    <!-- 查询徽章认证记录 -->
+    <!-- 查询徽章认证记录  -->
    <select id="selectAuthRecord" resultType="com.epmet.dto.result.UserOperListResultDTO">
        SELECT
            CUSTOMER_ID,
@ -118,7 +118,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)