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

Merge remote-tracking branch 'origin/dev' into dev

dev
huwei 2026-08-03 16:40:50 +08:00
parent 797ad42544 e8e4b61553
commit e3c88a5799
4 changed files with 52 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
safety-eval-app/src/main/java/org/qinan/safetyeval/app/executor/institution/EvalSignTaskExecutor.java
View File

@ -13,6 +13,7 @@ import org.qinan.safetyeval.client.dto.SingleResponse;
import org.qinan.safetyeval.client.dto.institution.EditSignTaskSaveCmd;
import org.qinan.safetyeval.client.dto.institution.EvalSignTaskPageQuery;
import org.qinan.safetyeval.client.dto.institution.EvalSignTaskSaveCmd;
import org.qinan.safetyeval.domain.constant.ProjectRoleEnum;
import org.qinan.safetyeval.domain.constant.ProjectStageEnum;
import org.qinan.safetyeval.domain.constant.SignTaskStatusEnum;
import org.qinan.safetyeval.domain.constant.SignatureTaskStatusEnum;
@ -106,7 +107,7 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
.last("limit 1"));
if (!CollectionUtils.isEmpty(evalProjectMemberDOS)) {
evalSignTaskCO.setSignerPersonnelName(evalProjectMemberDOS.get(0).getPersonnelName());
evalSignTaskCO.setSignerRoles(ProjectStageEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
evalSignTaskCO.setSignerRoles(ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
}
return evalSignTaskCO;
}).collect(Collectors.toList());
@ -172,7 +173,7 @@ public class EvalSignTaskExecutor implements EvalSignTaskApi {
public SingleResponse<EvalSignTaskStatisticsCO> signStatistics(EvalSignTaskPageQuery cmd) {
EvalSignTaskStatisticsCO evalSignTaskStatisticsCO = new EvalSignTaskStatisticsCO();
List<EvalSignTaskDO> evalSignTaskDOS = evalSignTaskMapper.selectList(new LambdaQueryWrapper<EvalSignTaskDO>()
.eq(EvalSignTaskDO::getProjectId, cmd.getProjectId())
.eq(Objects.nonNull(cmd.getProjectId()), EvalSignTaskDO::getProjectId, cmd.getProjectId())
.eq(EvalSignTaskDO::getSignerPersonnelId, cmd.getSignerPersonnelId()));
if (!CollectionUtils.isEmpty(evalSignTaskDOS)) {
long pendingSign = evalSignTaskDOS.stream().filter(f -> f.getTaskStatusCode() == 1).count();

18
safety-eval-domain/src/main/java/org/qinan/safetyeval/domain/constant/ProjectRoleEnum.java
View File

@ -1,8 +1,11 @@
package org.qinan.safetyeval.domain.constant;
import cn.hutool.json.JSONUtil;
import lombok.AllArgsConstructor;
import lombok.Getter;
import java.util.List;
/**
* 安平项目角色枚举
* 对应业务流程图中的各岗位角色
@ -39,4 +42,19 @@ public enum ProjectRoleEnum {
}
return null;
}
public static String fromVals(String val) {
StringBuilder sb = new StringBuilder();
List<String> vals = jsonToList(val);
for (ProjectRoleEnum stage : values()) {
if (vals.contains(stage.val)) {
sb.append(stage.mas).append(",");
}
}
return sb.toString();
}
public static List<String> jsonToList(String json) {
return json == null ? null : JSONUtil.toList(json, String.class);
}
}

7
safety-eval-infrastructure/src/main/java/org/qinan/safetyeval/infrastructure/gatewayimpl/SafetyMessageGatewayImpl.java
View File

@ -4,10 +4,7 @@ import com.alibaba.fastjson2.JSON;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.qinan.safetyeval.domain.constant.MessageSendStateEnum;
import org.qinan.safetyeval.domain.constant.MsgConstant;
import org.qinan.safetyeval.domain.constant.NoticeTypeEnum;
import org.qinan.safetyeval.domain.constant.ProjectStageEnum;
import org.qinan.safetyeval.domain.constant.*;
import org.qinan.safetyeval.domain.entity.SafetyMessageEntity;
import org.qinan.safetyeval.domain.exception.BizException;
import org.qinan.safetyeval.domain.exception.ErrorCode;
@ -71,7 +68,7 @@ public class SafetyMessageGatewayImpl implements SafetyMessageGateway {
.eq(EvalProjectMemberDO::getProjectId, projectId)
.eq(EvalProjectMemberDO::getPersonnelId, signerPersonnelId)
.last("limit 1"));
fillMap.put("role", ProjectStageEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
fillMap.put("role", ProjectRoleEnum.fromVals(evalProjectMemberDOS.get(0).getRole()));
}
params.put(MsgConstant.MSG_CONTENT_KEY_CONTENT, NoticeTypeEnum.SIGN_TASK_NOTICE.fillTemplate(fillMap));

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

@ -17,9 +17,11 @@ 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.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static org.qinan.safetyeval.domain.exception.ErrorCode.PERSON_NOT_ENOUGH;
@ -355,15 +357,16 @@ public class ComplianceCheckUtil {
// 按 industryCode 分组后循环调用 doIndustryProfessionalStandardsValid
Map<String, List<IndustryProfessionalStandardsDO>> standardsGroupByIndustry = standardsDOList.stream()
.collect(Collectors.groupingBy(IndustryProfessionalStandardsDO::getIndustryCode));
Map<String, List<IndustryProfessionalPersonCo>> personnelCoGroupByIndustry = personnelCoList.stream()
.collect(Collectors.groupingBy(IndustryProfessionalPersonCo::getIndustryCode));
Map<String, List<OrgPersonnelCertCapabilityComplianceCheckCO>> personnelCertCoGroupByIndustry = personnelCertCoList.stream()
.collect(Collectors.groupingBy(OrgPersonnelCertCapabilityComplianceCheckCO::getBusinessScope));
List<IndustryProfessionalPersonCo> personnelCoCopyList = new ArrayList<>(personnelCoList);
Map<String, List<OrgPersonnelCertCapabilityComplianceCheckCO>> personnelCertCoGroupByIndustry =
personnelCertCoList.stream().collect(
Collectors.groupingBy(OrgPersonnelCertCapabilityComplianceCheckCO::getBusinessScope));
StringJoiner failureMsg = new StringJoiner(";");
for (Map.Entry<String, List<IndustryProfessionalStandardsDO>> entry : standardsGroupByIndustry.entrySet()) {
Pair<Boolean, String> result = doIndustryProfessionalStandardsValid(
entry.getValue(), personnelCoGroupByIndustry.getOrDefault(entry.getKey(), new ArrayList<>())
Pair<Boolean, String> result = doIndustryProfessionalStandardsValid(entry.getValue(), personnelCoCopyList
, personnelCertCoGroupByIndustry.getOrDefault(entry.getKey(), new ArrayList<>()));
if (Boolean.FALSE.equals(result.getKey()) && result.getValue() != null) {
failureMsg.add(result.getValue());
@ -386,8 +389,11 @@ public class ComplianceCheckUtil {
* @param certCapabilityList 人员证书专业能力信息（提供人员→专业能力映射）
* @return Pair<Boolean, String> key 是否通过 ，value 失败消息（通过时为 null）
*/
public static Pair<Boolean, String> doIndustryProfessionalStandardsValid(List<IndustryProfessionalStandardsDO> standardsDOList
, List<IndustryProfessionalPersonCo> industryProfessionalPersonCos, List<OrgPersonnelCertCapabilityComplianceCheckCO> certCapabilityList) {
public static Pair<Boolean, String> doIndustryProfessionalStandardsValid(
List<IndustryProfessionalStandardsDO> standardsDOList
, List<IndustryProfessionalPersonCo> industryProfessionalPersonCos
, List<OrgPersonnelCertCapabilityComplianceCheckCO> certCapabilityList) {
if (CollectionUtils.isEmpty(standardsDOList)) {
return Pair.of(true, null);
}
@ -398,19 +404,26 @@ public class ComplianceCheckUtil {
}
// 3. 构建人员→可担任专业能力code集合（同一人可能具备多个专业能力）
Map<Long, Set<String>> personCapabilityMap = new HashMap<>();
industryProfessionalPersonCos.forEach(p ->
personCapabilityMap.computeIfAbsent(p.getSourcePersonnelId(), k -> new HashSet<>())
.add(p.getProfessionalCapabilityCode()));
certCapabilityList.forEach(c ->
personCapabilityMap.computeIfAbsent(c.getPersonnelId(), k -> new HashSet<>())
.add(c.getProfessionalCapabilityCode()));
Map<Long, IndustryProfessionalPersonCo> personnelMap = industryProfessionalPersonCos.stream()
.collect(Collectors.toMap(IndustryProfessionalPersonCo::getSourcePersonnelId, Function.identity()));
Map<Long, Set<String>> personCapabilityMap = new HashMap<>();
for (OrgPersonnelCertCapabilityComplianceCheckCO pc : certCapabilityList) {
// 人员证书的能力
personCapabilityMap.computeIfAbsent(pc.getPersonnelId(), k -> new HashSet<>())
.add(pc.getProfessionalCapabilityCode());
IndustryProfessionalPersonCo co = personnelMap.get(pc.getPersonnelId());
// 人员学科能力
Set<String> pdcSet = Arrays.stream(co.getProfessionalCapabilityCode().split(","))
.collect(Collectors.toSet());
personCapabilityMap.computeIfAbsent(pc.getPersonnelId(), k -> new HashSet<>())
.addAll(pdcSet);
}
// 数据来源：industryProfessionalPersonCos（备案人员自带专业能力）+ certCapabilityList（证书专业能力）
Map<String, Long> assignedMap = canFullyAssign(personCapabilityMap, requiredMap);
IndustryEnum industryEnum = IndustryEnum.ofCode(standardsDOList.get(0).getIndustryCode());
String industryName = industryEnum != null ? industryEnum.getValue() : standardsDOList.get(0).getIndustryCode();