feat: 立项变更流程责任部门变更分支回显人员

This commit is contained in:
2023-12-06 18:27:36 +08:00
parent 1b85db65b2
commit 126508f0d6
@@ -13,6 +13,7 @@ import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConsta
import com.jero.modules.activiti.process.common.entity.ProcessDraft;
import com.jero.modules.activiti.process.common.enums.ProcessType;
import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
import com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant;
import com.jero.modules.activiti.process.esInitChange.entity.ProcessEsInitChange;
import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
@@ -189,7 +190,18 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
if (flowUserInfoVO != null && !flowUserInfoVO.isEmpty()) {
Map<String, Object> variables = setVariables(initChangeDataVO);
actFlowCommonService.setProcessVariables(processInstanceId, variables);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, getUserMap(variables));
Map<String, Object> userMap = getUserMap(variables);
processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, userMap);
// 如果是责任部门变更分支,后几个流程需要将部分选人信息保存到业务表中
String newMainDraftUserLeaderLeader = (String) userMap.get("newMainDraftUserLeaderLeader");
String newMainDraftUserLeader = (String) userMap.get("newMainDraftUserLeader");
String relatedUserList = (String) userMap.get("relatedUserList");
LambdaUpdateWrapper<ProcessEsInitChange> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeaderLeader), ProcessEsInitChange::getNewMainDraftUserLeaderLeader, newMainDraftUserLeaderLeader);
updateWrapper.set(StrUtil.isNotBlank(newMainDraftUserLeader), ProcessEsInitChange::getNewMainDraftUserLeader, newMainDraftUserLeader);
updateWrapper.set(StrUtil.isNotBlank(relatedUserList), ProcessEsInitChange::getRelatedUserList, relatedUserList);
update(updateWrapper);
}
runtimeService.setVariableLocal(processInstanceId, "pass", true);
} else {
@@ -202,8 +214,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
actFlowCommonService.completeTask(taskId, userId);
// 删除草稿
actFlowCommonService.removeDraft(commonVO);
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
if (!pass) {
// 如果是会签节点,驳回后要将其余节点recode设置为 未处理 状态
if (taskName.equals(CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME)) {
actFlowCommonService.updateOtherCountersignRecodeStatus(processInstanceId, CounterSignNodeNameConstants.ES_INIT_CHANGE_EXPERT_NODE_NAME);
}