QR/laws_chery_serve
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 法规符合性排查流程-生成拆解单

Browse Source
This commit is contained in:
mzaxd
2024-07-09 14:47:06 +08:00
parent 5b6260a56d
commit 5ae2e793db
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/standardComplianceCheck/service/impl/ProcessStandardComplianceCheckServiceImpl.java
+32 -10
View File
@@ -180,13 +180,8 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
// 更新审批表为完成，填充数据 // 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(processTask, taskId); actFlowCommonService.updateApprovalInfo(processTask, taskId);
String curUserId = UserUtils.getUserId(); String curUserId = UserUtils.getUserId();
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
switch (xmlNodeId) { switch (xmlNodeId) {
case DEPT_USER_DISTRIBUTE:
break;
case MAIN_CHECK_USER_DISTRIBUTE:
// this.mainCheckUserDistribute()
runtimeService.setVariable(processInstanceId, DISTRIBUTE, true);
break;
case MAIN_CHECK_USER_REDISTRIBUTE: case MAIN_CHECK_USER_REDISTRIBUTE:
runtimeService.setVariable(processInstanceId, DISTRIBUTE, true); runtimeService.setVariable(processInstanceId, DISTRIBUTE, true);
break; break;
@@ -215,7 +210,36 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
@Override @Override
public void submit(ProcessInfoVO<ProcessSccVO> processInfoVO) { public void submit(ProcessInfoVO<ProcessSccVO> processInfoVO) {
BasicTaskInfoDTO processTask = processInfoVO.getBasicTaskInfoDTO();
String taskId = processTask.getTaskId();
// 获取task
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
// 获取执行id
String executionId = task.getExecutionId();
// 获取当前节点的id
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
String xmlNodeId = record.getNodeId();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
// 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(processTask, taskId);
String curUserId = UserUtils.getUserId();
Map<String, Object> userInfoMap = processInfoVO.getUserInfoMap();
switch (xmlNodeId) {
case DEPT_USER_DISTRIBUTE:
// 设置主排查人
String mainCheckUser = userInfoMap.get(MAIN_CHECK_USER).toString();
runtimeService.setVariable(processInstanceId, MAIN_CHECK_USER, mainCheckUser);
break;
case MAIN_CHECK_USER_DISTRIBUTE:
// 驳回
break;
}
// 审批节点
actFlowCommonService.completeTask(taskId, curUserId);
} }
@Override @Override
@@ -339,8 +363,7 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
throw new JeroBootException("上传模板错误，请检查后重试。"); throw new JeroBootException("上传模板错误，请检查后重试。");
} }
// 使用Grade的静态方法验证header boolean isMatched = SplitExcelVO.validateExcelHeaders(headers);
boolean isMatched = ModelExcelVO.validateExcelHeaders(headers);
if (!isMatched) { if (!isMatched) {
throw new JeroBootException("上传模板错误，请检查后重试。"); throw new JeroBootException("上传模板错误，请检查后重试。");
} }
@@ -371,7 +394,6 @@ public class ProcessStandardComplianceCheckServiceImpl extends ServiceImpl<Proce
log.error(e.getMessage(), e); log.error(e.getMessage(), e);
throw new JeroBootException("上传模板错误，请检查后重试。"); throw new JeroBootException("上传模板错误，请检查后重试。");
} }
// 使用Grade的静态方法验证header
boolean isMatched = ModelExcelVO.validateExcelHeaders(headers); boolean isMatched = ModelExcelVO.validateExcelHeaders(headers);
if (!isMatched) { if (!isMatched) {
throw new JeroBootException("上传模板错误，请检查后重试。"); throw new JeroBootException("上传模板错误，请检查后重试。");