From d0e9481a4ffeb45b5327c79b6bc55de782dc27ce Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Thu, 8 Sep 2022 09:30:05 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=A4=84=E7=90=86=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=20=20=E6=B7=BB=E5=8A=A0=E3=80=90=E4=B8=8D=E4=BA=88?= =?UTF-8?q?=E5=8F=97=E7=90=86=E7=94=B3=E8=AF=B7=E3=80=91=E5=A4=84=E7=90=86?= =?UTF-8?q?=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../item/form/ItemHandleSubmitFormDTO.java | 10 ++++ .../result/ItemDetailForPCEndResultDTO.java | 18 ++++++ .../epdc/enums/ItemHandleCategoryEnum.java | 31 +++++----- .../item/service/impl/ItemServiceImpl.java | 56 ++++++++++++------- 4 files changed, 79 insertions(+), 36 deletions(-) diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java index 4bcd89ea0..e36e92159 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/form/ItemHandleSubmitFormDTO.java @@ -84,4 +84,14 @@ public class ItemHandleSubmitFormDTO implements Serializable { * 所属类别 */ private String categoryId; + + /** + * 办理人姓名 + */ + private String handlePeopleName; + + /** + * 办理人办公电话 + */ + private String handlePeopleMobile; } diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java index 9720b083b..322bd8557 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemDetailForPCEndResultDTO.java @@ -120,4 +120,22 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 友邻社群 */ private String groupName; + + + // 以下是20220907需求变更添加 + + /** + * 当前操作部门typeKey + */ + private String typeKey; + + /** + * 上级部门ID + */ + private Long parentDeptId; + + /** + * 上级部门名称 + */ + private String parentDeptName; } 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 3e7516787..97ae56aed 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 @@ -19,6 +19,7 @@ public enum ItemHandleCategoryEnum { HANDLE_I_HANDLE_COMMUNITY_REJECT(14, "社区驳回"),// 2022.9.4需求变更 HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"), HANDLE_CLOSE(5, "不予受理"), // 之前的关闭 2022.9.4需求变更 + HANDLE_CLOSE_APPLY(6, "不予受理申请"), // 2022.9.7需求变更 HANDLE_CANCEL_CASE(8, "作废"), HANDLE_CLOSING_CASE(10, "结案"), HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), // 之前的结案 2022.9.4需求变更 @@ -56,11 +57,11 @@ public enum ItemHandleCategoryEnum { List handleResultDTOS = new ArrayList<>(); // 不予受理 - ItemHandleResultDTO dto1 = new ItemHandleResultDTO(); - dto1.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); - dto1.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); - dto1.setSelect(false); // 暂时默认不流转 - handleResultDTOS.add(dto1); +// ItemHandleResultDTO dto1 = new ItemHandleResultDTO(); +// dto1.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); +// dto1.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); +// dto1.setSelect(false); // 暂时默认不流转 +// handleResultDTOS.add(dto1); // 响应拟办 ItemHandleResultDTO dto2 = new ItemHandleResultDTO(); @@ -70,18 +71,18 @@ public enum ItemHandleCategoryEnum { handleResultDTOS.add(dto2); // 结案申请 - ItemHandleResultDTO dto3 = new ItemHandleResultDTO(); - dto3.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - dto3.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); - dto3.setSelect(false); // 暂时默认不流转 - handleResultDTOS.add(dto3); +// ItemHandleResultDTO dto3 = new ItemHandleResultDTO(); +// dto3.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); +// dto3.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); +// dto3.setSelect(false); // 暂时默认不流转 +// handleResultDTOS.add(dto3); // 吹哨 - ItemHandleResultDTO dto4 = new ItemHandleResultDTO(); - dto4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue()); - dto4.setProcessName(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName()); - dto4.setSelect(false); // 暂时默认不流转 - handleResultDTOS.add(dto4); +// ItemHandleResultDTO dto4 = new ItemHandleResultDTO(); +// dto4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue()); +// dto4.setProcessName(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getName()); +// dto4.setSelect(false); // 暂时默认不流转 +// handleResultDTOS.add(dto4); return handleResultDTOS; } 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 4a251a2de..2488814a4 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 @@ -551,13 +551,20 @@ public class ItemServiceImpl extends BaseServiceImpl implem ItemDetailForPCEndResultDTO resultDTO = new ItemDetailForPCEndResultDTO(); // 获取已流转部门 List itemDeptDTOS = itemDeptService.listOfItemDept(dto.getItemId(), dto.getDeptId()); - Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId()); +// Result deptMessage = adminFeignClient.getDeptTypeKey(dto.getDeptId()); String typeKey = ""; - if (0 == deptMessage.getCode()) { - typeKey = deptMessage.getData().toString(); - } else { - throw new RenException(deptMessage.getMsg()); - } +// if (0 == deptMessage.getCode()) { +// typeKey = deptMessage.getData().toString(); +// } else { +// throw new RenException(deptMessage.getMsg()); +// } + // 根据操作人部门，获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(dto.getDeptId()); + SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + typeKey = sysDeptDTO.getTypeKey(); + resultDTO.setTypeKey(typeKey); + resultDTO.setParentDeptId(sysDeptDTO.getPid()); + resultDTO.setParentDeptName(sysDeptDTO.getParentName()); // 获取可操作处理和可流转部门 switch (typeKey) { case OrganizationTypeConstant.ORG_TYPE_GRID_PARTY: @@ -672,11 +679,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem // itemHandleResultDTOS.add(itemHandleResultDTO2); // 不予受理 - ItemHandleResultDTO itemHandleResultDTO5 = new ItemHandleResultDTO(); - itemHandleResultDTO5.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); - itemHandleResultDTO5.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); - itemHandleResultDTO5.setSelect(false); - itemHandleResultDTOS.add(itemHandleResultDTO5); +// ItemHandleResultDTO itemHandleResultDTO5 = new ItemHandleResultDTO(); +// itemHandleResultDTO5.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); +// itemHandleResultDTO5.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); +// itemHandleResultDTO5.setSelect(false); +// itemHandleResultDTOS.add(itemHandleResultDTO5); + + // 不予受理申请 + ItemHandleResultDTO itemHandleResultDTO6 = new ItemHandleResultDTO(); + itemHandleResultDTO6.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); + itemHandleResultDTO6.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getName()); + itemHandleResultDTO6.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO6); // 直接办理 ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); @@ -686,18 +700,18 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleResultDTOS.add(itemHandleResultDTO); // 结案申请 - ItemHandleResultDTO itemHandleResultDTO4 = new ItemHandleResultDTO(); - itemHandleResultDTO4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); - itemHandleResultDTO4.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); - itemHandleResultDTO4.setSelect(false); - itemHandleResultDTOS.add(itemHandleResultDTO4); +// ItemHandleResultDTO itemHandleResultDTO4 = new ItemHandleResultDTO(); +// itemHandleResultDTO4.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue()); +// itemHandleResultDTO4.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); +// itemHandleResultDTO4.setSelect(false); +// itemHandleResultDTOS.add(itemHandleResultDTO4); // 社区吹哨 - ItemHandleResultDTO itemHandleResultDTO3 = new ItemHandleResultDTO(); - itemHandleResultDTO3.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue()); - itemHandleResultDTO3.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName()); - itemHandleResultDTO3.setSelect(false); - itemHandleResultDTOS.add(itemHandleResultDTO3); +// ItemHandleResultDTO itemHandleResultDTO3 = new ItemHandleResultDTO(); +// itemHandleResultDTO3.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue()); +// itemHandleResultDTO3.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName()); +// itemHandleResultDTO3.setSelect(false); +// itemHandleResultDTOS.add(itemHandleResultDTO3); resultDTO.setHandleResultDTOS(itemHandleResultDTOS);