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 15f942147..785185e14 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 @@ -148,4 +148,45 @@ public class ItemDetailForPCEndResultDTO implements Serializable { * 办理人办公电话 */ private String handlePeopleMobile; + + /** + * 图片 + */ + private String imgUrl; + + /** + * 0-处理中,\r\n5-不予受理,\r\n10-已结案,\r\n11:结案申请,\r\n12:响应拟办,\r\n1001:响应拟办[流程图第一条],\r\n13:直接办理,\r\n15:上报网格化平台(社区吹哨)''\r\n20:网格化平台-受理''\r\n25:网格化平台-立案''\r\n30:网格化平台-派遣''\r\n35:网格化平台-中间再派''\r\n40:网格化平台-接单''\r\n45:网格化平台-处理''\r\n50:网格化平台-中间督办''\r\n55:网格化平台-催办''\r\n60:网格化平台-结案''\r\n85-延期审核通过,\r\n90-熔断审核通过,\r\n1065-网格化平台-驳回', + */ + private Integer state; + + /** + * 处理意见 + */ + private String handleAdvice; + + /** + * 处理意见(外部) + */ + private String outHandleAdvice; + + /** + * 操作人部门ID + */ + private Long handlerDeptId; + + /** + * 操作人部门 + */ + private String handlerDept; + + /** + * 结案审批部门 + */ + private Long closeCheckId; + + /** + * 办理意见 + */ + private Integer handleCategoryShow; + } 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 4d1794c71..4dfb8daba 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 @@ -107,6 +107,20 @@ public class ItemController { return new Result().ok(data); } + /** + * 项目处理详情 by HAHA + * + * @Params: [id] + * @Return: com.elink.esua.epdc.commons.tools.utils.Result + * @Author: HAHA + * @Date: 2019/9/16 9:56 + */ + @GetMapping("reject/{id}") + public Result rejectGet(@PathVariable("id") String id) { + ItemDetailForPCEndResultDTO data = itemService.getRejectGet(id); + return new Result().ok(data); + } + /** * 获取可操作处理 * diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java index 2ed5ad898..ebb5ba7e4 100755 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java @@ -564,4 +564,14 @@ public interface ItemService extends BaseService { * @return com.elink.esua.epdc.commons.tools.utils.Result */ Result pushItemProcess(AcceptPlantformProcessDTO formDto); + + /** + * 项目处理详情 by HAHA + * + * @param id + * @return com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO + * @author LZN + * @date 2022/9/8 22:40 + */ + ItemDetailForPCEndResultDTO getRejectGet(String id); } 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 e3a31798e..98671d97b 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 @@ -581,6 +581,46 @@ public class ItemServiceImpl extends BaseServiceImpl implem resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS); + return resultDTO; + } + /** + * 项目处理详情 by HAHA + * + * @param id + * @return com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO + * @author LZN + * @date 2022/9/8 22:40 + */ + @Override + public ItemDetailForPCEndResultDTO getRejectGet(String id) { + + // 详情 + ItemDetailForPCEndResultDTO resultDTO = baseDao.selectOneOfItemDetailForPCEnd(id); + + // 根据操作人部门,获取上一级部门ID + Result sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId()); + SysDeptDTO sysDeptDTO = sysDeptInfo.getData(); + if(sysDeptDTO.getTypeKey() == "community_party") { + ArrayList list = new ArrayList(); + list.add("历史遗留暂不具备解决条件的事项"); + list.add("依法应当通过诉讼、仲裁、行政复议解决的事项"); + list.add("已进入诉讼、仲裁、行政复议、信访、信息公开等法定程序或已通过上述法定程序处理的事项"); + list.add("属于军队职责范围的事项"); + list.add("涉及国家机密、商业秘密、个人隐私的事项"); + list.add("违反法律法规、社会公序良俗以及恶意攻击、骚扰或无实质诉求内容的事项"); + list.add("依法应当通过110、119、120等紧急服务专线处理的事项"); + list.add("涉及党组织、党员、监察对象的检举、控告和申诉,建议您到市北区纪委监委信访室(延吉路80号)反映问题,举报电话:12388"); + list.add("不在市北区管辖范围的事项"); + list.add("其他不予受理的事项"); + if(list.contains(resultDTO.getHandleAdvice())){ + resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_CLOSE_APPLY.getValue()); + } else { + resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_COMMUNITY.getValue()); + } + } else { + resultDTO.setHandleCategoryShow(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GRID.getValue()); + } + return resultDTO; } @@ -2750,6 +2790,8 @@ public class ItemServiceImpl extends BaseServiceImpl implem return new Result().ok("操作成功"); } + + /** * 领域类别处理 * 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 a674576bf..5523ac0c1 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 @@ -719,12 +719,19 @@ ifnull(img.IMG_URL,mi.IMG_URL) as IMG_URL, item.GROUP_NAME, IFNULL(item.item_voice,iii.IMG_URL) as VOICE, - IFNULL(item.DURATION,iii.DURATION) as DURATION + IFNULL(item.DURATION,iii.DURATION) as DURATION, + process.STATE, + process.HANDLE_ADVICE, + process.OUT_HANDLE_ADVICE, + process.HANDLER_DEPT_ID, + process.HANDLER_DEPT, + process.CLOSE_CHECK_ID FROM epdc_item item LEFT JOIN epdc_img img ON item.EVENT_ID = img.REFERENCE_ID AND img.DEL_FLAG = '0' AND img.IMG_TYPE = 'events' left join epdc_img mi on item.id=mi.REFERENCE_ID AND mi.DEL_FLAG = '0' AND mi.IMG_TYPE = 'events' LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0' LEFT JOIN epdc_img iii ON item.EVENT_ID = iii.REFERENCE_ID AND iii.DEL_FLAG = '0' AND iii.IMG_TYPE = 'eventsVoice' + LEFT JOIN epdc_item_handle_process process on process.item_id = item.id WHERE item.DEL_FLAG = '0' AND item.ID = #{itemId}