From 70dcd7add543a360a4c4ed8d02f988b258e827e4 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 17 Nov 2025 16:42:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=B6=88=E6=81=AF=E5=AE=9A?= =?UTF-8?q?=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=A4=84=E7=90=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/enterprise/PersonnelService.java | 30 +++++++++++++++++-- .../domain/mainDatabase/po/ErrorInfo.java | 7 +++++ .../vo/EnterprisePersonnelVo.java | 5 ++++ .../bonus/common/utils/CertificateUtil.java | 2 +- .../mapper/IMDErrorInfoMapper.java | 10 +++++++ .../service/IMDErrorInfoService.java | 10 +++++++ .../service/impl/MDErrorInfoServiceImpl.java | 6 ++++ .../resources/mapper/EnterpriseMapper.xml | 2 +- .../main/resources/mapper/ErrorInfoMapper.xml | 16 +++++++++- .../main/resources/mapper/TechnicalMapper.xml | 3 +- 10 files changed, 84 insertions(+), 7 deletions(-) diff --git a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java index 0e2a1e6..3674973 100644 --- a/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java +++ b/bonus-admin/src/main/java/com/bonus/web/service/enterprise/PersonnelService.java @@ -10,6 +10,7 @@ import com.bonus.common.domain.mainDatabase.po.EnterprisePersonnel; import com.bonus.common.domain.mainDatabase.po.ErrorInfo; import com.bonus.common.domain.mainDatabase.po.PersonnelCertificate; import com.bonus.common.domain.mainDatabase.vo.EnterprisePersonnelVo; +import com.bonus.common.domain.mainDatabase.vo.EnterpriseVo; import com.bonus.common.utils.CertificateUtil; import com.bonus.common.utils.ValidatorsUtils; import com.bonus.file.service.FileUploadService; @@ -67,7 +68,30 @@ public class PersonnelService { * @date 2025/10/22 16:18 */ public List getList(EnterprisePersonnelDto dto) { - return imdPersonnelService.getList(dto); + List list = imdPersonnelService.getList(dto); + for (EnterprisePersonnelVo vo : list) { + // 查询人员相关证件id + List businessIds = imdErrorInfoService.getCertificateIds(vo); + ErrorInfo errorQueryDto = createErrorQueryDto(vo,businessIds); + // 查询异常消息 + List errorList = imdErrorInfoService.getErrorInfoByTable(errorQueryDto); + vo.setErrorInfos(errorList); + } + return list; + } + + /** + * 创建查询条件 + * @param vo + * @return ErrorInfo + * @author cwchen + * @date 2025/11/17 13:27 + */ + public static ErrorInfo createErrorQueryDto(EnterprisePersonnelVo vo,List businessIds){ + ErrorInfo errorInfo = new ErrorInfo(); + errorInfo.setSourceTable(TableConstants.TB_PERSONNEL_CERTIFICATE); + errorInfo.setBusinessIds(businessIds); + return errorInfo; } /** @@ -119,7 +143,7 @@ public class PersonnelService { item.getPersonnelCertificate().getCertificateType(), item.getPersonnelCertificate().getPersonnelCertificateId(), dto.getEnterpriseId(), - TableConstants.TB_ENTERPRISE_PERSONNEL); + TableConstants.TB_PERSONNEL_CERTIFICATE); if (Objects.nonNull(errorInfo)) { errorInfos.add(errorInfo); } @@ -217,7 +241,7 @@ public class PersonnelService { item.getPersonnelCertificate().getCertificateType(), item.getPersonnelCertificate().getPersonnelCertificateId(), dto.getEnterpriseId(), - TableConstants.TB_ENTERPRISE_PERSONNEL); + TableConstants.TB_PERSONNEL_CERTIFICATE); if (Objects.nonNull(errorInfo)) { errorInfos.add(errorInfo); } diff --git a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/po/ErrorInfo.java b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/po/ErrorInfo.java index 5de9a36..5b4d951 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/po/ErrorInfo.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/po/ErrorInfo.java @@ -1,6 +1,8 @@ package com.bonus.common.domain.mainDatabase.po; import java.util.Date; +import java.util.List; + import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -37,6 +39,11 @@ public class ErrorInfo { */ private Long businessId; + /** + * 业务ids + */ + private List businessIds; + /** * 业务类型(字典表配置) */ diff --git a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/vo/EnterprisePersonnelVo.java b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/vo/EnterprisePersonnelVo.java index 4351705..c20c08f 100644 --- a/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/vo/EnterprisePersonnelVo.java +++ b/bonus-common/src/main/java/com/bonus/common/domain/mainDatabase/vo/EnterprisePersonnelVo.java @@ -54,6 +54,11 @@ public class EnterprisePersonnelVo { */ private String employmentYears; + /** + * 异常信息 + */ + private List errorInfos; + /**人员详情*/ @Data public static class PersonnelDetailVo { diff --git a/bonus-common/src/main/java/com/bonus/common/utils/CertificateUtil.java b/bonus-common/src/main/java/com/bonus/common/utils/CertificateUtil.java index a795115..20cb26f 100644 --- a/bonus-common/src/main/java/com/bonus/common/utils/CertificateUtil.java +++ b/bonus-common/src/main/java/com/bonus/common/utils/CertificateUtil.java @@ -28,7 +28,7 @@ public class CertificateUtil { CERTIFICATE_ERROR_MAP.put("constructor_certificate", "【建造师证书】已过期"); CERTIFICATE_ERROR_MAP.put("safety_assessment_certificate_b", "【安全考核B证】已过期"); CERTIFICATE_ERROR_MAP.put("safety_assessment_certificate_c", "【安全考核C证】已过期"); - CERTIFICATE_ERROR_MAP.put("professional_title_certificate", "【质检员证】已过期"); + CERTIFICATE_ERROR_MAP.put("professional_title_certificate", "【职称证】已过期"); CERTIFICATE_ERROR_MAP.put("quality_inspector_certificate", "【质检员证】已过期"); CERTIFICATE_ERROR_MAP.put("construction_worker_certificate", "【施工员证】已过期"); CERTIFICATE_ERROR_MAP.put("materials_officer_certificate", "【材料员证】已过期"); diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDErrorInfoMapper.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDErrorInfoMapper.java index 04e43a2..2901ab9 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDErrorInfoMapper.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/mapper/IMDErrorInfoMapper.java @@ -1,6 +1,7 @@ package com.bonus.mainDataBase.mapper; import com.bonus.common.domain.mainDatabase.po.ErrorInfo; +import com.bonus.common.domain.mainDatabase.vo.EnterprisePersonnelVo; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @@ -75,4 +76,13 @@ public interface IMDErrorInfoMapper { * @date 2025/11/17 14:29 */ List getErrorInfoByBusiness(@Param("list") List businessIds,@Param("tableName") String tableName); + + /** + * 查询人员相关证件id + * @param vo + * @return List + * @author cwchen + * @date 2025/11/17 15:46 + */ + List getCertificateIds(EnterprisePersonnelVo vo); } diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDErrorInfoService.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDErrorInfoService.java index d02a1b9..299909a 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDErrorInfoService.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/IMDErrorInfoService.java @@ -1,6 +1,7 @@ package com.bonus.mainDataBase.service; import com.bonus.common.domain.mainDatabase.po.ErrorInfo; +import com.bonus.common.domain.mainDatabase.vo.EnterprisePersonnelVo; import org.apache.ibatis.annotations.Param; import javax.validation.constraints.NotNull; @@ -73,4 +74,13 @@ public interface IMDErrorInfoService { * @date 2025/11/17 14:28 */ List getErrorInfoByBusiness(List businessIds, String tbEnterprise); + + /** + * 查询人员相关证件 + * @param vo + * @return List + * @author cwchen + * @date 2025/11/17 15:45 + */ + List getCertificateIds(EnterprisePersonnelVo vo); } diff --git a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDErrorInfoServiceImpl.java b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDErrorInfoServiceImpl.java index ea0beb6..d4bca11 100644 --- a/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDErrorInfoServiceImpl.java +++ b/bonus-mainDatabase/src/main/java/com/bonus/mainDataBase/service/impl/MDErrorInfoServiceImpl.java @@ -1,6 +1,7 @@ package com.bonus.mainDataBase.service.impl; import com.bonus.common.domain.mainDatabase.po.ErrorInfo; +import com.bonus.common.domain.mainDatabase.vo.EnterprisePersonnelVo; import com.bonus.mainDataBase.mapper.IMDErrorInfoMapper; import com.bonus.mainDataBase.service.IMDErrorInfoService; import lombok.extern.slf4j.Slf4j; @@ -54,4 +55,9 @@ public class MDErrorInfoServiceImpl implements IMDErrorInfoService { public List getErrorInfoByBusiness(List businessIds, String tableName) { return imdErrorInfoMapper.getErrorInfoByBusiness(businessIds,tableName); } + + @Override + public List getCertificateIds(EnterprisePersonnelVo vo) { + return imdErrorInfoMapper.getCertificateIds(vo); + } } diff --git a/bonus-mainDatabase/src/main/resources/mapper/EnterpriseMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/EnterpriseMapper.xml index 29f5979..08a99c9 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/EnterpriseMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/EnterpriseMapper.xml @@ -15,7 +15,7 @@ AND INSTR(te.enterprise_name,#{enterpriseName}) > 0 - ORDER BY update_time DESC + ORDER BY create_time DESC diff --git a/bonus-mainDatabase/src/main/resources/mapper/ErrorInfoMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/ErrorInfoMapper.xml index 697272f..b158bf3 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/ErrorInfoMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/ErrorInfoMapper.xml @@ -61,7 +61,16 @@ @@ -74,4 +83,9 @@ #{item} + + + diff --git a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml index bf75ef9..5683d5a 100644 --- a/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml +++ b/bonus-mainDatabase/src/main/resources/mapper/TechnicalMapper.xml @@ -108,11 +108,12 @@