init
parent
ea3b3465c1
commit
0c25c742e1
|
|
@ -368,20 +368,12 @@ public class ComplianceCheckUtil {
|
||||||
|
|
||||||
// 3. 构建人员→可担任专业能力code集合(同一人可能具备多个专业能力)
|
// 3. 构建人员→可担任专业能力code集合(同一人可能具备多个专业能力)
|
||||||
Map<Long, Set<String>> personCapabilityMap = new HashMap<>();
|
Map<Long, Set<String>> personCapabilityMap = new HashMap<>();
|
||||||
for (IndustryProfessionalPersonCo industryProfessionalPersonCo : industryProfessionalPersonCos) {
|
industryProfessionalPersonCos.forEach(p ->
|
||||||
Set<String> codeList = personCapabilityMap
|
personCapabilityMap.computeIfAbsent(p.getSourcePersonnelId(), k -> new HashSet<>())
|
||||||
.getOrDefault(industryProfessionalPersonCo.getSourcePersonnelId(), new HashSet<>());
|
.add(p.getProfessionalCapabilityCode()));
|
||||||
codeList.add(industryProfessionalPersonCo.getProfessionalCapabilityCode());
|
certCapabilityList.forEach(c ->
|
||||||
personCapabilityMap.put(industryProfessionalPersonCo.getSourcePersonnelId()
|
personCapabilityMap.computeIfAbsent(c.getPersonnelId(), k -> new HashSet<>())
|
||||||
, codeList);
|
.add(c.getProfessionalCapabilityCode()));
|
||||||
}
|
|
||||||
|
|
||||||
for (OrgPersonnelCertCapabilityComplianceCheckCO industryProfessionalPersonCo : certCapabilityList) {
|
|
||||||
Set<String> codeList = personCapabilityMap
|
|
||||||
.getOrDefault(industryProfessionalPersonCo.getPersonnelId(), new HashSet<>());
|
|
||||||
codeList.add(industryProfessionalPersonCo.getProfessionalCapabilityCode());
|
|
||||||
personCapabilityMap.put(industryProfessionalPersonCo.getPersonnelId(), codeList);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// 数据来源:industryProfessionalPersonCos(备案人员自带专业能力)+ certCapabilityList(证书专业能力)
|
// 数据来源:industryProfessionalPersonCos(备案人员自带专业能力)+ certCapabilityList(证书专业能力)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue