Skip to content

A
amos-boot-biz
Commit a1a5a27b authored by chenzhao's avatar chenzhao
Browse files
Options

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

parents 5e8b9cf9 a0478c83
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 17 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/CommonServiceImpl.java
View file @ a1a5a27b
......@@ -630,7 +630,7 @@ public class CommonServiceImpl implements ICommonService {
List<TaskV2Model> result = Systemctl.taskV2Client.selectListByRelationId(id).getResult();
if (result.size() >0 ){
List<Long> idList= result.stream().map(TaskV2Model::getSequenceNbr).collect(Collectors.toList());
String ids = String.join(",",idList.stream().map(x->x.toString()).collect(Collectors.toList()));
String ids = idList.stream().map(Object::toString).collect(Collectors.joining(","));
Systemctl.taskV2Client.delete(ids);
}
}
......
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/JgChangeRegistrationNameServiceImpl.java
View file @ a1a5a27b
......@@ -215,7 +215,11 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
private void createTaskModel(JgChangeRegistrationName dto, String taskName, String submitType, String nextUserIds) {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
// 提交创建待办逻辑
if ("1".equals(submitType)) {
//提交时先删除之前的暂存待办数据
commonService.deleteTaskModel(dto.getSequenceNbr()+"");
// 创建待办
TaskModelDto taskModelDto = new TaskModelDto();
taskModelDto.setFlowCreateDate(dto.getApplyDate());
taskModelDto.setTaskName(taskName);
......@@ -242,6 +246,24 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
taskModelDto.setModel(taskMessageDto);
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
// 暂存创建待办逻辑
if ("0".equals(submitType)) {
// 暂存 创建待办逻辑
TaskModelDto taskModelDto = new TaskModelDto();
//行数据
//附件太大赋空
dto.setChangeCertificate(null);
taskModelDto.setModel(dto);
//摘要 按原有规则组装
taskModelDto.setTaskContent("来自"+dto.getUseUnitCreditCode()+"【"+dto.getReceiveOrgName()+"】的业务办理,【申请单号:"+dto.getApplyNo()+"】");
//申请单号
taskModelDto.setTaskCode(dto.getApplyNo());
//业务类型枚举code值
taskModelDto.setTaskType(BusinessTypeEnum.JG_NAME_CHANGE_REGISTRATION.getCode());
//业务主键
taskModelDto.setRelationId(dto.getSequenceNbr()+"");
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
}
}
private Integer getTaskCodeByName(String auditStatus) {
......@@ -327,6 +349,8 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
}
this.updateById(jgChangeRegistrationName);
} else {
// 暂存逻辑
createTaskModel(jgChangeRegistrationName, null, "0", null);
this.updateById(jgChangeRegistrationName);
}
return jgChangeRegistrationNameDto;
......@@ -445,8 +469,10 @@ public class JgChangeRegistrationNameServiceImpl extends BaseService<JgChangeReg
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getReject().equals(auditStatus) ||
WorkFlowStatusEnum.UNIT_RENAME_SUBMIT.getRollBack().equals(auditStatus)
){
// urlInfo.json 文件的 pageType
return "edit";
} else {
// urlInfo.json 文件的 pageType
return "look";
}
}
......
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 @ a1a5a27b
......@@ -239,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(jgChangeRegistrationReform.getReceiveOrgCode());
List<ActWorkflowStartDTO> actWorkflowStartDTOList = Arrays.asList(dto);
ActWorkflowBatchDTO actWorkflowBatchDTO = new ActWorkflowBatchDTO();
actWorkflowBatchDTO.setProcess(actWorkflowStartDTOList);
......@@ -352,7 +352,7 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
map.put("approvalStatus", "提交");
}
dto.setVariable(map);
dto.setNextExecuteUserCompanyCode(commonMapper.getOrgCodeByCompanyCode(jgChangeRegistrationReform.getReceiveOrgCode()));
dto.setNextExecuteUserCompanyCode(getNextUserOrgCode(operate,jgChangeRegistrationReform));
//执行流程
processTaskDTO = iCmWorkflowService.complete(taskId, dto);
} catch (Exception e) {
......@@ -783,4 +783,20 @@ public class JgChangeRegistrationReformServiceImpl extends BaseService<JgChangeR
taskMessageDto.setNextExecuteIds(jgChangeRegistrationReform.getNextExecutorIds());
return taskMessageDto;
}
private String getNextUserOrgCode(String operate, JgChangeRegistrationReform jgChangeRegistrationReform) {
if("0".equals(operate)){
// 执行通过节点，单位code为接收机构单位信息
return jgChangeRegistrationReform.getReceiveOrgCode();
}
if(jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getPass())
|| jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getReject())
|| jgChangeRegistrationReform.getAuditStatus().equals(WorkFlowStatusEnum.CHANGE_RECEIVE.getRollBack())){
// 驳回且当前节点为一键节点时，单位code为发起人单位信息
return jgChangeRegistrationReform.getUseUnitCreditCode();
}
// 2、3级驳回时，单位code为接收单位code
return jgChangeRegistrationReform.getReceiveOrgCode();
}
}
\ No newline at end of file
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 @ a1a5a27b
......@@ -389,7 +389,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
JgChangeRegistrationTransfer jgTransfer = new JgChangeRegistrationTransfer();
LambdaQueryWrapper<JgChangeRegistrationTransfer> lambda = new QueryWrapper<JgChangeRegistrationTransfer>().lambda();
lambda.eq(JgChangeRegistrationTransfer::getInstanceId, instanceId);
jgTransfer = this.getOne(lambda);
ProcessTaskDTO processTask = icmWorkflowService.rollBack(instanceId);
WorkflowResultDto workflowResult = commonService.buildWorkFlowInfo(Collections.singletonList(processTask)).get(0);
String taskCode = "";
......@@ -407,7 +407,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
}
jgTransfer.setPromoter(reginParams.getUserModel().getUserId());
jgTransfer.setNextExecutorIds(role);
this.update(jgTransfer, lambda);
this.updateById(jgTransfer);
//待办 撤回
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgTransfer));
jsonObject.put("flowStatus", commonService.getDictionaryCodeByName(jgTransfer.getAuditStatus()));
......@@ -1101,7 +1101,7 @@ public class JgChangeRegistrationTransferServiceImpl extends BaseService<JgChang
*/
public String getSummaryInfo(JgChangeRegistrationTransfer transfer) {
String result = "来自%s【%s】的业务办理，【申请单号：%s】";
return String.format(result, transfer.getEquipListName(), transfer.getSupervisoryCode(), transfer.getApplyNo());
return String.format(result, Optional.ofNullable(transfer.getEquipListName()).orElse("无"), transfer.getSupervisoryCode(), transfer.getApplyNo());
}
public String getNextUserOrgCode(String operate, JgChangeRegistrationTransfer contract) {
......
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 @ a1a5a27b
......@@ -301,6 +301,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
scrapCancel.getCancelType(), scrapCancel.getApplyNo()));
taskModelDto.setTaskCode(scrapCancel.getApplyNo());
taskModelDto.setTaskType(businessTypeJudgment(scrapCancel.getCancelType()).getCode());
taskModelDto.setNextExecuteUser(scrapCancel.getNextExecuteIds());
taskModelDto.setRelationId(taskMessageDto.getSequenceNbr() + "");
}
commonService.buildTaskModel(Collections.singletonList(taskModelDto));
......@@ -532,9 +533,9 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
@Transactional
public void revocation(String instanceId) {
ReginParams reginParams = this.getSelectedOrgInfo();
JgScrapCancel jgScrapCancel = new JgScrapCancel();
LambdaQueryWrapper<JgScrapCancel> lambda = new QueryWrapper<JgScrapCancel>().lambda();
lambda.eq(JgScrapCancel::getInstanceId, instanceId);
JgScrapCancel jgScrapCancel = this.baseMapper.selectOne(lambda);
ProcessTaskDTO processTaskDTO = cmWorkflowService.rollBack(instanceId);
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
if (!FlowStatusEnum.TO_BE_FINISHED.getName().equals(workflowResultDto.getNextTaskName())) {
......@@ -547,7 +548,7 @@ public class JgScrapCancelServiceImpl extends BaseService<JgScrapCancelDto, JgSc
jgScrapCancel.setNextExecuteUserIds(nextUserIds);
jgScrapCancel.setPromoter(reginParams.getUserModel().getUserId());
jgScrapCancel.setNextExecuteIds(workflowResultDto.getNextExecutorRoleIds());
this.update(jgScrapCancel, lambda);
this.updateById(jgScrapCancel);
// 删除待办
JSONObject jsonObject = JSONObject.parseObject(JSONObject.toJSONString(jgScrapCancel));
......
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/JgUseRegistrationServiceImpl.java
View file @ a1a5a27b
......@@ -209,6 +209,8 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 暂存历史表
updateHistory(map, map.get("equipId").toString(), String.valueOf(jgUseRegistration.getSequenceNbr()), jgUseRegistration.getSupervisoryCode());
if (!ObjectUtils.isEmpty(map.get("submit"))) {
// 删除暂存代办
commonServiceImpl.deleteTaskModel(String.valueOf(jgUseRegistration.getSequenceNbr()));
String instanceId = "";
if (map.containsKey("instanceId")) {
instanceId = map.get("instanceId").toString();
......@@ -238,6 +240,25 @@ public class JgUseRegistrationServiceImpl extends BaseService<JgUseRegistrationD
// 执行流程
flowExecute(jgUseRegistration.getSequenceNbr(), instanceId, "0", "");
}
} else {
ArrayList<TaskModelDto> list = new ArrayList<>();
TaskModelDto dto = new TaskModelDto();
TaskMessageDto taskMessageDto = new TaskMessageDto();
BeanUtil.copyProperties(jgUseRegistration, taskMessageDto);
taskMessageDto.setEquipId(String.valueOf(map.get("equipId")));
// 数据参数
dto.setModel(taskMessageDto);
// 摘要
dto.setTaskContent("来自" + "电梯" + "【" + (ObjectUtils.isEmpty(jgUseRegistration.getSupervisoryCode()) ? "无" : jgUseRegistration.getSupervisoryCode()) + "】的业务办理," + "【申请单号：" + jgUseRegistration.getApplyNo() + "】");
// 申请单号
dto.setTaskCode(jgUseRegistration.getApplyNo());
// 业务类型
dto.setTaskType(String.valueOf(BusinessTypeEnum.JG_USAGE_REGISTRATION.getCode()));
// 业务主键
dto.setRelationId(String.valueOf(jgUseRegistration.getSequenceNbr()));
dto.setNextExecuteUser("");
list.add(dto);
commonServiceImpl.buildTaskModel(list);
}
}
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ a1a5a27b
......@@ -60,10 +60,10 @@
"url": "/mixuap?appId=1742358052905971713&id=1736722525146083329&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "106",
"pageType": "draft",
"name": "维保备案",
"url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
"type": "106",
"pageType": "draft",
"name": "维保备案",
"url": "/mixuap?appId=1742358052905971713&id=1737347718667333633&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "106",
......@@ -91,15 +91,21 @@
},
{
"type": "108",
"pageType": "draft",
"name": "更名变更登记-暂存打开",
"url": "/mixuap?appId=1742358052905971713&id=1739168596900212738&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "108",
"pageType": "look",
"name": "更名变更登记",
"name": "更名变更登记-查看",
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
},
{
"type": "108",
"pageType": "edit",
"name": "更名变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=detail"
"url": "/mixuap?appId=1742358052905971713&id=1739186702624256001&roleIds={roleIds}&userId={userId}&formType=edit"
},
{
"type": "109",
......@@ -141,19 +147,19 @@
"type": "111",
"name": "改造变更登记",
"pageType": "draft",
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=look"
"url": "/mixuap?appId=1742358052905971713&id=1737029146837544962&roleIds={roleIds}&userId={userId}&pageType=look"
},
{
"type": "111",
"name": "改造变更登记",
"pageType": "look",
"url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=look"
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=look"
},
{
"type": "111",
"pageType": "edit",
"name": "改造变更登记",
"url": "/mixuap?appId=1742358052905971713&id=1737415710281330690&roleIds={roleIds}&userId={userId}&pageType=edit"
"url": "/mixuap?appId=1742358052905971713&id=1737415693835464705&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "112-1",
......@@ -199,6 +205,12 @@
},
{
"type": "113-2",
"pageType": "draft",
"name": "注销报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357808040439809&roleIds={roleIds}&userId={userId}&pageType=edit"
},
{
"type": "113-2",
"pageType": "look",
"name": "注销报废",
"url": "/mixuap?appId=1742358052905971713&id=1737357871097606146&roleIds={roleIds}&userId={userId}&pageType=look"
......
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