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; } 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/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 { - 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> collect = userOperListResultDTOS.stream().collect(Collectors.groupingBy(UserOperListResultDTO::getIsLighted)); List 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') - + \ 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 f9f8390cd1..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 - +