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

fix: 80493 企标制修订流程--流程完成，企业标准的主起草部门负责人没取到

Browse Source
This commit is contained in:
mzaxd
2024-01-11 17:44:22 +08:00
parent eff9db54d7
commit 94ba87b94f
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/listener/ProcessESRevisionEndListener.java
+1 -3
View File
@@ -21,8 +21,6 @@ import com.jero.modules.laws.enterprise.service.EnterpriseStandardReviewMeetingR
import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService; import com.jero.modules.laws.enterprise.service.EnterpriseStandardRmrEvaluateDetailService;
import com.jero.modules.laws.enterprise.util.BeanCopyUtils; import com.jero.modules.laws.enterprise.util.BeanCopyUtils;
import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil; import com.jero.modules.laws.enterprise.util.EnterpriseStandardUtil;
import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.tag.enums.TableNameEnum; import com.jero.modules.tag.enums.TableNameEnum;
import org.activiti.engine.delegate.DelegateExecution; import org.activiti.engine.delegate.DelegateExecution;
import org.activiti.engine.delegate.ExecutionListener; import org.activiti.engine.delegate.ExecutionListener;
@@ -30,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.annotation.Resource; import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*; import java.util.*;
/** /**
@@ -95,6 +92,7 @@ public class ProcessESRevisionEndListener implements ExecutionListener {
variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration()); variables.put(FieldCommon.COMP_ILLUSTRATION, data.getCompIllustration());
variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate()); variables.put(FieldCommon.RELEASE_DATE, data.getReleaseDate());
variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate()); variables.put(FieldCommon.IMPLEMENTATION_DATE, data.getImplementDate());
variables.put(FieldCommon.MAIN_DRAFTING_UNIT_RESPONSIBLE_PERSON, data.getApprovalUser());
variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue()); variables.put(FieldCommon.MODULE, TableNameEnum.ENTERPRISE_STANDARDS.getValue());
String standardId = IdWorker.getIdStr(); String standardId = IdWorker.getIdStr();
variables.put(FieldCommon.ID, standardId); variables.put(FieldCommon.ID, standardId);
laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+9 -1
View File
@@ -248,7 +248,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
Object passObject = taskService.getVariable(taskId, "pass"); Object passObject = taskService.getVariable(taskId, "pass");
boolean pass = true; boolean pass = true;
if (passObject != null) { if (passObject != null) {
pass = (boolean) passObject; pass = (boolean) passObject;
} }
// 某些节点需要对数据进行特殊处理 // 某些节点需要对数据进行特殊处理
switch (xmlNodeId) { switch (xmlNodeId) {
@@ -550,6 +550,7 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
throw new JeroBootException("转办人不能为空"); throw new JeroBootException("转办人不能为空");
} }
Task task = taskService.createTaskQuery().taskId(taskId).singleResult(); Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
String processInstanceId = task.getProcessInstanceId();
// 获取执行id // 获取执行id
String executionId = task.getExecutionId(); String executionId = task.getExecutionId();
// 获取当前节点的id // 获取当前节点的id
@@ -571,6 +572,13 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
runtimeService.setVariable(executionId, "contactUserLeader", toUserId); runtimeService.setVariable(executionId, "contactUserLeader", toUserId);
runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", toUserId); runtimeService.setVariable(executionId, executionId + "-ContactUserLeader", toUserId);
break; break;
case LEADER_APPROVAL:
// 根据流程实例Id修改审批人字段
runtimeService.setVariable(executionId, "contactUserLeader", toUserId);
LambdaUpdateWrapper<ProcessEsRevision> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ProcessEsRevision::getProcessInstanceId, processInstanceId)
.set(ProcessEsRevision::getApprovalUser, toUserId);
update(updateWrapper);
} }
processHandleService.transfer(taskId, toUserId); processHandleService.transfer(taskId, toUserId);
} }