/resi/mine/badge/operlist返回状态

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

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

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>

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>