ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 标准征求意见流程

Browse Source
This commit is contained in:
liao
2023-11-28 10:21:22 +08:00
parent 157236e323
commit 07d544c179
4 changed files with 73 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/common/ConsultationTaskKey.java
+1 -1
View File
@@ -11,7 +11,7 @@ public class ConsultationTaskKey {
public static final String ENGINEER_START = "engineer_start"; // 法规工程师发起
public static final String ENGINEER_START_END = "engineer_start_end"; // 法规工程师审批
public static final String ENGINEER_START_END = "engineer_end"; // 法规工程师审批
public static final String REJECT = "reject"; // 驳回
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+14 -3
View File
@@ -242,19 +242,30 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
ProcessFbConsultationUserLink processFbConsultationUserLink = businessInfoDTO.getProcessFbConsultationUserLink();
List<ProcessFbConsultationList> processFbConsultationLists = businessInfoDTO.getProcessFbConsultationLists();
if (StringUtils.isBlank(taskId)) { // 流程没有发起时保存
if (StringUtils.isBlank(taskId)) { // 法规工程师发起
saveOrUpdate(processFbStandardConsultation);
processInfoVO.setBusinessId(processFbStandardConsultation.getId());
} else { // 流程发起后保存
Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskDefinitionKey = task.getTaskDefinitionKey();
switch (taskDefinitionKey) {
case ConsultationTaskKey.DEPART_LEADER_START_1: // 各部所主管级领导分发
break;
case ConsultationTaskKey.DESIGN_ENGINEER_1: // 设计工程师填写征求意见（分发给模块负责人）
case ConsultationTaskKey.DESIGN_ENGINEER_2: // 设计工程师填写征求意见（不分发给模块负责人）
break;
case ConsultationTaskKey.MODULE_OWNER_END_1: // 模块负责人汇总填写意见（可跳过）
case ConsultationTaskKey.MODULE_OWNER_END_2: // 模块负责人汇总填写意见（主管级领导驳回后）
case ConsultationTaskKey.MODULE_OWNER_END_3: // 法规工程师审批驳回后的子流程中的模块负责人汇总
case ConsultationTaskKey.DEPART_LEADER_COLLECT_3: // 法规工程师审批驳回后的子流程中的各部所主管级领导汇总
case ConsultationTaskKey.DEPART_LEADER_COLLECT_2: // 各部所主管级领导汇总（不分发给模块负责人）
break;
case ConsultationTaskKey.MODULE_OWNER_START: // 模块负责人分发
break;
default:
log.info("保存为草稿，节点 {} 无操作", taskDefinitionKey);
throw new JeroBootException("目前还未开发，请联系管理员");
}
}
processInfoVO.setBusinessId(processFbStandardConsultation.getId());
// 流程信息
BasicProcessInfoDTO basicProcessInfoDTO = processInfoVO.getBasicProcessInfoDTO();
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+3 -3
View File
@@ -304,12 +304,12 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
@Transactional
@Override
public void deleteMyDraft(String taskId) {
LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
if (StringUtils.isNotBlank(taskId)) {
LambdaQueryWrapper<ProcessDraft> deleteWrapper = new LambdaQueryWrapper<>();
deleteWrapper.eq(ProcessDraft::getTaskId, taskId);
deleteWrapper.eq(ProcessDraft::getUserId, CurrentUserUtil.getId());
processDraftService.remove(deleteWrapper);
}
processDraftService.remove(deleteWrapper);
}
/**