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

fix: 标准化发起流程数据流转数据丢失BUG

Browse Source
This commit is contained in:
mzaxd
2023-12-15 18:18:20 +08:00
parent dd3ba33924
commit 39d91d961d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/AnnualInitTaskNameConstant.java
+2 -2
View File
@@ -9,10 +9,10 @@ public class AnnualInitTaskNameConstant {
public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起"; public static final String STANDARD_ENGINEER_INIT = "标准化工程师发起";
public static final String CONTACT_USER_SELECT = "部所联络人选取审批人"; public static final String CONTACT_USER_SELECT = "部所联络人选取审批人";
public static final String STANDARD_ENGINEER_EDIT = "标准化工程师修改调整"; public static final String STANDARD_ENGINEER_EDIT = "标准化工程师修改调整";
public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管级领导审批下发"; public static final String MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE = "主起草单位主管级领导审批下发";
public static final String CONTACT_USER_EDIT = "部所联络人修改调整"; public static final String CONTACT_USER_EDIT = "部所联络人修改调整";
public static final String MAIN_DRAFT_WRITE = "主起草人填写信息"; public static final String MAIN_DRAFT_WRITE = "主起草人填写信息";
public static final String CONTACT_USER_COLLECT = "部所联络人汇总"; public static final String CONTACT_USER_COLLECT = "部所联络人汇总";
public static final String MAIN_DRAFT_LEADER_LEADER_APPROVAL = "主起草单位主管级领导审批"; public static final String MAIN_DRAFT_LEADER_APPROVAL = "主起草单位主管级领导审批";
public static final String STANDARD_ENGINEER_COLLECT = "标准化归档"; public static final String STANDARD_ENGINEER_COLLECT = "标准化归档";
} }
laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+7 -6
View File
@@ -210,7 +210,6 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String taskName = task.getName(); String taskName = task.getName();
String contactUser = (String) runtimeService.getVariable(executionId, "contactUser"); String contactUser = (String) runtimeService.getVariable(executionId, "contactUser");
String workGroupUser = (String) runtimeService.getVariable(executionId, "workGroupUser");
switch (taskName) { switch (taskName) {
case CONTACT_USER_SELECT: case CONTACT_USER_SELECT:
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId); wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
@@ -219,7 +218,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId); wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue()); wrapper.eq(ProcessEsAnnualInit::getRejectFlag, YesOrNoEnum.YES.getValue());
break; break;
case MAIN_DRAFT_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser); wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId); wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
break; break;
@@ -233,8 +232,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId); wrapper.eq(ProcessEsAnnualInit::getContactUser, userId);
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId); wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
break; break;
case MAIN_DRAFT_LEADER_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_APPROVAL:
wrapper.eq(ProcessEsAnnualInit::getContactUser, userId); wrapper.eq(ProcessEsAnnualInit::getContactUser, contactUser);
wrapper.eq(ProcessEsAnnualInit::getApprovalUser, userId);
wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
break; break;
case STANDARD_ENGINEER_COLLECT: case STANDARD_ENGINEER_COLLECT:
// do nothing now // do nothing now
@@ -296,7 +297,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue())); dataList.forEach(d -> d.setRejectFlag(YesOrNoEnum.NO.getValue()));
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case MAIN_DRAFT_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_APPROVAL_DISTRIBUTE:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
// 如果不驳回 // 如果不驳回
if (pass) { if (pass) {
@@ -322,7 +323,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
saveOrUpdateBatch(dataList); saveOrUpdateBatch(dataList);
break; break;
case MAIN_DRAFT_LEADER_LEADER_APPROVAL: case MAIN_DRAFT_LEADER_APPROVAL:
dataList = annualInitData.getDataList(); dataList = annualInitData.getDataList();
// 如果不驳回 // 如果不驳回
if (pass) { if (pass) {