diff --git a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java index b8e96cb..d517a5b 100644 --- a/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java +++ b/safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java @@ -5,10 +5,7 @@ import lombok.experimental.UtilityClass; import org.qinan.safetyeval.client.co.IndustryProfessionalPersonCo; import org.qinan.safetyeval.client.co.QualFilingComplianceCheckResultCO; import org.qinan.safetyeval.client.dto.*; -import org.qinan.safetyeval.domain.constant.MaterialTypeEnum; -import org.qinan.safetyeval.domain.constant.QualFilingComplianceCheckEnum; -import org.qinan.safetyeval.domain.constant.QualFilingMaterialUploadStatusEnum; -import org.qinan.safetyeval.domain.constant.QualificationLevelEnum; +import org.qinan.safetyeval.domain.constant.*; import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProfessionalStandardsDO; import org.springframework.util.CollectionUtils; @@ -229,23 +226,19 @@ public class ComplianceCheckUtil { for (IndustryProfessionalStandardsDO s : standardsDOList) { String key = groupKey(s.getIndustryCode(), s.getProfessionalCapabilityCode()); Long currentPerson = currentCountMap.getOrDefault(key, 0L); - requireNameMap.putIfAbsent(key, s.getProfessionalCapabilityName()); - } - - - for (Map.Entry entry : requireCountMap.entrySet()) { - long require = entry.getValue(); - long current = currentCountMap.getOrDefault(entry.getKey(), 0L); - if (current < require) { - if (failureMsg.length() > 0) { - failureMsg.append(";"); - } - String name = requireNameMap.get(entry.getKey()); - failureMsg.append(name != null ? name : entry.getKey()) - .append(" 需要").append(require).append("人,当前").append(current).append("人"); + if (s.getPersonNum() > currentPerson) { + IndustryEnum industryEnum = IndustryEnum.ofCode(s.getIndustryCode()); + ProfessionalCapabilityEnum professionalCapabilityEnum = ProfessionalCapabilityEnum.ofCode(s.getIndustryCode()); + failureMsg.append(industryEnum.getValue()) + .append(":") + .append(professionalCapabilityEnum.getValue()) + .append(" 需要") + .append(s.getPersonNum()) + .append("人,当前") + .append(currentPerson) + .append("人"); } } - return failureMsg.length() > 0 ? Pair.of(false, failureMsg.toString()) : Pair.of(true, null); }