cq_anquan
/
safety-eval-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import

dev
luotaiqian 2026-08-03 16:41:21 +08:00
parent e8e4b61553
commit e1c5861f09
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/CommonUtil.java Normal file
View File

@ -0,0 +1,9 @@
package org.qinan.safetyeval.infrastructure.utils;
import lombok.experimental.UtilityClass;
@UtilityClass
public class CommonUtil {
public static final String COMMA = ",";
public static final String COLON = ":";
}

5
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/utils/ComplianceCheckUtil.java
View File

@ -17,7 +17,6 @@ import org.qinan.safetyeval.infrastructure.persistence.domainobject.IndustryProf
import org.qinan.safetyeval.infrastructure.persistence.domainobject.OrgPersonnelLeaderCountDO; import org.qinan.safetyeval.infrastructure.persistence.domainobject.OrgPersonnelLeaderCountDO;
import org.qinan.safetyeval.infrastructure.persistence.mapper.IndustryProfessionalStandardsMapper; import org.qinan.safetyeval.infrastructure.persistence.mapper.IndustryProfessionalStandardsMapper;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import org.springframework.util.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.*; import java.util.*;
@ -415,7 +414,7 @@ public class ComplianceCheckUtil {
IndustryProfessionalPersonCo co = personnelMap.get(pc.getPersonnelId()); IndustryProfessionalPersonCo co = personnelMap.get(pc.getPersonnelId());
// 人员学科能力 // 人员学科能力
Set<String> pdcSet = Arrays.stream(co.getProfessionalCapabilityCode().split(",")) Set<String> pdcSet = Arrays.stream(co.getProfessionalCapabilityCode().split(CommonUtil.COMMA))
.collect(Collectors.toSet()); .collect(Collectors.toSet());
personCapabilityMap.computeIfAbsent(pc.getPersonnelId(), k -> new HashSet<>()) personCapabilityMap.computeIfAbsent(pc.getPersonnelId(), k -> new HashSet<>())
.addAll(pdcSet); .addAll(pdcSet);
@ -438,7 +437,7 @@ public class ComplianceCheckUtil {
ProfessionalCapabilityEnum capEnum = ProfessionalCapabilityEnum.ofCode(capCode); ProfessionalCapabilityEnum capEnum = ProfessionalCapabilityEnum.ofCode(capCode);
String capName = capEnum != null ? capEnum.getValue() : capCode; String capName = capEnum != null ? capEnum.getValue() : capCode;
failureMsg.append(industryName) failureMsg.append(industryName)
.append(":") .append(CommonUtil.COLON)
.append(capName) .append(capName)
.append(" 需要") .append(" 需要")
.append(required) .append(required)