1、联调人员证照列表、图片

web-app/src/main/java/com/zcloud/certificate/command/UserCertificateAddExe.java

@@ -38,7 +38,6 @@ public class UserCertificateAddExe {
 
         boolean res = false;
         try {
-            userCertificateE.setCorpinfoId(ssoUser != null ? ssoUser.getTenantId() : null);
             res = userCertificateGateway.add(userCertificateE);
         } catch (Exception e) {
             throw new RuntimeException(e);

web-app/src/main/java/com/zcloud/certificate/command/convertor/UserCertificateCoConvertor.java

@@ -29,5 +29,9 @@ public interface UserCertificateCoConvertor {
     List<UserCertificateStatCO> converStatDOsToStatCOs(List<UserCertificateStatDO> userCertificateStatDOs);
 
     UserCertificateCO converEToCO(UserCertificateE userCertificateE);
+
+    List<UserCertificateE> converDOsToEs(List<UserCertificateDO> userCertificateDOs);
+
+    List<UserCertificateCO> converEsToCOs(List<UserCertificateE> userCertificateEs);
 }
 

web-app/src/main/java/com/zcloud/certificate/command/query/UserCertificateQueryExe.java

@@ -14,10 +14,13 @@ import com.zcloud.certificate.persistence.repository.UserCertificateRepository;
 import com.zcloud.gbscommon.utils.PageQueryHelper;
 import com.alibaba.cola.dto.PageResponse;
 import lombok.AllArgsConstructor;
+import org.ehcache.core.util.CollectionUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Component;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -59,8 +62,26 @@ public class UserCertificateQueryExe {
             qry.setEqUserId(ssoUser.getUserId());
         }
         Map<String, Object> params = PageQueryHelper.toHashMap(qry);
+
         PageResponse<UserCertificateDO> iPage = userCertificateRepository.listPageWithUser(params);
-        List<UserCertificateCO> cos = userCertificateCoConvertor.converDOsToCOs(iPage.getData());
+
+        List<UserCertificateE> userCertificateES = userCertificateCoConvertor.converDOsToEs(iPage.getData());
+        List<Long> userIds = userCertificateES.stream().map(UserCertificateE::getUserId).distinct().collect(Collectors.toList());
+        if (CollectionUtils.isEmpty(userIds)) {
+            return PageResponse.of(Collections.emptyList(), iPage.getTotalCount(), iPage.getPageSize(), iPage.getPageIndex());
+        }
+        List<com.zcloud.certificate.domain.model.UserBasicInfo> userBasicInfos = userCertificateRepository.getUserNamesByUserIds(userIds);
+
+        Map<Long, com.zcloud.certificate.domain.model.UserBasicInfo> userInfoMap = userBasicInfos.stream()
+                .collect(Collectors.toMap(com.zcloud.certificate.domain.model.UserBasicInfo::getUserId, info -> info, (k1, k2) -> k1));
+
+        userCertificateES.forEach(e -> {
+            com.zcloud.certificate.domain.model.UserBasicInfo userBasicInfo = userInfoMap.get(e.getUserId());
+            e.attach(userBasicInfo);
+        });
+
+        List<UserCertificateCO> cos = userCertificateCoConvertor.converEsToCOs(userCertificateES);
+
         return PageResponse.of(cos, iPage.getTotalCount(), iPage.getPageSize(), iPage.getPageIndex());
     }
 

web-client/src/main/java/com/zcloud/certificate/dto/UserCertificateAddCmd.java

@@ -28,6 +28,9 @@ public class UserCertificateAddCmd extends Command {
     @ApiModelProperty(value = "用户id", name = "userId", required = true)
 //    @NotNull(message = "用户id不能为空")
     private Long userId;
+
+    @ApiModelProperty(value = "业务主键ID")
+    private String userCertificateId;
     
     @ApiModelProperty(value = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员", name = "type", required = true)
     @NotNull(message = "1-特种作业，2-特种设备，3-主要负责人，4-安全生产管理人员不能为空")

web-infrastructure/src/main/java/com/zcloud/certificate/gatewayimpl/UserCertificateGatewayImpl.java

@@ -23,7 +23,8 @@ public class UserCertificateGatewayImpl implements UserCertificateGateway {
 
     @Override
     public Boolean add(UserCertificateE userCertificateE) {
-        UserCertificateDO d = new UserCertificateDO(Tools.get32UUID());
+        UserCertificateDO d = new UserCertificateDO(userCertificateE.getUserCertificateId());
+//        UserCertificateDO d = new UserCertificateDO(Tools.get32UUID());
         BeanUtils.copyProperties(userCertificateE, d,"userCertificateId");
         userCertificateRepository.save(d);
         return true;

web-infrastructure/src/main/java/com/zcloud/certificate/persistence/dataobject/UserCertificateDO.java

@@ -1,7 +1,9 @@
 package com.zcloud.certificate.persistence.dataobject;
 
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.jjb.saas.framework.repository.basedo.BaseDO;
+import com.zcloud.gbscommon.utils.Tools;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -82,7 +84,8 @@ public class UserCertificateDO extends BaseDO {
     private LocalDate reviewDate;
 
   public UserCertificateDO(String userCertificateId) {
-        this.userCertificateId = userCertificateId;
+        if (StrUtil.isNotBlank(userCertificateId)) this.userCertificateId = userCertificateId;
+        else this.userCertificateId = Tools.get32UUID();
     }
 
 }

web-infrastructure/src/main/resources/mapper/UserCertificateMapper.xml

@@ -22,6 +22,7 @@
         LEFT JOIN
             post p ON p.id = u.post_id
         WHERE 1=1
+            AND uc.delete_enum = 'false'
             <if test="params.tenantId != null">
                 AND uc.tenant_id = #{params.tenantId}
             </if>