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:
lijiarao
2023-12-18 10:37:39 +08:00
parent f2dbeeb219
commit 0cbdb10e81
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+9 -1
View File
@@ -49,6 +49,8 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse
import com.jero.modules.activiti.process.projectassess.mapper.ProcessProjectAssessMapper;
import org.springframework.transaction.annotation.Transactional;
import static org.apache.tools.ant.taskdefs.SetPermissions.NonPosixMode.pass;
/**
* @author liJiaRao
* @date 2023-12-05 15:57
@@ -528,6 +530,10 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
allTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(allTermUserList);
ProcessProjectAssessTermUser byId = processProjectAssessTermUserService.getById(allTermUserList.get(0).getId());
runtimeService.setVariable(task.getProcessInstanceId(), "moduleOwner", byId.getModuleOwner());
// 完成任务
String taskId = processDTO.getTaskId();
taskService.complete(taskId);
@@ -581,6 +587,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String assignee = delegateTask.getAssignee();
String processInstanceId = delegateTask.getProcessInstanceId();
String nodeId = null;
String userId = null;
switch (taskDefinitionKey) {
//模块负责人分发
case ProcessProjectAssessCommon.MKFZRFF:
@@ -593,6 +600,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
//模块负责人审批
case ProcessProjectAssessCommon.MKFZRSP:
nodeId = ProcessProjectAssessCommon.MKFZRFF;
userId = (String) runtimeService.getVariable(processInstanceId, "moduleOwner");
break;
//模块负责人修改
case ProcessProjectAssessCommon.MKFZRXG:
@@ -601,7 +609,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
default:
}
//查询我最新提交的task
ProcessApprovalRecord myLastComplete = processApprovalRecordService.getMyLastComplete(processInstanceId, nodeId);
ProcessApprovalRecord myLastComplete = processApprovalRecordService.getMyLastComplete(processInstanceId, nodeId, userId);
String lastCompleteTaskId = myLastComplete.getTaskId();
HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskId(lastCompleteTaskId).singleResult();
String executionId = historicTaskInstance.getExecutionId();
laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+3 -2
View File
@@ -53,10 +53,11 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
return pageList;
}
public ProcessApprovalRecord getMyLastComplete(String processInstanceId,String nodeId) {
public ProcessApprovalRecord getMyLastComplete(String processInstanceId, String nodeId, String userId) {
LambdaQueryWrapper<ProcessApprovalRecord> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessApprovalRecord::getProcessInstanceId,processInstanceId);
wrapper.eq(ProcessApprovalRecord::getUserId, CurrentUserUtil.getId());
wrapper.eq(StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, CurrentUserUtil.getId());
wrapper.eq(!StringUtils.isBlank(userId),ProcessApprovalRecord::getUserId, userId);
wrapper.eq(ProcessApprovalRecord::getFinishFlag,FinishFlagEnum.COMPLETE.getValue());
wrapper.eq(StringUtils.isNotBlank(nodeId), ProcessApprovalRecord::getNodeId,nodeId);
wrapper.orderByDesc(ProcessApprovalRecord::getEndTime);