dev_1.0.1
luotaiqian 2026-07-15 10:58:24 +08:00
parent d73d0de775
commit 86d0b6bcdc
1 changed files with 12 additions and 19 deletions

View File

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