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

update 项目合规评估流程 增加全部不涉及分支，bug修改

Browse Source
This commit is contained in:
lijiarao
2023-12-18 18:26:19 +08:00
parent fa1ad604ee
commit fb3f5465b3
6 changed files with 275 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessHandleServiceImpl.java
+3 -1
View File
@@ -503,7 +503,9 @@ public class ProcessHandleServiceImpl implements IProcessHandleService {
link.setUserId(userId);
linkList.add(link);
});
processNodeLinkService.saveBatch(linkList, linkList.size());
if (!linkList.isEmpty()){
processNodeLinkService.saveBatch(linkList, linkList.size());
}
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
+2
View File
@@ -8,7 +8,9 @@ public class ProcessProjectAssessCommon {
public static final String STANDARDS_ENGINEER = "standardsEngineer";
public static final String MANAGER_LEADER_LIST = "managerLeaderList";
public static final String MODULE_OWNER_LIST = "moduleOwnerList";
public static final String MODULE_OWNER_LIST_SIZE = "moduleOwnerListSize";
public static final String DESIGN_ENGINEER_LIST = "designEngineerList";
public static final String DESIGN_ENGINEER_LIST_SIZE = "designEngineerListSize";
public static final String PASS = "pass";
public static final String EXECUTION_ID = "executionId";
//法规工程师发起
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+3 -10
View File
@@ -225,6 +225,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
termUser.setEvaluationFeedback_dictText(dictevaluationFeedbackMap.get(evaluationFeedback));
}
ProcessProjectAssessTermUser termUser = termUsers.get(0);
term.setNotInvolved(termUser.getNotInvolved());
term.setEvaluationFeedback(termUser.getEvaluationFeedback());
term.setEvaluationFeedback_dictText(termUser.getEvaluationFeedback_dictText());
term.setDescription(termUser.getDescription());
@@ -398,7 +399,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID, executionId);
// 完成任务
String taskId = processDTO.getTaskId();
runtimeService.setVariable(task.getProcessInstanceId(), "moduleOwner", CurrentUserUtil.getId());
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.PASS, pass);
taskService.complete(taskId, variables);
@@ -510,9 +510,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
if (moduleOwnerIds.isEmpty()) {
throw new JeroBootException(ResultCommon.ProjectAssess);
}
moduleOwnerIds = moduleOwnerIds.stream().distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, moduleOwnerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -520,6 +517,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerIds);
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size());
taskService.complete(taskId, variables);
}
@@ -585,9 +583,6 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
}
processProjectAssessTermUserService.saveBatch(allTermUserList);
if (designEngineerIds.isEmpty()) {
throw new JeroBootException(ResultCommon.ProjectAssess);
}
designEngineerIds = designEngineerIds.stream().distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, designEngineerIds);
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
@@ -595,6 +590,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST, designEngineerIds);
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size());
taskService.complete(taskId, variables);
}
@@ -620,9 +616,6 @@ 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());
tempCache.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessTermService.java
+1 -1
View File
@@ -77,7 +77,7 @@ public class ProcessProjectAssessTermService extends ServiceImpl<ProcessProjectA
public List<ProcessProjectAssessTerm> getByStandardsEngineer(String assessmentId) {
LambdaQueryWrapper<ProcessProjectAssessTerm> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTerm::getAssessmentId,assessmentId);
wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.NO.getInteger());
//wrapper.eq(ProcessProjectAssessTerm::getCanAssignFlag, YesOrNoEnum.YES.getInteger());
List<ProcessProjectAssessTerm> list = this.list(wrapper);
return list;
}