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

fix 81354,81359,81356,81357 转办问题

Browse Source
This commit is contained in:
lijiarao
2024-02-01 16:23:45 +08:00
parent 5463f48771
commit 1f01626c8f
5 changed files with 215 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/common/ProcessProjectAssessCommon.java
+1
View File
@@ -7,6 +7,7 @@ package com.jero.modules.activiti.process.projectassess.common;
public class ProcessProjectAssessCommon {
public static final String STANDARDS_ENGINEER = "standardsEngineer";
public static final String MANAGER_LEADER_LIST = "managerLeaderList";
public static final String MODULE_OWNER = "moduleOwner";
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";
laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+103 -7
View File
@@ -34,6 +34,7 @@ import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAsse
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.activiti.util.ThreadLocalUtil;
@@ -444,8 +445,13 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
}
private void mkfzrspApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
String formKey = task.getFormKey();
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectAssessTerm> processProjectAssessTermList = businessInfoDTO.getProcessProjectAssessTermList();
List<ProcessProjectAssessTermUser> allTermUserList = new ArrayList<>();
@@ -453,6 +459,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTerm.getTermUserId());
termUser.setParentExecutionId(executionId);
termUser.setModuleOwner(userId);
allTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(allTermUserList);
@@ -464,9 +471,32 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
variables.put(ProcessProjectAssessCommon.PASS, pass);
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId);
wrapper.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
wrapper.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey);
List<ProcessProjectAssessTermUser> termUserList = processProjectAssessTermUserService.list(wrapper);
List<ProcessProjectAssessTermUser> updateTermUserList = new ArrayList<>();
for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTermUser.getId());
termUser.setModuleOwner(userId);
updateTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
}
}
private void gbmzgjldspApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
String businessId = processInfoVO.getBusinessId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
@@ -475,13 +505,14 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTerm.getTermUserId());
termUser.setResponsibleUnitLeader(userId);
termUser.setParentExecutionId(executionId);
allTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(allTermUserList);
String assessmentId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectAssessTermUser::getAssessmentId, assessmentId);
wrapper.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
@@ -498,12 +529,32 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST, moduleOwnerList);
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId);
wrapper1.eq(ProcessProjectAssessTermUser::getResponsibleUnitLeader, originUserId);
List<ProcessProjectAssessTermUser> termUserList = processProjectAssessTermUserService.list(wrapper1);
List<ProcessProjectAssessTermUser> updateTermUserList = new ArrayList<>();
for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTermUser.getId());
termUser.setResponsibleUnitLeader(userId);
updateTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList);
}
}
//模块负责人修改
private void mkfzrxgApprove(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
String assessmentId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
String businessId = processInfoVO.getBusinessId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
String formKey = task.getFormKey();
@@ -515,6 +566,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTerm.getTermUserId());
termUser.setParentExecutionId(executionId);
termUser.setModuleOwner(userId);
termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback());
termUser.setDescription(processProjectAssessTerm.getDescription());
termUser.setFileId(processProjectAssessTerm.getFileId());
@@ -540,6 +592,26 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerList.size());
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
LambdaQueryWrapper<ProcessProjectAssessTermUser> wrapper1 = new LambdaQueryWrapper<>();
wrapper1.eq(ProcessProjectAssessTermUser::getAssessmentId, businessId);
wrapper1.eq(ProcessProjectAssessTermUser::getModuleOwner, originUserId);
wrapper1.eq(ProcessProjectAssessTermUser::getParentExecutionId, formKey);
List<ProcessProjectAssessTermUser> termUserList = processProjectAssessTermUserService.list(wrapper1);
List<ProcessProjectAssessTermUser> updateTermUserList = new ArrayList<>();
for (ProcessProjectAssessTermUser processProjectAssessTermUser : termUserList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTermUser.getId());
termUser.setModuleOwner(userId);
updateTermUserList.add(termUser);
}
processProjectAssessTermUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
}
}
@@ -712,6 +784,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
// 删除原先存储的关联
@@ -736,7 +809,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
ProcessProjectAssessTermUser newTermUser = new ProcessProjectAssessTermUser();
newTermUser.setAssessmentId(businessId);
newTermUser.setTermId(termId);
newTermUser.setResponsibleUnitLeader(originUserId);
newTermUser.setResponsibleUnitLeader(userId);
newTermUser.setParentExecutionId(executionId);
newTermUser.setNotInvolved(notInvolved);
newTermUser.setDescription(notInvolved);
@@ -773,6 +846,12 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
variables.put(ProcessProjectAssessCommon.MODULE_OWNER_LIST_SIZE, moduleOwnerIds.size());
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDXF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.GBMZGJLDSP, userIdList);
}
}
//模块负责人分发
@@ -780,6 +859,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
String formKey = task.getFormKey();
@@ -815,7 +895,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
newTermUser.setAssessmentId(businessId);
newTermUser.setTermId(termId);
newTermUser.setResponsibleUnitLeader(responsibleUnitLeader);
newTermUser.setModuleOwner(originUserId);
newTermUser.setModuleOwner(userId);
newTermUser.setParentExecutionId(executionId);
newTermUser.setNotInvolved(notInvolved);
newTermUser.setDescription(notInvolved);
@@ -833,7 +913,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
newTermUser.setTermId(termId);
newTermUser.setResponsibleUnitLeader(responsibleUnitLeader);
newTermUser.setParentExecutionId(executionId);
newTermUser.setModuleOwner(originUserId);
newTermUser.setModuleOwner(userId);
newTermUser.setDesignEngineer(designEngineerId);
designEngineerIds.add(designEngineerId);
allTermUserList.add(newTermUser);
@@ -852,6 +932,12 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
variables.put(ProcessProjectAssessCommon.DESIGN_ENGINEER_LIST_SIZE, designEngineerIds.size());
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRFF, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.MKFZRSP, userIdList);
}
}
//设计工程师评估
@@ -859,6 +945,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String formKey = task.getFormKey();
String executionId = task.getExecutionId();
@@ -869,6 +956,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
for (ProcessProjectAssessTerm processProjectAssessTerm : processProjectAssessTermList) {
ProcessProjectAssessTermUser termUser = new ProcessProjectAssessTermUser();
termUser.setId(processProjectAssessTerm.getTermUserId());
termUser.setDesignEngineer(userId);
termUser.setEvaluationFeedback(processProjectAssessTerm.getEvaluationFeedback());
termUser.setDescription(processProjectAssessTerm.getDescription());
termUser.setFileId(processProjectAssessTerm.getFileId());
@@ -887,8 +975,16 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
// 完成任务
String taskId = processDTO.getTaskId();
taskService.complete(taskId);
Map<String, Object> variables = new HashMap<>();
variables.put(ProcessProjectAssessCommon.MODULE_OWNER, processProjectAssessTermList.get(0).getModuleOwner());
taskService.complete(taskId,variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectAssessCommon.SJGCSPG, userIdList);
}
}
laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+27 -2
View File
@@ -19,11 +19,13 @@ import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
import com.jero.modules.activiti.process.fb.dto.ProcessDTO;
import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
import com.jero.modules.activiti.process.projectassess.common.ProcessProjectAssessCommon;
import com.jero.modules.activiti.process.projectnotmet.common.ProcessProjectNotMetCommon;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMet;
import com.jero.modules.activiti.process.projectnotmet.entity.ProcessProjectNotMetLink;
import com.jero.modules.activiti.process.projectnotmet.mapper.ProcessProjectNotMetMapper;
import com.jero.modules.activiti.process.projectnotmet.vo.ProcessProjectNotMetVO;
import com.jero.modules.activiti.process.projectstandard.common.ProcessProjectStandardCommon;
import com.jero.modules.activiti.service.ProcessAllService;
import com.jero.modules.activiti.service.ProcessApprovalRecordService;
import com.jero.modules.laws.common.util.CurrentUserUtil;
@@ -204,6 +206,9 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
}
private void zgjldspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
// 完成任务
Map<String, Object> variables = new HashMap<>();
if (!pass){
@@ -216,6 +221,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
variables.put(ProcessProjectNotMetCommon.DESIGN_ENGINEER, engineerId);
}
variables.put(ProcessProjectNotMetCommon.PASS, pass);
variables.put(ProcessProjectNotMetCommon.MANAGER_LEADER, userId);
taskService.complete(processDTO.getTaskId(), variables);
if (!pass){
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
@@ -227,9 +233,17 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
lawsEvaluationNotMetService.update(wrapper);
}
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.ZGJLDSP, userIdList);
}
}
private void fggcsspApprove(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, ProcessDTO processDTO, boolean pass, ProcessAll processAll) {
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
// 完成任务
Map<String, Object> variables = new HashMap<>();
if (!pass){
@@ -261,7 +275,11 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
wrapper1.in(LawsEvaluationNotMet::getId,processProjectNotMetLink.getProjectNotMetId());
lawsEvaluationNotMetService.update(wrapper1);
}
}
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.FGGCSSP, userIdList);
}
}
@@ -277,6 +295,8 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
processHandleService.updateApprovalRecord(processInfoVO);
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
//先查询分配的条款，更新
ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectNotMetLink> processProjectNotMetLinks = businessInfoDTO.getProcessProjectNotMetLinks();
@@ -285,7 +305,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
for (ProcessProjectNotMetLink processProjectNotMetLink : processProjectNotMetLinks) {
processProjectNotMetLink.setFileId(processProjectNotMetLink.getFileId());
processProjectNotMetLink.setDescription(processProjectNotMetLink.getDescription());
processProjectNotMetLink.setEngineerId(CurrentUserUtil.getId());
processProjectNotMetLink.setEngineerId(userId);
processProjectNotMetLink.setRealityTime(now);
}
processProjectNotMetLinkService.updateBatchById(processProjectNotMetLinks);
@@ -297,6 +317,11 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
wrapper.set(LawsEvaluationNotMet::getRealityTime, DateUtil.date());
wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
lawsEvaluationNotMetService.update(wrapper);
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectNotMetCommon.SJGCSSCZGCL, userIdList);
}
}
public void saveToDraft(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/common/ProcessProjectStandardCommon.java
+3
View File
@@ -11,6 +11,7 @@ public class ProcessProjectStandardCommon {
public static final String MANAGER_LEADER_LIST = "managerLeaderList";
public static final String MANAGER_LEADER_LIST_SIZE = "managerLeaderListSize";
public static final String MODULE_OWNER_LIST = "moduleOwnerList";
public static final String MODULE_OWNER = "moduleOwner";
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";
@@ -26,6 +27,7 @@ public class ProcessProjectStandardCommon {
public static final String FGGCSFQ = "fggcsfq";
//部所主管级领导下发
public static final String BSZGJLDXF_ = "bszgjldxf_";
public static final String BSZGJLDXF_1 = "bszgjldxf_1";
//模块责任人分发
public static final String MKZRRFF_ = "mkzrrff_";
public static final String MKZRRFF_1 = "mkzrrff_1";
@@ -44,6 +46,7 @@ public class ProcessProjectStandardCommon {
public static final String MKZRRSP_1 = "mkzrrsp_1";
//部所主管级领导审批
public static final String BSZGJLDSP_ = "bszgjldsp_";
public static final String BSZGJLDSP_1 = "bszgjldsp_1";
//法规工程师审批
public static final String FGGCSSP = "fggcssp";
//设计工程师补充工作令编号
laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+81 -3
View File
@@ -447,6 +447,10 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
//模块责任人审批
private void mkzrrffApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String parentExecutionId = task.getFormKey();
//查询表单
@@ -464,12 +468,35 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
//更新数据
LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
wrapper.eq(ProcessProjectStandardTermUser::getModuleOwner, originUserId);
wrapper.eq(ProcessProjectStandardTermUser::getParentExecutionId, parentExecutionId);
List<ProcessProjectStandardTermUser> termUserList = termUserService.list(wrapper);
List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
for (ProcessProjectStandardTermUser termUser : termUserList) {
ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser();
update.setModuleOwner(userId);
update.setId(termUser.getId());
updateTermUserList.add(update);
}
termUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
}
}
//部所主管级领导审批
private void bszgjldspApprove(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO, ProcessDTO processDTO, boolean pass) {
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
//查询表单
@@ -487,7 +514,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
for (ProcessProjectStandardTerm term : termList) {
ProcessProjectStandardTermApproval termApproval = new ProcessProjectStandardTermApproval();
termApproval.setProcessId(businessId);
termApproval.setResponsibleUnitLeader(CurrentUserUtil.getId());
termApproval.setResponsibleUnitLeader(userId);
termApproval.setTermId(term.getId());
termApproval.setAssessResults(term.getAssessResults());
termApproval.setProjectApprovalFlag(term.getProjectApprovalFlag());
@@ -537,6 +564,26 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
variables.put(ProcessProjectStandardCommon.PASS, pass);
taskService.complete(taskId, variables);
ThreadLocalUtil.remove();
if (!Objects.equals(userId,originUserId)){
//更新数据
LambdaQueryWrapper<ProcessProjectStandardTermUser> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(ProcessProjectStandardTermUser::getProcessId, businessId);
wrapper.eq(ProcessProjectStandardTermUser::getResponsibleUnitLeader, originUserId);
List<ProcessProjectStandardTermUser> termUserList = termUserService.list(wrapper);
List<ProcessProjectStandardTermUser> updateTermUserList = new ArrayList<>();
for (ProcessProjectStandardTermUser termUser : termUserList) {
ProcessProjectStandardTermUser update = new ProcessProjectStandardTermUser();
termUser.setResponsibleUnitLeader(userId);
update.setId(termUser.getId());
updateTermUserList.add(update);
}
termUserService.updateBatchById(updateTermUserList);
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
}
}
//法规工程师审批
@@ -544,6 +591,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
//查询流程信息
@@ -684,9 +732,14 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
sendMessageDTO.setMap(sendMap);
sendMessageAPI.sendMessage(sendMessageDTO);
}
}
if (!Objects.equals(userId,originUserId)){
//更新数据
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.FGGCSSP, userIdList);
}
}
//部所主管级领导下发
@@ -694,6 +747,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
// 查询原先存储的关联
@@ -712,6 +766,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String notInvolved = term.getNotInvolved();
LambdaUpdateWrapper<ProcessProjectStandardTermUser> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId);
updateWrapper.set(ProcessProjectStandardTermUser::getResponsibleUnitLeader, userId);
if (StringUtils.isNotBlank(notInvolved)){
updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved);
updateWrapper.set(ProcessProjectStandardTermUser::getAssessResults, AssessCommon.NOT_INVOLVED);
@@ -733,6 +788,12 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
.distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, moduleOwnerIds);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, moduleOwnerIds);
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDXF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.BSZGJLDSP_1, userIdList);
}
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务
String taskId = processDTO.getTaskId();
@@ -750,6 +811,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String executionId = task.getExecutionId();
String parentExecutionId = task.getFormKey();
@@ -777,6 +839,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String notInvolved = term.getNotInvolved();
LambdaUpdateWrapper<ProcessProjectStandardTermUser> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(ProcessProjectStandardTermUser::getId,termUserId);
updateWrapper.set(ProcessProjectStandardTermUser::getModuleOwner, userId);
//如果是不涉及就更新
if (StringUtils.isNotBlank(notInvolved)){
updateWrapper.set(ProcessProjectStandardTermUser::getNotInvolved,notInvolved);
@@ -801,6 +864,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
BeanUtils.copyProperties(termUser,termUser1);
termUser1.setId(null);
termUser1.setDesignEngineer(designEngineerList.get(i));
termUser1.setModuleOwner(userId);
termUser1.setParentExecutionId(executionId);
allInsertTermUserList.add(termUser1);
}
@@ -813,6 +877,12 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
.filter(Objects::nonNull)
.distinct().collect(Collectors.toList());
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, designEngineerIds);
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRFF_1, userIdList);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.MKZRRSP_1, userIdList);
}
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,executionId);
// 完成任务
String taskId = processDTO.getTaskId();
@@ -831,15 +901,18 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
String businessId = processInfoVO.getBusinessId();
ProcessApprovalRecord processApprovalRecord = processDTO.getProcessApprovalRecord();
String originUserId = processApprovalRecord.getOriginUserId();
String userId = CurrentUserUtil.getId();
Task task = processDTO.getTask();
String formKey = task.getFormKey();
String executionId = task.getExecutionId();
ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
List<ProcessProjectStandardTerm> termList = businessInfoDTO.getProcessProjectStandardTermList();
String moduleOwnerId = termList.get(0).getModuleOwner();
List<ProcessProjectStandardTermUser> udpateTermUserList = new ArrayList<>();
for (ProcessProjectStandardTerm term : termList) {
ProcessProjectStandardTermUser termUser = new ProcessProjectStandardTermUser();
termUser.setId(term.getTermUserId());
termUser.setDesignEngineer(userId);
termUser.setAssessResults(term.getAssessResults());
termUser.setIsRelate(term.getIsRelate());
termUser.setModelSeries(term.getModelSeries());
@@ -849,10 +922,15 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
}
termUserService.updateBatchById(udpateTermUserList);
ThreadLocalUtil.put(ProcessProjectAssessCommon.EXECUTION_ID,formKey);
if (!Objects.equals(userId,originUserId)){
List<String> userIdList = new ArrayList<>();
userIdList.add(userId);
processHandleService.saveNodeUserLink(processDTO.getProcessInstanceId(), ProcessProjectStandardCommon.SJGCSPG_1, userIdList);
}
// 完成任务
String taskId = processDTO.getTaskId();
Map<String, Object> variables = new HashMap<>();
//variables.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, moduleOwnerIds);
variables.put(ProcessProjectStandardCommon.MODULE_OWNER, moduleOwnerId);
taskService.complete(taskId,variables);
ThreadLocalUtil.remove();
}