Skip to content

A
amos-boot-biz
Commit b93858a8 authored by caotao's avatar caotao
Browse files
Options

增加起草时创建待办信息

parent fdec226b
Show whitespace changes
Inline Side-by-side
Showing with 57 additions and 9 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/JgChangeRegistrationReformServiceImpl.java
View file @ b93858a8
......@@ -165,6 +165,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgRegistrationHistory.setSupervisoryCode(supervisoryCode);
//数据状态
jgChangeRegistrationReform.setUseRegistrationCode(jgRegistrationHistory.getUseRegistrationCode());
String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
jgChangeRegistrationReform.setEquipListName(equipListName);
jgRegistrationHistory.setStatus("new");
if (map.containsKey("type") && "edit".equals(String.valueOf(map.get("type")))) {
jgChangeRegistrationReform.setSequenceNbr(Long.valueOf(String.valueOf(map.get("sequenceNbr"))));
......@@ -173,7 +175,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgRegistrationHistory.setSequenceNbr(jgRegistrationHistoryMapper.getSequenceNbrByEquidAndDocumentId(equipId, String.valueOf(map.get("applyNo"))));
jgRegistrationHistoryMapper.updateById(jgRegistrationHistory);
} else {
//暂存处理
// 业务管理设备信息保存
JgChangeRegistrationReformEq jgChangeRegistrationReformEq = new JgChangeRegistrationReformEq();
jgChangeRegistrationReformEq.setEquId(equipId);
......@@ -192,6 +194,10 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
//当前单据id
jgRegistrationHistory.setCurrentDocumentId(jgChangeRegistrationReform.getApplyNo());
jgRegistrationHistoryMapper.insert(jgRegistrationHistory);
//暂存时生成待办数据
List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, null));
commonServiceImpl.buildTaskModel(taskModelDtoList);
}
if (!ObjectUtils.isEmpty(map.get("submit"))) {
......@@ -202,16 +208,17 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
// updateExecuteIds(instanceId, jgChangeRegistrationReform.getSequenceNbr(), "0");
} else {
// 如果是新启动的流程开启自动访问
String equipListName = this.getBaseMapper().getEquiplistNameByEquiplist(Optional.ofNullable(map.get("equList").toString()).orElse(" "));
jgChangeRegistrationReform.setAuditStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
jgChangeRegistrationReform.setStatus(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass());
jgChangeRegistrationReform.setEquipListName(equipListName);
jgChangeRegistrationReform.setCreateUserId(reginParams.getUserModel().getUserId());
jgChangeRegistrationReform.setCreateUserName(reginParams.getUserModel().getRealName());
jgChangeRegistrationReform.setCreateUserCompanyName(reginParams.getCompany().getCompanyName());
ProcessTaskDTO processTaskDTO = startByVariable(jgChangeRegistrationReform);
updateExecuteIds(instanceId, jgChangeRegistrationReform, "startWorkfow", processTaskDTO);
List<TaskModelDto> taskModelDtoList = Arrays.asList(getTaskModelDtoList(jgChangeRegistrationReform, processTaskDTO));
//启动之前删除暂存生成的待办
commonServiceImpl.deleteTaskModel(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
//重新生成新的待办数据
commonServiceImpl.buildTaskModel(taskModelDtoList);
}
......@@ -232,7 +239,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
dto.setProcessDefinitionKey("renovationRegistrationReviewNew");
dto.setBusinessKey("submit");
dto.setCompleteFirstTask(Boolean.TRUE);
// dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
......@@ -250,6 +257,8 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
Boolean updateTodoAndCreate = Boolean.TRUE;
ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
jgChangeRegistrationReform.setNextExecutorIds(workflowResultDto.getNextExecutorRoleIds());
jgChangeRegistrationReform.setNextExecuteUserIds(workflowResultDto.getNextExecutorUserIds());
String nextTaskid = Optional.ofNullable(workflowResultDto.getNextTaskId()).orElse("");
String taskCode =FlowStatusEnum.TO_BE_FINISHED.getName();
if(!ObjectUtils.isEmpty(workflowResultDto.getNextTaskCode())){
......@@ -298,6 +307,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
TaskV2Model taskV2Model = commonServiceImpl.updateTaskModel(map);
TaskModelDto taskModelDto = new TaskModelDto();
BeanUtils.copyProperties(taskV2Model, taskModelDto);
taskModelDto.setNextExecuteUser(workflowResultDto.getNextExecutorRoleIds());
// 创建新的代办
taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
commonServiceImpl.buildTaskModel(Collections.singletonList(taskModelDto));
......@@ -342,7 +352,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
map.put("approvalStatus", "提交");
}
dto.setVariable(map);
// dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
//执行流程
processTaskDTO = iCmWorkflowService.complete(taskId, dto);
} catch (Exception e) {
......@@ -379,6 +389,11 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jsonObject.put("nextTaskId", jgChangeRegistrationReform.getNextTaskId());
jsonObject.put("nextExecuteUser", jgChangeRegistrationReform.getNextExecutorIds());
jsonObject.put("taskType",BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
jsonObject.put("pageType","look");
//如果创建人等于当前人则打开编辑页面
if(jgChangeRegistrationReform.getCreateUserId().equals(reginParams.getUserModel().getUserId())){
jsonObject.put("pageType","edit");
}
jsonObject.put("model",conveterTaskMessageDTO(jgChangeRegistrationReform));
commonServiceImpl.rollbackTask(instanceId,jsonObject);
}
......@@ -644,7 +659,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
*/
public String getSummaryInfo(JgChangeRegistrationReform jgChangeRegistrationReform) {
String result = "来自%s【%s】的业务办理，【申请单号：%s】";
return String.format(result,jgChangeRegistrationReform.getEquipListName(), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
return String.format(result,Optional.ofNullable(jgChangeRegistrationReform.getEquipListName()).orElse("无"), jgChangeRegistrationReform.getSupervisoryCode(), jgChangeRegistrationReform.getApplyNo());
}
/**
......@@ -661,11 +676,42 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
jgChangeRegistrationReform.setCreateDate(null);
jgChangeRegistrationReform.setAuditPassDate(null);
jgChangeRegistrationReform.setInputUnitNo(null);
TaskModelDto taskModelDto = new TaskModelDto();
if(ObjectUtils.isEmpty(processTaskDTO)){
//工作流创建时间
taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
//taskCode 使用申请单编号
taskModelDto.setTaskCode(jgChangeRegistrationReform.getApplyNo());
//摘要
taskModelDto.setTaskContent(getSummaryInfo(jgChangeRegistrationReform));
//任务描述-非必填
taskModelDto.setTaskDesc(null);
//任务类型
taskModelDto.setTaskType(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getCode());
//任务类型名称
taskModelDto.setTaskTypeLabel(BusinessTypeEnum.JG_RENOVATION_REGISTRATION.getName());
//工作流实例id
taskModelDto.setRelationId(String.valueOf(jgChangeRegistrationReform.getSequenceNbr()));
//任务状态code
taskModelDto.setTaskStatus(commonServiceImpl.getDictionaryCodeByName(jgChangeRegistrationReform.getStatus()));
taskModelDto.setFlowStatus(taskModelDto.getTaskStatus());
//任务状态名称
taskModelDto.setTaskStatusLabel(jgChangeRegistrationReform.getStatus());
taskModelDto.setFlowStatusLabel(jgChangeRegistrationReform.getStatus());
//任务创建人id
taskModelDto.setStartUserId(jgChangeRegistrationReform.getCreateUserId());
//任务创建人名称
taskModelDto.setStartUser(jgChangeRegistrationReform.getCreateUserName());
//任务发起人所在单位
taskModelDto.setStartUserCompanyName(jgChangeRegistrationReform.getCreateUserCompanyName());
//任务发起人发起时间
taskModelDto.setNextExecuteUser(jgChangeRegistrationReform.getNextExecutorIds());
//跳转路径
// taskModelDto.setRoutePath();
taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
}else{
List<WorkflowResultDto> workflowResultDtoList = commonServiceImpl.buildWorkFlowInfo(Arrays.asList(processTaskDTO));
WorkflowResultDto workflowResultDto = conveterProcessTaskDTO2WorkflowResultDto(processTaskDTO);
TaskModelDto taskModelDto = new TaskModelDto();
//工作流创建时间
taskModelDto.setFlowCreateDate(jgChangeRegistrationReform.getCreateDate());
//工作流返回节点名称
......@@ -702,6 +748,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
//跳转路径
// taskModelDto.setRoutePath();
taskModelDto.setModel(conveterTaskMessageDTO(jgChangeRegistrationReform));
}
return taskModelDto;
}
......@@ -729,6 +776,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
TaskMessageDto taskMessageDto = new TaskMessageDto();
taskMessageDto.setInstanceId(jgChangeRegistrationReform.getInstanceId());
taskMessageDto.setStatus(jgChangeRegistrationReform.getStatus());
taskMessageDto.setAuditStatus(jgChangeRegistrationReform.getStatus());
taskMessageDto.setPromoter(jgChangeRegistrationReform.getPromoter());
taskMessageDto.setNextExecuteUserIds(jgChangeRegistrationReform.getNextExecuteUserIds());
taskMessageDto.setSequenceNbr(jgChangeRegistrationReform.getSequenceNbr());
......
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