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 99b96a9b7..7446305c1 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 @@ -13,13 +13,15 @@ import java.util.List; */ public enum ItemHandleCategoryEnum { - HANDLE_I_HANDLE(0, "办理"), + HANDLE_I_HANDLE(0, "回应"), + 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, "不予受理"), HANDLE_CANCEL_CASE(8, "作废"), HANDLE_CLOSING_CASE(10, "结案"), HANDLE_CLOSING_CASE_APPLY(11, "结案申请"), - HANDLE_REPORT(15, "上报网格化平台"); + HANDLE_REPORT(15, "社区吹哨");// 之前的上报网格化平台 private int value; private String name; @@ -51,11 +53,10 @@ public enum ItemHandleCategoryEnum { public static List getHandleCategoriesForGirdNew() { List handleResultDTOS = new ArrayList<>(); for (ItemHandleCategoryEnum e : ItemHandleCategoryEnum.values()) { - if (e.getValue() != ItemHandleCategoryEnum.HANDLE_REPORT.getValue() && - e.getValue() != ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() && - e.getValue() != ItemHandleCategoryEnum.HANDLE_CANCEL_CASE.getValue() && - e.getValue() != ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue() && - e.getValue() != ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() + if (e.getValue() == ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() || + e.getValue() == ItemHandleCategoryEnum.HANDLE_CLOSE.getValue() || + e.getValue() == ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getValue() || + e.getValue() == ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue() ) { ItemHandleResultDTO dto = new ItemHandleResultDTO(); dto.setProcessResult(e.value); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java index 0517b6734..471b6f954 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java @@ -105,6 +105,20 @@ public class ItemController { return new Result().ok(data); } + /** + * 项目处理提交 + * + * @Params: [dto] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: liuchuang + * @Date: 2019/9/16 19:09 + */ + @PostMapping("itemHandleSubmit") + public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { + ValidatorUtils.validateEntity(dto); + return itemService.modifyHandleResult(dto); + } + @PostMapping public Result save(@RequestBody ItemDTO dto) { //效验数据 @@ -135,19 +149,7 @@ public class ItemController { ExcelUtils.exportExcelToTarget(response, null, list, ItemExcel.class); } - /** - * 项目处理提交 - * - * @Params: [dto] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result - * @Author: liuchuang - * @Date: 2019/9/16 19:09 - */ - @PostMapping("itemHandleSubmit") - public Result itemHandleSubmit(@RequestBody ItemHandleSubmitFormDTO dto) { - ValidatorUtils.validateEntity(dto); - return itemService.modifyHandleResult(dto); - } + /** * 项目内容详情 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 21d30e1ff..f3f630000 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 @@ -546,8 +546,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem * @Author: liuchuang * @Date: 2019/9/16 13:40 */ - private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, - List itemDeptDTOS,Long deptId) { + private ItemDetailForPCEndResultDTO getHandleCategoryAndCirculationDeptOfGrid(ItemDetailForPCEndResultDTO resultDTO, List itemDeptDTOS,Long deptId) { // 可流转部门 Result completeDept = adminFeignClient.getCompleteDept(deptId); if (!completeDept.success()) { @@ -562,8 +561,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem if (null != itemDeptDTOS && itemDeptDTOS.size() > 0) { selected = true; // 判断已流转部门 - for (ItemDeptDTO dto : - itemDeptDTOS) { + for (ItemDeptDTO dto : itemDeptDTOS) { if (dto.getDeptId().equals(completeDeptDTO.getCommunityId())) { communitySelected = true; } @@ -623,17 +621,25 @@ public class ItemServiceImpl extends BaseServiceImpl implem private ItemDetailForPCEndResultDTO getHandleCategory(ItemDetailForPCEndResultDTO resultDTO) { // 可做操作：我来处理 List itemHandleResultDTOS = new ArrayList<>(); - ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); - itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); - itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()); - itemHandleResultDTO.setSelect(false); - itemHandleResultDTOS.add(itemHandleResultDTO); // 9.4 修改 +// List itemHandleResultDTOS = new ArrayList<>(); +// ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); +// itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue()); +// itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()); +// itemHandleResultDTO.setSelect(false); +// itemHandleResultDTOS.add(itemHandleResultDTO); + // ItemHandleResultDTO itemHandleResultDTO2 = new ItemHandleResultDTO(); // itemHandleResultDTO2.setProcessResult(ItemHandleCategoryEnum.HANDLE_CANCEL_CASE.getValue()); // itemHandleResultDTO2.setProcessName(ItemHandleCategoryEnum.HANDLE_CANCEL_CASE.getName()); // itemHandleResultDTO2.setSelect(false); // itemHandleResultDTOS.add(itemHandleResultDTO2); + + ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); + itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); + itemHandleResultDTO.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getName()); + itemHandleResultDTO.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO); ItemHandleResultDTO itemHandleResultDTO3 = new ItemHandleResultDTO(); itemHandleResultDTO3.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue()); itemHandleResultDTO3.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName()); @@ -644,6 +650,11 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleResultDTO4.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE_APPLY.getName()); itemHandleResultDTO4.setSelect(false); itemHandleResultDTOS.add(itemHandleResultDTO4); + ItemHandleResultDTO itemHandleResultDTO5 = new ItemHandleResultDTO(); + itemHandleResultDTO5.setProcessResult(ItemHandleCategoryEnum.HANDLE_CLOSE.getValue()); + itemHandleResultDTO5.setProcessName(ItemHandleCategoryEnum.HANDLE_CLOSE.getName()); + itemHandleResultDTO5.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO5); resultDTO.setHandleResultDTOS(itemHandleResultDTOS); return resultDTO; @@ -866,9 +877,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); - // 上报网格化平台 + // 上报网格化平台（社区吹哨） } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { - log.info("处理项目-进入上报网格化平台"); + log.info("处理项目-进入上报网格化平台（社区吹哨）"); boolean reportFlag = this.checkReport(dto.getId()); if (reportFlag) { return new Result().error("当前项目已上报网格化平台"); @@ -943,8 +954,15 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); + log.info("处理项目-结案申请-if结束"); } else { - 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()) { if (dto.getHandlerDeptId().longValue() != entity.getGridId().longValue()) { @@ -974,7 +992,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemEntity.setLastHandleTime(new Date()); baseDao.updateById(itemEntity); - //业务部门消息处理 + // 业务部门消息处理 ItemInformationEntity itemInfoDto = new ItemInformationEntity(); itemInfoDto.setType(ItemInformationConstant.INFORMATION_TYPE_ITEM); itemInfoDto.setBusinessType(dto.getHandleCategory()); @@ -984,8 +1002,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemInfoDto.setHandleDept(dto.getHandlerDept()); itemInfoDto.setHandleAdvice(dto.getHandleAdvice()); itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO); - // 办理处理 - if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) { + // 回应处理------变更为【响应拟办】【直接办理】 +// if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) { + if (ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue() == dto.getHandleCategory() || ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue() == dto.getHandleCategory()) { // 社区党工委和街道党工委处理 if (OrganizationTypeConstant.ORG_TYPE_COMMUNITY_PARTY.equals(typeKey) || OrganizationTypeConstant.ORG_TYPE_STREET_PARTY.equals(typeKey)) { //插入项目消息表（仅网格）