import
parent
e8e4b61553
commit
e1c5861f09
|
|
@ -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 = ":";
|
||||
}
|
||||
|
|
@ -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.mapper.IndustryProfessionalStandardsMapper;
|
||||
import org.springframework.util.CollectionUtils;
|
||||
import org.springframework.util.StringUtils;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.*;
|
||||
|
|
@ -415,7 +414,7 @@ public class ComplianceCheckUtil {
|
|||
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());
|
||||
personCapabilityMap.computeIfAbsent(pc.getPersonnelId(), k -> new HashSet<>())
|
||||
.addAll(pdcSet);
|
||||
|
|
@ -438,7 +437,7 @@ public class ComplianceCheckUtil {
|
|||
ProfessionalCapabilityEnum capEnum = ProfessionalCapabilityEnum.ofCode(capCode);
|
||||
String capName = capEnum != null ? capEnum.getValue() : capCode;
|
||||
failureMsg.append(industryName)
|
||||
.append(":")
|
||||
.append(CommonUtil.COLON)
|
||||
.append(capName)
|
||||
.append(" 需要")
|
||||
.append(required)
|
||||
|
|
|
|||
Loading…
Reference in New Issue