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

修改法规导入流程驳回之后更新数据

Browse Source
This commit is contained in:
梁琦涛
2024-07-16 10:39:24 +08:00
parent 91eb18d39d
commit 0897394df1
5 changed files with 32 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessMarketStandardReleaseConstants.java
+12
View File
@@ -0,0 +1,12 @@
package com.jero.modules.activiti.process.ms.common;
/**
* @author liJiaRao
* @date 2024-06-17 15:28
*/
public class ProcessMarketStandardReleaseConstants {
/**
* 法规工程师发起
*/
public static final String STANDARD_ENGINEER_START = "SID-8B22BF1A-383D-48E0-B9C4-24DFFEA1C9D0";
}
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/common/ProcessNewStandardImportConstants.java
-68
View File
@@ -1,68 +0,0 @@
package com.jero.modules.activiti.process.ms.common;
/**
* @author liJiaRao
* @date 2024-06-17 15:28
*/
public class ProcessNewStandardImportConstants {
/** 法规工程师 */
public static final String STANDARD_ENGINEER = "standardEngineer";
/** 各部门接口人 */
public static final String DEPT_USER = "deptUser";
/** 主排查人 */
public static final String MAIN_CHECK_USER = "mainCheckUser";
/** 会签人员列表 */
public static final String COUNTERSIGN_USER_LIST = "countersignUserList";
/** 设计工程师科室经理审核 */
public static final String MANAGER = "manager";
/** 高级经理/技术官 */
public static final String SENIOR_MANAGER = "seniorManager";
/** 未分配数量 */
public static final String UNALLOCATED_QUANTITY = "unallocatedQuantity";
/**
* 法规工程师发起
*/
public static final String STANDARD_ENGINEER_START = "sid-F144BD89-366F-482C-89DE-3AE2BD22D371";
/**
* 各部门接口人分发
*/
public static final String DEPT_USER_DISTRIBUTE = "sid-F07416DD-65BF-499E-AC96-F7A407AA3CEB";
/**
* 主排查人分发
*/
public static final String MAIN_CHECK_USER_DISTRIBUTE = "sid-96A59284-7EE2-4F10-A327-F76BC26B95F8";
/**
* 主排查人分发
*/
public static final String MAIN_CHECK_USER_REDISTRIBUTE = "sid-3D1BFC0F-9074-4868-891F-2F76D00A21C7";
/**
* 主排查人汇总
*/
public static final String MAIN_CHECK_USER_COLLECT = "sid-A478E1B2-84B6-4884-875B-E6C53392BC4F";
/**
* 会签
*/
public static final String COUNTERSIGN = "sid-D3B3377E-9392-44D6-81D5-9DDDA91FB083";
/**
* 设计工程师科室经理审核
*/
public static final String MANAGER_APPROVAL = "sid-B253F229-2E92-4882-A054-EAA068069F0F";
/**
* 高级经理/技术官审核
*/
public static final String SENIOR_MANAGER_APPROVAL = "sid-31D9FF6F-D1BE-4B02-910C-5DB7A5D0A626";
/**
* 设计工程师工程师评估
*/
public static final String DESIGNER_ENGINEER_EVALUATION = "sid-45FC4ED6-DB83-49E0-A080-55192B7860EB";
/**
* 主排查人审核
*/
public static final String MAIN_CHECK_USER_APPROVAL = "sid-C9A2FE2E-8A8A-4846-8010-5AE4ECF14DFE";
/** 自动任务 */
public static final String AUTO_TASK_1 = "sid-95E41F78-FE01-4FEC-BF8B-EC11DFBA8824";
public static final String AUTO_TASK_2 = "autoTask_2";
public static final String AUTO_TASK_3 = "autoTask_3";
}
laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+9 -4
View File
@@ -15,6 +15,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.ms.common.ProcessMarketStandardReleaseConstants;
import com.jero.modules.activiti.process.ms.entity.ProcessMarketStandardRelease;
import com.jero.modules.activiti.process.ms.mapper.ProcessMarketStandardReleaseMapper;
import com.jero.modules.activiti.process.ms.service.IProcessMarketStandardReleaseService;
@@ -157,7 +158,7 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
*/
private void startNodeBusProcess(ProcessInfoVO<ProcessMarketStandardRelease> processInfoVO) {
ProcessMarketStandardRelease businessInfoDTO = processInfoVO.getBusinessInfoDTO();
save(businessInfoDTO);
saveOrUpdate(businessInfoDTO);
}
@Override
@@ -169,6 +170,13 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
// 获取当前节点的id
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
String xmlNodeId = record.getNodeId();
// 发起节点 更新业务数据
if(Objects.equals(ProcessMarketStandardReleaseConstants.STANDARD_ENGINEER_START,xmlNodeId)){
startNodeBusProcess(processInfoVO);
}
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -176,9 +184,6 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
actFlowCommonService.updateApprovalInfo(processTask, taskId);
// 驳回，结束所有节点
if(!pass){
// 获取当前节点的id
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
String xmlNodeId = record.getNodeId();
LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
update.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/common/ProcessNewStandardImportConstants.java
+1 -57
View File
@@ -5,64 +5,8 @@ package com.jero.modules.activiti.process.ni.common;
* @date 2024-06-17 15:28
*/
public class ProcessNewStandardImportConstants {
/** 法规工程师 */
public static final String STANDARD_ENGINEER = "standardEngineer";
/** 各部门接口人 */
public static final String DEPT_USER = "deptUser";
/** 主排查人 */
public static final String MAIN_CHECK_USER = "mainCheckUser";
/** 会签人员列表 */
public static final String COUNTERSIGN_USER_LIST = "countersignUserList";
/** 设计工程师科室经理审核 */
public static final String MANAGER = "manager";
/** 高级经理/技术官 */
public static final String SENIOR_MANAGER = "seniorManager";
/** 未分配数量 */
public static final String UNALLOCATED_QUANTITY = "unallocatedQuantity";
/**
* 法规工程师发起
*/
public static final String STANDARD_ENGINEER_START = "sid-F144BD89-366F-482C-89DE-3AE2BD22D371";
/**
* 各部门接口人分发
*/
public static final String DEPT_USER_DISTRIBUTE = "sid-F07416DD-65BF-499E-AC96-F7A407AA3CEB";
/**
* 主排查人分发
*/
public static final String MAIN_CHECK_USER_DISTRIBUTE = "sid-96A59284-7EE2-4F10-A327-F76BC26B95F8";
/**
* 主排查人分发
*/
public static final String MAIN_CHECK_USER_REDISTRIBUTE = "sid-3D1BFC0F-9074-4868-891F-2F76D00A21C7";
/**
* 主排查人汇总
*/
public static final String MAIN_CHECK_USER_COLLECT = "sid-A478E1B2-84B6-4884-875B-E6C53392BC4F";
/**
* 会签
*/
public static final String COUNTERSIGN = "sid-D3B3377E-9392-44D6-81D5-9DDDA91FB083";
/**
* 设计工程师科室经理审核
*/
public static final String MANAGER_APPROVAL = "sid-B253F229-2E92-4882-A054-EAA068069F0F";
/**
* 高级经理/技术官审核
*/
public static final String SENIOR_MANAGER_APPROVAL = "sid-31D9FF6F-D1BE-4B02-910C-5DB7A5D0A626";
/**
* 设计工程师工程师评估
*/
public static final String DESIGNER_ENGINEER_EVALUATION = "sid-45FC4ED6-DB83-49E0-A080-55192B7860EB";
/**
* 主排查人审核
*/
public static final String MAIN_CHECK_USER_APPROVAL = "sid-C9A2FE2E-8A8A-4846-8010-5AE4ECF14DFE";
/** 自动任务 */
public static final String AUTO_TASK_1 = "sid-95E41F78-FE01-4FEC-BF8B-EC11DFBA8824";
public static final String AUTO_TASK_2 = "autoTask_2";
public static final String AUTO_TASK_3 = "autoTask_3";
public static final String STANDARD_ENGINEER_START = "SID-2D0F3497-9E7D-4BC8-9A93-DAE6239E191B";
}
laws-modules/src/main/java/com/jero/modules/activiti/process/ni/service/impl/ProcessNewStandardImportServiceImpl.java
+10 -4
View File
@@ -17,6 +17,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.ni.common.ProcessNewStandardImportConstants;
import com.jero.modules.activiti.process.ni.entity.ProcessNewStandardImport;
import com.jero.modules.activiti.process.ni.mapper.ProcessNewStandardImportMapper;
import com.jero.modules.activiti.process.ni.service.IProcessNewStandardImportService;
@@ -152,7 +153,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
*/
private void startNodeBusProcess(ProcessInfoVO<ProcessNewStandardImport> processInfoVO) {
ProcessNewStandardImport businessInfoDTO = processInfoVO.getBusinessInfoDTO();
save(businessInfoDTO);
saveOrUpdate(businessInfoDTO);
}
@Override
@@ -164,15 +165,19 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
if (StrUtil.isBlank(taskId) || !actFlowCommonService.taskExists(taskId)) {
throw new JeroBootException("taskId为空或任务不存在");
}
// 获取当前节点的id
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
String xmlNodeId = record.getNodeId();
// 发起节点 更新业务数据
if(Objects.equals(ProcessNewStandardImportConstants.STANDARD_ENGINEER_START,xmlNodeId)){
startNodeBusProcess(processInfoVO);
}
String userId = actFlowCommonService.getOriginTaskAssignee(taskId);
String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
// 更新审批表为完成，填充数据
actFlowCommonService.updateApprovalInfo(processTask, taskId);
// 驳回，结束所有节点
if(!pass){
// 获取当前节点的id
ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(taskId);
String xmlNodeId = record.getNodeId();
LambdaUpdateWrapper<ProcessApprovalRecord> update = new LambdaUpdateWrapper<>();
update.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
update.ne(ProcessApprovalRecord::getFinishFlag, FinishFlagEnum.COMPLETE.getValue());
@@ -185,6 +190,7 @@ public class ProcessNewStandardImportServiceImpl extends ServiceImpl<ProcessNewS
// 审批节点
actFlowCommonService.completeTask(taskId, userId);
// 保存快照
// 获取流程通用数据
ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);