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 2576cd1e..5d768eb4 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 @@ -1,6 +1,7 @@ package com.jero.modules.activiti.process.standardComplianceCheck.service.impl; import cn.hutool.core.util.StrUtil; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.jero.common.exception.JeroBootException; import com.jero.modules.activiti.common.ActivitiCommon; @@ -91,7 +92,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl actVariables = this.setVariables(businessInfoDTO); + Map actVariables = this.setVariables(processInfoVO); // 删除草稿 actFlowCommonService.getExistDraftAndRemove(processInfoVO.getDraftId()); // 启动流程 @@ -105,7 +106,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl processInfoVO) { + String processInstanceId = processInfoVO.getBasicProcessInfoDTO().getProcessInstanceId(); ProcessSccVO businessInfoDTO = processInfoVO.getBusinessInfoDTO(); - ProcessStandardComplianceCheck standardInfo = businessInfoDTO.getStandardInfo(); - List detailInfoList = businessInfoDTO.getDetailInfoList(); - + String id = businessInfoDTO.getStandardInfo().getId(); + // 主表设置流程实例Id + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + updateWrapper.set(ProcessStandardComplianceCheck::getProcessInstanceId, processInstanceId); + updateWrapper.eq(ProcessStandardComplianceCheck::getId, id); + this.update(updateWrapper); + // 子表设置流程实例Id + LambdaUpdateWrapper childUpdateWrapper = new LambdaUpdateWrapper<>(); + childUpdateWrapper.set(ProcessStandardComplianceCheckDetail::getProcessInstanceId, processInstanceId); + childUpdateWrapper.eq(ProcessStandardComplianceCheckDetail::getCheckId, id); + sccDetailService.update(childUpdateWrapper); } - private Map setVariables(ProcessSccVO businessInfoDTO) { - // TODO 转List - return new HashMap<>(); - } - - private Map getUserMap(Map map) { - // TODO 转逗号拼接 - return map; + private Map setVariables(ProcessInfoVO businessInfoDTO) { + // 人员信息 + Map userInfoMap = businessInfoDTO.getUserInfoMap(); + return new HashMap<>(userInfoMap); } @Override @@ -181,8 +187,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl