From f0022e1ff4dfb7e54d93b230b6df677e9c0bc592 Mon Sep 17 00:00:00 2001 From: Jackwang Date: Wed, 7 Sep 2022 13:35:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-bug?= =?UTF-8?q?=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../result/ItemHandleProgressResultDTO.java | 7 ++- .../item/service/impl/ItemServiceImpl.java | 63 +++++-------------- .../main/resources/mapper/item/ItemDao.xml | 2 + 3 files changed, 22 insertions(+), 50 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java index a0a90c953..daad134a3 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemHandleProgressResultDTO.java @@ -29,9 +29,14 @@ public class ItemHandleProgressResultDTO implements Serializable { */ private String createdTime; /** - * 意见 + * 回复居民意见 */ private String advice; + + /** + * 部门意见 + */ + private String deptAdvice; /** * 操作人部门 */ diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java index 748e212f8..3c54a3fe9 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java @@ -878,6 +878,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcessEntity.setItemId(dto.getId()); handleProcessEntity.setHandleAdvice(dto.getHandleAdvice()); handleProcessEntity.setOutHandleAdvice(dto.getOutHandleAdvice()); + //当前操作人部门tyeKey + String sendTypeKey = ""; log.info("处理项目-进入判断"); // 吹哨 if (ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() == dto.getHandleCategory()) { @@ -928,8 +930,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); - //上报到网格化平台 - sendItemToDsf(dto,handleProcessEntity); log.info("处理项目-上报网格化平台-if结束"); // 结案申请 } else if (ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()) { @@ -950,6 +950,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem // 根据操作人部门，获取上一级部门ID Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + sendTypeKey = sysDeptDTO.getTypeKey(); // 手动拼接流转协助部门 ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); @@ -970,10 +971,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemDeptService.modifyItemDepts(dto.getHandlerDeptId(), dto.getId()); // 记录处理记录 itemHandleProcessService.insert(handleProcessEntity); - if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(sysDeptDTO.getTypeKey())){ - //上报到网格化平台 - sendItemToDsf(dto,handleProcessEntity); - } // 新增流转协助部门 itemDeptService.saveItemDepts(dto.getHandlerDeptId(), dto, handleProcessEntity.getId()); List newDeptIds = new ArrayList<>(); @@ -1170,6 +1167,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (dto.getHandleImages() != null && dto.getHandleImages().size() > 0) { imgService.saveImages(dto.getHandleImages(), handleProcessEntity.getId(), ImageConstant.TYPE_IMAGE_ITEM_HANDLE); } + //如果是结案申请并且是社区 || 社区上报 + if((ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory() && OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(sendTypeKey)) + || ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()){ + //上报到网格化平台 + sendItemToDsf(dto,handleProcessEntity); + } //居民端项目关闭、结案-短信通知 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()){ @@ -1688,7 +1691,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem private List getHandleList(String itemId, List handleImagesList) { //未组装的事件处理流程 - List handleList = baseDao.selectListOfItemHandleProgressByMobile(itemId); + List handleList = baseDao.selectListOfItemHandleProgressByWork(itemId); log.info("处理项目-未组装的事件处理流程结束"); //组装后的、所有的 处理事件流程 List resultList = new ArrayList<>(); @@ -1706,48 +1709,6 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemDepts.add(id.getDeptName()); } handleProcess.setItemDeptDTOS(itemDepts); - -// if (ipr.getState() == 0 && ipr.getItemDeptDTOS().size() > 0) { -// handleProcess.setState("吹哨"); -// } else if (ipr.getState() == 0 && ipr.getItemDeptDTOS().size() == 0) { -// handleProcess.setState("办理"); -// } else if (ipr.getState() == 5) { -// handleProcess.setState("关闭"); -// } else if (ipr.getState() == 10) { -// handleProcess.setState("结案"); -// } else if ( ipr.getState() == 11 || ipr.getState() == 12 || ipr.getState() == 13) { -// handleProcess.setState("满意度评价"); -// } else if (ipr.getState() == 15) { -// handleProcess.setState("上报网格化平台"); -// } else if (ipr.getState() == 20) { -// handleProcess.setState("网格化平台-受理"); -// } else if (ipr.getState() == 25) { -// handleProcess.setState("网格化平台-立案"); -// } else if (ipr.getState() == 30) { -// handleProcess.setState("网格化平台-派遣"); -// } else if (ipr.getState() == 35) { -// handleProcess.setState("网格化平台-再派遣"); -// } else if (ipr.getState() == 40) { -// handleProcess.setState("网格化平台-接单"); -// } else if (ipr.getState() == 45) { -// handleProcess.setState("网格化平台-处置完成"); -// } else if (ipr.getState() == 50) { -// handleProcess.setState("网格化平台-中间督办"); -// } else if (ipr.getState() == 55) { -// handleProcess.setState("网格化平台-催办"); -// } else if (ipr.getState() == 60) { -// handleProcess.setState("网格化平台-结案"); -// } else if (ipr.getState() == 65) { -// handleProcess.setState("网格化平台-办理"); -// } else if (ipr.getState() == 70) { -// handleProcess.setState("网格化平台-批转"); -// } else if (ipr.getState() == 75) { -// handleProcess.setState("网格化平台-退单"); -// } else if (ipr.getState() == 80) { -// handleProcess.setState("网格化平台-办结"); -// } else { -// handleProcess.setState(ipr.getState().toString()); -// } if (ipr.getState() == 0) { handleProcess.setState("处理中"); }else if (ipr.getState() == 5) { @@ -1760,6 +1721,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcess.setState("响应拟办"); } else if ( ipr.getState() == 13) { handleProcess.setState("直接办理"); + } else if (ipr.getState() == 14) { + handleProcess.setState("社区驳回"); } else if (ipr.getState() == 15) { handleProcess.setState("上报网格化平台"); } else if (ipr.getState() == 20) { @@ -1788,6 +1751,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem handleProcess.setState("网格化平台-退单"); } else if (ipr.getState() == 80) { handleProcess.setState("网格化平台-办结"); + } else if (ipr.getState() == 1001) { + handleProcess.setState("响应拟办"); } else { handleProcess.setState(ipr.getState().toString()); } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml index a348bc8ff..146c9ddf8 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml @@ -726,6 +726,7 @@ + @@ -760,6 +761,7 @@ hp.ID, hp.CREATED_TIME AS createdTime, hp.OUT_HANDLE_ADVICE AS advice, + hp.HANDLE_ADVICE as deptAdvice, hp.HANDLER_DEPT AS handlerDept, hp.STATE, itemDept.DEPT_NAME,