From 8fdce2d528dba8582e77c1cfd96ab61949b25997 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Mon, 5 Sep 2022 19:19:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/dto/item/ItemPendingHandleDTO.java | 5 ++ .../epdc/enums/ItemHandleCategoryEnum.java | 6 +-- .../service/impl/ItemDeptServiceImpl.java | 3 +- .../item/service/impl/ItemServiceImpl.java | 48 +++++++++++-------- .../main/resources/mapper/item/ItemDao.xml | 5 +- 5 files changed, 40 insertions(+), 27 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java index 6d399cec3..7d2f1830d 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemPendingHandleDTO.java @@ -70,4 +70,9 @@ public class ItemPendingHandleDTO implements Serializable { */ private String isDelay; + /** + * 是否提醒社区处理(1:提示) + */ + private String isRemind; + } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java index 7446305c1..7d7a13e05 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/enums/ItemHandleCategoryEnum.java @@ -17,11 +17,11 @@ public enum ItemHandleCategoryEnum { HANDLE_I_HANDLE_GRID(12, "响应拟办"),// 等同于网格回应 2022.9.4需求变更 HANDLE_I_HANDLE_COMMUNITY(13, "直接办理"),// 等同于社区回应 2022.9.4需求变更 HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"), - HANDLE_CLOSE(5, "不予受理"), + HANDLE_CLOSE(5, "不予受理"), // 之前的关闭 2022.9.4需求变更 HANDLE_CANCEL_CASE(8, "作废"), HANDLE_CLOSING_CASE(10, "结案"), - HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), - HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 + HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), // 之前的结案 2022.9.4需求变更 + HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 2022.9.4需求变更 private int value; private String name; diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java index cab6a96b2..7715ad4ce 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemDeptServiceImpl.java @@ -70,8 +70,7 @@ public class ItemDeptServiceImpl extends BaseServiceImpl deptEntities = new ArrayList<>(); - for (ItemCirculationDeptResultDTO dto: - formDTO.getDeptResultDTOS()) { + for (ItemCirculationDeptResultDTO dto: formDTO.getDeptResultDTOS()) { ItemDeptEntity entity = new ItemDeptEntity(); entity.setItemId(formDTO.getId()); entity.setDeptId(dto.getDeptId()); 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 f3f630000..1cbc83624 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 @@ -209,12 +209,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem } //部门ID列表 List deptIdList = new ArrayList<>(); - // 判断是否为网格，不为网格只能查看本部门下的项目数据 - if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey())) { + // 判断是否为社区网格，不为社区网格只能查看本部门下的项目数据 + if (OrganizationTypeConstant.ORG_TYPE_GRID_PARTY.equals(user.getTypeKey()) || OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())) { deptIdList = user.getDeptIdList(); } else { deptIdList.add(user.getDeptId()); } + if(OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(user.getTypeKey())){ + params.put("isRemind", "isRemind"); + } params.put("deptIdList", null); if (null != deptIdList && deptIdList.size() > 0) { params.put("deptIdList", deptIdList); @@ -917,19 +920,22 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().error("请选择正确的处理部门"); } - // 项目流转校验 - Result checkResult = this.checkItemCirculation(dto); - if (!checkResult.success()) { - return checkResult; - } - - // 根据当前登录人部门，获取上一级部门ID - Long currentDeptId = SecurityUser.getDeptId(); - Result sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId); + // 根据操作人部门，获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + // 手动拼接流转协助部门 + ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); + itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); + itemCirculationDeptResultDTO.setDeptName(sysDeptDTO.getParentName()); + itemCirculationDeptResultDTO.setSelected(false); + itemCirculationDeptResultDTO.setTypeKey(sysDeptDTO.getTypeKey()); + List deptList = new ArrayList(); + deptList.add(itemCirculationDeptResultDTO); + dto.setDeptResultDTOS(deptList); + handleProcessEntity.setState(dto.getHandleCategory()); - handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); + handleProcessEntity.setCloseCheckId(sysDeptDTO.getPid()); // todo 待确认 // 获取已流转部门信息 List oldDeptIds = itemDeptService.listOfWhistlingDeptIds(dto.getId(), dto.getHandlerDeptId()); @@ -956,12 +962,13 @@ public class ItemServiceImpl extends BaseServiceImpl implem this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); log.info("处理项目-结案申请-if结束"); } else { - if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){ - // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】 - handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); - }else{ - handleProcessEntity.setState(dto.getHandleCategory()); - } + handleProcessEntity.setState(dto.getHandleCategory()); +// if(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()){ +// // 如果操作是【响应拟办】【直接办理】相当于之前逻辑的【回应】 +// handleProcessEntity.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); +// }else{ +// handleProcessEntity.setState(dto.getHandleCategory()); +// } // 更新项目状态 if (ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() == dto.getHandleCategory()) { @@ -1051,9 +1058,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem } // 结案申请 }else if(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() == dto.getHandleCategory()){ - Long currentDeptId = SecurityUser.getDeptId(); - // 根据当前登录人部门，获取上一级部门ID - Result sysDeptInfo = adminFeignClient.getSysDeptInfo(currentDeptId); + // 根据操作人人部门，获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getHandlerDeptId()); SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); ItemCirculationDeptResultDTO itemCirculationDeptResultDTO = new ItemCirculationDeptResultDTO(); itemCirculationDeptResultDTO.setDeptId(sysDeptDTO.getPid()); 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 210d31e8b..237b1e537 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 @@ -502,6 +502,9 @@ eve.OPPOSE_NUM, eve.COMMENT_NUM, eve.BROWSE_NUM, + + (case when (process.ID is null and HOUR( timediff( now(), item.CREATED_TIME) ) > 24) then '1' else '' end) as isRemind, + ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum, (case when d.ID is not null then '1' else '0' end) as isDelay FROM epdc_item item @@ -527,7 +530,7 @@ ) ) process on process.ITEM_ID = item.ID WHERE item.DEL_FLAG = '0' - and (item.PEOPLE_FLAG is null or (item.PEOPLE_FLAG = '0' and process.state not in (11,15))) + and (item.IS_PEOPLE = '0' or (item.PEOPLE_FLAG = '0' and (process.state is null or process.state not in (11,15)))) AND item.ITEM_STATE = #{itemState}