diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java index 9655eb4aa..daf7d52af 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/constant/EventsNoticeConstant.java @@ -35,6 +35,10 @@ public interface EventsNoticeConstant { * 项目关闭 */ String NOTICE_ITEM_CLOSED = "项目【关闭】"; + /** + * 项目上报 + */ + String NOTICE_REPORT = "项目【上报网格化平台】"; /** * 项目结案 */ 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 4a455c0fc..64d4a8669 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 @@ -15,7 +15,8 @@ public enum ItemHandleCategoryEnum { HANDLE_I_HANDLE(0, "回应"), HANDLE_CIRCULATION_ASSISTANCE(1, "吹哨"), HANDLE_CLOSE(5, "关闭"), - HANDLE_CLOSING_CASE(10, "结案"); + HANDLE_CLOSING_CASE(10, "结案"), + HANDLE_REPORT(15, "上报网格化平台"); 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/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 497f7aafd..fc0f3989e 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 @@ -471,7 +471,7 @@ public class ItemServiceImpl extends BaseServiceImpl implem } resultDTO.setDeptResultDTOS(deptResultDTOS); - // 可做操作:流转协助、我来处理 + // 可做操作:流转协助、我来处理、上报网格化平台 List itemHandleResultDTOS = new ArrayList<>(); ItemHandleResultDTO itemHandleResultDTO = new ItemHandleResultDTO(); itemHandleResultDTO.setProcessResult(ItemHandleCategoryEnum.HANDLE_CIRCULATION_ASSISTANCE.getValue()); @@ -487,6 +487,12 @@ public class ItemServiceImpl extends BaseServiceImpl implem itemHandleResultDTO1.setProcessName(ItemHandleCategoryEnum.HANDLE_I_HANDLE.getName()); itemHandleResultDTO1.setSelect(false); itemHandleResultDTOS.add(itemHandleResultDTO1); + + ItemHandleResultDTO itemHandleResultDTO2 = new ItemHandleResultDTO(); + itemHandleResultDTO1.setProcessResult(ItemHandleCategoryEnum.HANDLE_REPORT.getValue()); + itemHandleResultDTO1.setProcessName(ItemHandleCategoryEnum.HANDLE_REPORT.getName()); + itemHandleResultDTO1.setSelect(false); + itemHandleResultDTOS.add(itemHandleResultDTO2); resultDTO.setHandleResultDTOS(itemHandleResultDTOS); return resultDTO; @@ -560,6 +566,9 @@ public class ItemServiceImpl extends BaseServiceImpl implem List deptIds = new ArrayList<>(longTreeSet); // 发送菜单消息-待处理项目-吹哨部门 this.sendWhistlingDeptItemHandleMenuNotice(deptIds, null); + } else if (ItemHandleCategoryEnum.HANDLE_REPORT.getValue() == dto.getHandleCategory()) { + handleProcessEntity.setState(dto.getHandleCategory()); + informationFormDTO.setTitle(EventsNoticeConstant.NOTICE_REPORT); } else { handleProcessEntity.setState(dto.getHandleCategory()); // 更新项目状态 @@ -586,24 +595,15 @@ 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()); - // 项目id itemInfoDto.setAssociatedBusinessId(dto.getId()); - // 项目内容 itemInfoDto.setAssociatedBusinessContent(entity.getItemContent()); - // 处理部门Id(操作者所属部门) itemInfoDto.setHandleDeptId(user.getDeptId()); - // 处理部门(操作者所属部门) itemInfoDto.setHandleDept(user.getDeptName()); - // 处理意见(仅内部) itemInfoDto.setHandleAdvice(dto.getHandleAdvice()); - // 读取标识(默认未读:0) itemInfoDto.setReadFlag(ItemInformationConstant.READ_FLAG_NO); // 回应处理 if (ItemHandleCategoryEnum.HANDLE_I_HANDLE.getValue() == dto.getHandleCategory()) {