Skip to content

A
amos-boot-biz
Commit d3707900 authored by LiuLin's avatar LiuLin
Browse files
Options

fix(JG)：改造告知,设备移交代码提交

parent 45cbc059
Hide whitespace changes
Inline Side-by-side
Showing with 88 additions and 7 deletions
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/JgReformNoticeMapper.xml
View file @ d3707900
......@@ -59,7 +59,7 @@
AND (isn.notice_status in ('6612', '6613', '6614', '6616') )
AND isn.receive_org_code = #{orgCode}
</if>
<if test="type == 'enterprise'">
<if test="type == 'company'">
AND isn.install_unit_credit_code = #{orgCode}
</if>
</where>
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/JgReformNoticeController.java
View file @ d3707900
......@@ -4,6 +4,7 @@ import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
import com.yeejoin.amos.boot.module.common.biz.utils.CommonResponseUtil;
import com.yeejoin.amos.boot.module.jg.api.dto.JgReformNoticeDto;
import com.yeejoin.amos.boot.module.jg.api.entity.JgReformNotice;
import com.yeejoin.amos.boot.module.jg.api.service.IJgInstallationNoticeService;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.RequestMapping;
import io.swagger.annotations.ApiOperation;
......@@ -35,6 +36,9 @@ public class JgReformNoticeController extends BaseController {
@Autowired
JgReformNoticeServiceImpl jgReformNoticeService;
@Autowired
IJgInstallationNoticeService iJgInstallationNoticeService;
/**
* 新增改造告知
*
......@@ -122,11 +126,11 @@ public class JgReformNoticeController extends BaseController {
public ResponseModel<Page<JgReformNoticeDto>> queryForPage(
@ApiParam (value = "当前页码", required = true) @RequestParam (value = "current", defaultValue = "1") int current,
@ApiParam (value = "每页大小", required = true) @RequestParam (value = "size", defaultValue = "20") int size,
@ApiParam (value = "类型：enterprise-企业端、supervision-监管端", required = true) @RequestParam (value = "type", defaultValue = "enterprise") String type,
@RequestBody (required = false) JgReformNoticeDto model
) {
Page<JgReformNotice> page = new Page<>(current, size);
ReginParams reginParams = getSelectedOrgInfo();
String type = (String) iJgInstallationNoticeService.getCompanyType().get("companyLevel");
return ResponseHelper.buildResponse(jgReformNoticeService.queryForJgReformNoticePage(page, model, type, reginParams));
}
......
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/JgEquipTransferServiceImpl.java
View file @ d3707900
......@@ -85,7 +85,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
this.handleApplyNoList(applyNoList);
//启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(submitType, deviceList);
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getInstallUnitCreditCode(), submitType, deviceList);
List<JgEquipTransfer> transferList = new ArrayList<>();
List<JgEquipTransferEq> equipTransferEqList = new ArrayList<>();
......@@ -104,6 +104,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
baseMapper.insertBatchSomeColumn(transferList);
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
this.buildTask(transferList, workflowResultList);
} else{
//批量暂存
this.saveTempTransfer(transferList);
}
List<JgEquipTransferEq> jgEquipTransferEqList = this.buildJgEquipTransferEqList(equipTransferEqList, transferList);
......@@ -111,6 +114,29 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
}
/**
* 批量暂存
* @param transferList 移交信息
*/
private void saveTempTransfer(List<JgEquipTransfer> transferList) {
if (CollectionUtils.isEmpty(transferList)) {
return;
}
List<TaskModelDto> taskModelDtoList = transferList.stream().map(this::buildTempTaskModelDto).collect(Collectors.toList());
commonService.buildTaskModel(taskModelDtoList);
}
private TaskModelDto buildTempTaskModelDto(JgEquipTransfer item) {
return TaskModelDto.builder()
.model(item)
.taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
.taskCode(item.getApplyNo())
.taskType(BusinessTypeEnum.JG_EQUIPMENT_HANDOVER.getCode())
.relationId(item.getSequenceNbr()+"")
.build();
}
/**
* 上个代办改为已办
*
* @param transfer 设备信息
......@@ -215,6 +241,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(equipTransferDto.getSequenceNbr().toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(equipTransferDto.getInstallUnitCreditCode());
list.add(dto);
actWorkflowBatchDTO.setProcess(list);
ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
......@@ -232,6 +259,9 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
transfer.setNextTaskId(workflowResultDto.getNextTaskId());
updateById(transfer);
//删除暂存
commonService.deleteTaskModel(transfer.getSequenceNbr()+"");
// 如果为保存并提交，则创建代办
this.buildTask(Collections.singletonList(transfer), Collections.singletonList(workflowResultDto));
} else {
......@@ -245,6 +275,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
commMap.put("approvalStatus", op);
}
dto.setVariable(commMap);
dto.setNextExecuteUserCompanyCode(transfer.getInstallUnitCreditCode());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(transfer.getNextTaskId(), dto);
// 提取节点等信息
WorkflowResultDto workflowResultDto = commonService.buildWorkFlowInfo(Collections.singletonList(processTaskDTO)).get(0);
......@@ -293,6 +324,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
} else {
commMap.put("approvalStatus", op);
}
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgEquipTransfer.getUseUnitCreditCode() : jgEquipTransfer.getInstallUnitCreditCode());
workDto.setVariable(commMap);
workDto.setComment(jgEquipTransferDto.getProcessAdvice());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgEquipTransfer.getNextTaskId(), workDto);
......@@ -443,7 +475,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
* @param deviceList 设备列表
* @return 工作流信息
*/
private List<WorkflowResultDto> startWorkFlow(String submitType, List<Map<String, Object>> deviceList) {
private List<WorkflowResultDto> startWorkFlow(String receiveOrgCode, String submitType, List<Map<String, Object>> deviceList) {
if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
return new ArrayList<>();
}
......@@ -454,6 +486,7 @@ public class JgEquipTransferServiceImpl extends BaseService<JgEquipTransferDto,
dto.setProcessDefinitionKey(EQUIP_TRANSFER_PROCESS_KEY);
dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(receiveOrgCode);
return dto;
})
.collect(Collectors.toList());
......
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/JgReformNoticeServiceImpl.java
View file @ d3707900
......@@ -164,6 +164,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
ActWorkflowStartDTO dto = new ActWorkflowStartDTO();
dto.setBusinessKey(noticeDto.getSequenceNbr().toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(noticeDto.getReceiveCompanyCode());
list.add(dto);
actWorkflowBatchDTO.setProcess(list);
ProcessTaskDTO processTaskDTO = cmWorkflowService.startBatch(actWorkflowBatchDTO).get(0);
......@@ -180,6 +181,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
notice.setNoticeStatus(String.valueOf(FlowStatusEnum.TO_BE_PROCESSED.getCode()));
notice.setNextTaskId(workflowResultDto.getNextTaskId());
jgReformNoticeMapper.updateById(notice);
//删除暂存
commonService.deleteTaskModel(notice.getSequenceNbr()+"");
// 如果为保存并提交，则创建代办
this.buildTask(Collections.singletonList(notice), Collections.singletonList(workflowResultDto));
}else {
......@@ -192,6 +195,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
} else {
commMap.put("approvalStatus", op);
}
dto.setNextExecuteUserCompanyCode(notice.getReceiveCompanyCode());
dto.setVariable(commMap);
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(notice.getNextTaskId(), dto);
// 提取节点等信息
......@@ -391,7 +395,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
//启动工作流
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(submitType, deviceList);
List<WorkflowResultDto> workflowResultList = this.startWorkFlow(model.getReceiveCompanyCode(), submitType, deviceList);
List<JgReformNotice> list = new ArrayList<>();
List<JgReformNoticeEq> equipList = new ArrayList<>();
......@@ -442,6 +446,8 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
if (SUBMIT_TYPE_FLOW.equals(submitType)) {
this.buildTask(list, workflowResultList);
}else {
this.saveTempReformNotice(list);
}
List<JgReformNoticeEq> jgRelationEquipList = equipList.stream().map(jgRelationEquip -> {
......@@ -455,6 +461,29 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
}
/**
* 批量暂存
* @param noticeList 移交信息
*/
private void saveTempReformNotice(List<JgReformNotice> noticeList) {
if (CollectionUtils.isEmpty(noticeList)) {
return;
}
List<TaskModelDto> taskModelDtoList = noticeList.stream().map(this::buildTempTaskModelDto).collect(Collectors.toList());
commonService.buildTaskModel(taskModelDtoList);
}
private TaskModelDto buildTempTaskModelDto(JgReformNotice item) {
return TaskModelDto.builder()
.model(item)
.taskContent(String.format("来自%s【%s】的业务办理，【申请单号：%s】", item.getEquList(), item.getSupervisoryCode(), item.getApplyNo()))
.taskCode(item.getApplyNo())
.taskType(BusinessTypeEnum.JG_MODIFICATION_NOTIFICATION.getCode())
.relationId(item.getSequenceNbr()+"")
.build();
}
/**
* 插入代办
*/
private void buildTask(List<JgReformNotice> list, List<WorkflowResultDto> workflowResultList) {
......@@ -505,7 +534,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
* @param deviceList 设备列表
* @return 工作流信息
*/
private List<WorkflowResultDto> startWorkFlow(String submitType, List<Map<String, Object>> deviceList) {
private List<WorkflowResultDto> startWorkFlow(String receiveOrgCode, String submitType, List<Map<String, Object>> deviceList) {
if (!SUBMIT_TYPE_FLOW.equals(submitType)) {
return new ArrayList<>();
}
......@@ -516,6 +545,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
dto.setProcessDefinitionKey(PROCESS_DEFINITION_KEY);
dto.setBusinessKey(item.get("SEQUENCE_NBR").toString());
dto.setCompleteFirstTask(Boolean.TRUE);
dto.setNextExecuteUserCompanyCode(receiveOrgCode);
return dto;
})
.collect(Collectors.toList());
......@@ -589,6 +619,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
if (receiveOrgIdList.length > 1) {
model.setReceiveOrgCode(receiveOrgIdList[0]);
model.setReceiveOrgName(receiveOrgIdList[1]);
model.setReceiveCompanyCode(receiveOrgIdList[0]);
}
}
String constructionManagerId = model.getConstructionManagerId();
......@@ -672,6 +703,7 @@ public class JgReformNoticeServiceImpl extends BaseService<JgReformNoticeDto, Jg
} else {
commMap.put("approvalStatus", op);
}
workDto.setNextExecuteUserCompanyCode("1".equals(op) ? jgReformNotice.getInstallUnitCreditCode() : jgReformNotice.getReceiveOrgCode());
workDto.setVariable(commMap);
workDto.setComment(jgReformNotice.getRemark());
ProcessTaskDTO processTaskDTO = cmWorkflowService.complete(jgReformNotice.getNextTaskId(), workDto);
......
amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/resources/json/urlInfo.json
View file @ d3707900
[
{
"type": "101",
"pageType": "draft",
"name": "设备移交",
"url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "101",
"pageType": "look",
"name": "设备移交",
"url": "/mixuap?appId=1742358052905971713&id=1737399017643470849&formType=detail&roleIds={roleIds}&userId={userId}"
......@@ -19,7 +25,7 @@
},
{
"type": "103",
"pageType": "edit",
"pageType": "draft",
"name": "改造告知",
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&formType=edit&roleIds={roleIds}&userId={userId}"
},
......@@ -30,6 +36,12 @@
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&roleIds={roleIds}&userId={userId}&formType=detail"
},
{
"type": "103",
"pageType": "edit",
"name": "改造告知",
"url": "/mixuap?appId=1742358052905971713&id=1737116607995473921&handle=true&formType=edit&roleIds={roleIds}&userId={userId}"
},
{
"type": "104",
"pageType": "look",
"name": "维修告知",
......
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