From 56cf824ca5799ab0c928f4d2c12940c530ead82d Mon Sep 17 00:00:00 2001 From: caihaohan Date: Fri, 19 Jul 2024 09:20:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20scc=E6=B5=81=E7=A8=8B=E5=8A=A0=E7=AD=BE?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/StandardComplianceCheckFlow.java | 21 ++++++++++++++++++- ...essStandardComplianceCheckServiceImpl.java | 3 ++- .../activiti/service/ProcessAllService.java | 6 +++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java index 4160c6f0..c52cf1bc 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/StandardComplianceCheckFlow.java @@ -2,11 +2,14 @@ package com.jero.modules.activiti.process.standardComplianceCheck.service; import cn.hutool.core.collection.CollUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.entity.ProcessAll; import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheck; import com.jero.modules.activiti.process.standardComplianceCheck.entity.ProcessStandardComplianceCheckDetail; +import com.jero.modules.activiti.process.standardinterpret.entity.ProcessStandardInterpret; +import com.jero.modules.activiti.process.standardinterpret.service.ProcessStandardInterpretService; import com.jero.modules.activiti.service.ProcessAllService; import com.jero.modules.activiti.service.WorkCenterService; import com.jero.modules.activiti.util.SpringContextUtil; @@ -19,6 +22,7 @@ import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; import static com.jero.modules.activiti.common.ActivitiCommon.MAIN_INSTANCE_ID; @@ -91,6 +95,21 @@ public class StandardComplianceCheckFlow implements WorkCenterService { @Override public void flowCountersign(DelegateTaskParam param) { - + String projectId = param.getProjectId(); + String userId = param.getUserId(); + ProcessStandardInterpretService processStandardInterpretService = + SpringContextUtil.getBean(ProcessStandardInterpretService.class); + ProcessStandardInterpret processStandardInterpret = processStandardInterpretService.getOne( + new LambdaQueryWrapper() + .eq(ProcessStandardInterpret::getProjectId, projectId)); + if (!Objects.isNull(processStandardInterpret)){ + // 处理业务表 + String newCountersignPersonIds = processStandardInterpret.getCountersignPersonIds() + "," + userId; + // 更新会签人员信息 + processStandardInterpretService.update( + new LambdaUpdateWrapper() + .eq(ProcessStandardInterpret::getId, processStandardInterpret.getId()) + .set(ProcessStandardInterpret::getCountersignPersonIds, newCountersignPersonIds)); + } } } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java index cd8d8db0..eb794bab 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java @@ -475,7 +475,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl importExcelWithData(MultipartFile file) { - return null; + Map resultMap = new HashMap<>(); + return resultMap; } private List getSplitDataByStandard(ProcessStandardComplianceCheck scc) { diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java index f637a93e..f6771f41 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java @@ -28,6 +28,7 @@ import com.jero.modules.activiti.mapper.ProcessAllMapper; import com.jero.modules.activiti.process.common.common.DraftCommon; import com.jero.modules.activiti.process.common.entity.ProcessDraft; import com.jero.modules.activiti.process.common.service.ProcessDraftService; +import com.jero.modules.activiti.process.standardComplianceCheck.common.ProcessStandardComplianceCheckConstants; import com.jero.modules.activiti.process.standardinterpret.common.StandardInterpretCommon; import com.jero.modules.activiti.util.ActivityCountersign; import com.jero.modules.activiti.util.SpringContextUtil; @@ -329,7 +330,10 @@ public class ProcessAllService extends ServiceImpl processNodeLink.setUserId(userId); processNodeLinkService.save(processNodeLink); - if (StandardInterpretCommon.JOINTLY_SIGN_LIST.equals(processNode.getVariableName())){ + if (StandardInterpretCommon.JOINTLY_SIGN_LIST.equals(processNode.getVariableName()) || + ProcessStandardComplianceCheckConstants.COUNTERSIGN_USER_LIST.equals(processNode.getVariableName()) || + ProcessStandardComplianceCheckConstants.MANAGER_LIST.equals(processNode.getVariableName()) || + ProcessStandardComplianceCheckConstants.SENIOR_MANAGER_LIST.equals(processNode.getVariableName())){ processNode.setVariableName(processNode.getVariableName().replace("List", "")); }