Skip to content

A
amos-boot-biz
Commit 6896bf97 authored by 王果's avatar 王果
Browse files
Options

Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

parents acfc21e0 dec3ef0a
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 109 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgChangeRegistrationTransferServiceImpl.java
View file @ 6896bf97
...@@ -353,29 +353,27 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -353,29 +353,27 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
public void flowExecute(Long id, String instanceId, String operate, String comment) { public void flowExecute(Long id, String instanceId, String operate, String comment) {
WorkflowResultDto workflowResult = new WorkflowResultDto(); WorkflowResultDto workflowResult = new WorkflowResultDto();
JgChangeRegistrationTransfer transfer = this.getById(id); JgChangeRegistrationTransfer transfer = this.getById(id);
try {
String taskId = transfer.getNextTaskId(); String taskId = transfer.getNextTaskId();
//组装信息 //组装信息
TaskResultDTO dto = new TaskResultDTO(); TaskResultDTO dto = new TaskResultDTO();
dto.setResultCode("approvalStatus"); dto.setResultCode("approvalStatus");
dto.setTaskId(taskId); dto.setTaskId(taskId);
dto.setComment(comment); dto.setComment(comment);
HashMap<String, Object> map = new HashMap<>(); HashMap<String, Object> map = new HashMap<>();
map.put("approvalStatus", operate); map.put("approvalStatus", operate);
dto.setVariable(map); dto.setVariable(map);
//下一节点执行人单位（下节点接收机构code） //下一节点执行人单位（下节点接收机构code）
dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer)); dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, transfer));
if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) { if (!ObjectUtils.isEmpty(transfer) && (transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getRollBack()) || transfer.getStatus().equals(WorkFlowStatusEnum.TRANSFER_SUBMIT.getReject()))) {
map.put("approvalStatus", "提交"); map.put("approvalStatus", "提交");
}
//执行流程
ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
// 更新下一步执行人
this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
} catch (Exception e) {
e.printStackTrace();
} }
//执行流程
ProcessTaskDTO complete = icmWorkflowService.complete(taskId, dto);
workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(complete)).get(0);
// 更新下一步执行人
this.updateExecuteIds(instanceId, transfer, operate, workflowResult);
} }
/** /**
...@@ -1032,24 +1030,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang ...@@ -1032,24 +1030,19 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
* 启动工作流 * 启动工作流
*/ */
private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) { private WorkflowResultDto startWorkFlork(String receiveOrgCreditCode) {
try { ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO();
ActWorkflowBatchDTO workflowBatchParams = new ActWorkflowBatchDTO(); List<ActWorkflowStartDTO> workflowList = new ArrayList<>();
List<ActWorkflowStartDTO> workflowList = new ArrayList<>(); ActWorkflowStartDTO workflow = new ActWorkflowStartDTO();
ActWorkflowStartDTO workflow = new ActWorkflowStartDTO(); workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
workflow.setProcessDefinitionKey(PROCESS_DEFINITION_KEY); workflow.setBusinessKey("submit");
workflow.setBusinessKey("submit"); workflow.setCompleteFirstTask(Boolean.TRUE);
workflow.setCompleteFirstTask(Boolean.TRUE); //下一节点执行人单位（下节点接收机构code）
//下一节点执行人单位（下节点接收机构code） workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode);
workflow.setNextExecuteUserCompanyCode(receiveOrgCreditCode); workflowList.add(workflow);
workflowList.add(workflow); workflowBatchParams.setProcess(workflowList);
workflowBatchParams.setProcess(workflowList); List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams);
List<ProcessTaskDTO> processTasks = icmWorkflowService.startBatch(workflowBatchParams); // 组装工作流返回的数据
// 组装工作流返回的数据 return commonService.buildWorkFlowInfo(processTasks).get(0);
return commonService.buildWorkFlowInfo(processTasks).get(0);
} catch (Exception e) {
log.error("提交失败：{}", e);
throw new BadRequest("提交失败" + e.getMessage());
}
} }
/** /**
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/JgScrapCancelServiceImpl.java
View file @ 6896bf97
...@@ -50,7 +50,6 @@ import org.springframework.util.StringUtils; ...@@ -50,7 +50,6 @@ import org.springframework.util.StringUtils;
import org.typroject.tyboot.core.foundation.context.RequestContext; import org.typroject.tyboot.core.foundation.context.RequestContext;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil; import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.rdbms.service.BaseService; import org.typroject.tyboot.core.rdbms.service.BaseService;
import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
import org.typroject.tyboot.core.restful.utils.ResponseModel; import org.typroject.tyboot.core.restful.utils.ResponseModel;
import java.util.*; import java.util.*;
...@@ -202,19 +201,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -202,19 +201,14 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
list.add(dto); list.add(dto);
} }
actWorkflowBatchDTO.setProcess(list); actWorkflowBatchDTO.setProcess(list);
try { processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO);
processTaskDTOS = cmWorkflowService.startBatch(actWorkflowBatchDTO); this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
this.buildRoleList(processTaskDTOS, roleListNext, roleListAll); instanceId = processTaskDTOS.get(0).getProcessInstance().getId();
instanceId = processTaskDTOS.get(0).getProcessInstance().getId(); nextTaskId = processTaskDTOS.get(0).getNextTask().get(0).getId();
nextTaskId = processTaskDTOS.get(0).getNextTask().get(0).getId(); taskName[0] = processTaskDTOS.get(0).getNextTask().get(0).getName();
taskName[0] = processTaskDTOS.get(0).getNextTask().get(0).getName(); workflowResultDtos = commonService.buildWorkFlowInfo(processTaskDTOS);
workflowResultDtos = commonService.buildWorkFlowInfo(processTaskDTOS); nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds(); this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
this.buildRoleList(processTaskDTOS, roleListNext, roleListAll);
} catch (Exception e) {
log.error("提交失败：{}", e);
throw new BadRequest("提交失败" + e.getMessage());
}
} }
List<JgScrapCancel> list = new ArrayList<>(); List<JgScrapCancel> list = new ArrayList<>();
...@@ -356,39 +350,35 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -356,39 +350,35 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
// 发起流程 // 发起流程
if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) { if (!StringUtils.hasText(jgScrapCancelDto.getInstanceId())) {
//未进流程直接发起并执行 //未进流程直接发起并执行
try {
List<ProcessTaskDTO> processTasks; List<ProcessTaskDTO> processTasks;
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO(); ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
List<ActWorkflowStartDTO> list = new ArrayList<>(); List<ActWorkflowStartDTO> list = new ArrayList<>();
ActWorkflowStartDTO dto = new ActWorkflowStartDTO(); ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setProcessDefinitionKey("scrapCancelNew"); dto.setProcessDefinitionKey("scrapCancelNew");
dto.setBusinessKey(jgScrapCancelDto.getApplyNo()); dto.setBusinessKey(jgScrapCancelDto.getApplyNo());
dto.setCompleteFirstTask(true); dto.setCompleteFirstTask(true);
dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode()); dto.setNextExecuteUserCompanyCode(jgScrapCancelDto.getReceiveOrgCode());
list.add(dto); list.add(dto);
actWorkflowBatchDTO.setProcess(list); actWorkflowBatchDTO.setProcess(list);
processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO); processTasks = cmWorkflowService.startBatch(actWorkflowBatchDTO);
String instanceId = processTasks.get(0).getProcessInstance().getId(); String instanceId = processTasks.get(0).getProcessInstance().getId();
String nextTaskId = processTasks.get(0).getNextTask().get(0).getId(); String nextTaskId = processTasks.get(0).getNextTask().get(0).getId();
String taskName = processTasks.get(0).getNextTask().get(0).getName(); String taskName = processTasks.get(0).getNextTask().get(0).getName();
this.buildRoleList(processTasks, roleListNext, roleListAll); this.buildRoleList(processTasks, roleListNext, roleListAll);
List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(processTasks); List<WorkflowResultDto> workflowResultDtos = commonService.buildWorkFlowInfo(processTasks);
String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds(); String nextUserIds = workflowResultDtos.get(0).getNextExecutorUserIds();
jgScrapCancelDto.setInstanceStatus(String.join(",", roleListAll)); jgScrapCancelDto.setInstanceStatus(String.join(",", roleListAll));
jgScrapCancelDto.setInstanceId(instanceId); jgScrapCancelDto.setInstanceId(instanceId);
jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext)); jgScrapCancelDto.setNextExecuteIds(String.join(",", roleListNext));
jgScrapCancelDto.setNextTaskId(nextTaskId); jgScrapCancelDto.setNextTaskId(nextTaskId);
jgScrapCancelDto.setNextExecuteUserIds(nextUserIds); jgScrapCancelDto.setNextExecuteUserIds(nextUserIds);
jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass()); jgScrapCancelDto.setAuditStatus(WorkFlowStatusEnum.CANCEL_RECEIVE.getPass());
// 创建待办 // 创建待办
JgScrapCancel bean = new JgScrapCancel(); JgScrapCancel bean = new JgScrapCancel();
BeanUtil.copyProperties(jgScrapCancelDto, bean); BeanUtil.copyProperties(jgScrapCancelDto, bean);
commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr())); commonService.deleteTaskModel(String.valueOf(jgScrapCancelDto.getSequenceNbr()));
createTaskModel(bean, taskName, "1", nextUserIds); createTaskModel(bean, taskName, "1", nextUserIds);
} catch (Exception e) {
log.error("提交失败：{}", e);
throw new BadRequest("提交失败" + e.getMessage());
}
} else { } else {
// 已经在流程中，执行一步 // 已经在流程中，执行一步
ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId()); ProcessTaskDTO processTaskDTO = submit(op, jgScrapCancelDto.getNextTaskId());
...@@ -602,29 +592,25 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc ...@@ -602,29 +592,25 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Transactional @Transactional
public void flowExecute(Long id, String instanceId, String operate, String comment) { public void flowExecute(Long id, String instanceId, String operate, String comment) {
try { JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id);
JgScrapCancel jgScrapCancel = this.getBaseMapper().selectById(id); String taskId = jgScrapCancel.getNextTaskId();
String taskId = jgScrapCancel.getNextTaskId(); //组装信息
//组装信息 TaskResultDTO dto = new TaskResultDTO();
TaskResultDTO dto = new TaskResultDTO(); dto.setResultCode("approvalStatus");
dto.setResultCode("approvalStatus"); dto.setTaskId(taskId);
dto.setTaskId(taskId); dto.setComment(comment);
dto.setComment(comment); HashMap<String, Object> map = new HashMap<>();
HashMap<String, Object> map = new HashMap<>(); map.put("approvalStatus", operate);
map.put("approvalStatus", operate); if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus()) && (jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getReject()) || jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack()))) {
if (!ObjectUtils.isEmpty(jgScrapCancel.getInstanceStatus()) && (jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getReject()) || jgScrapCancel.getInstanceStatus().equals(WorkFlowStatusEnum.CANCEL_SUBMIT.getRollBack()))) { map.put("approvalStatus", "提交");
map.put("approvalStatus", "提交");
}
dto.setVariable(map);
//下一节点执行人单位（下节点接收机构code）
dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
//执行流程
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
// 更新下一步执行人、创建待办
updateExecuteIds(instanceId, id, operate, processTaskDTO);
} catch (Exception e) {
e.printStackTrace();
} }
dto.setVariable(map);
//下一节点执行人单位（下节点接收机构code）
dto.setNextExecuteUserCompanyCode(this.getNextUserOrgCode(operate, jgScrapCancel));
//执行流程
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(taskId, dto);
// 更新下一步执行人、创建待办
updateExecuteIds(instanceId, id, operate, processTaskDTO);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment