diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java index bc1025e81..aaf612c1a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/events/service/impl/ItemHotlineServiceImpl.java @@ -208,6 +208,7 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @@ -112,7 +112,7 @@ public class ItemController { * 初审项目列表 * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/10/22 9:56 */ @@ -127,7 +127,7 @@ public class ItemController { * 终审项目列表 * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wgf * @Date: 2022/10/22 9:56 */ @@ -142,7 +142,7 @@ public class ItemController { * 在党群E家流转中,尚未报到区平台的项目列表(难点堵点) * * @param params - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author zhy * @date 2022/10/24 15:15 */ @@ -156,7 +156,7 @@ public class ItemController { * 项目驳回列表 * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/16 9:56 */ @@ -287,7 +287,7 @@ public class ItemController { * 评论列表 * * @Params: [params] - * @Return: com.elink.esua.epdc.commons.tools.utils.Result> + * @Return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: liuchuang * @Date: 2019/9/6 18:58 */ @@ -313,7 +313,7 @@ public class ItemController { /*** * kpi-统计群众对问题处理的满意度 * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/12/18 10:27 */ @@ -328,7 +328,7 @@ public class ItemController { * kpi- 统计项目处理数 包括:网格呼叫总数,网格呼叫被响应数,网格呼叫被关闭数 * * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/12/18 16:02 */ @@ -341,7 +341,7 @@ public class ItemController { /*** * kpi- 网格对项目处理的评价 不满意 满意 非常满意 统计 * @param metaDataFormDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author qushutong * @date 2019/12/20 15:37 */ @@ -354,7 +354,7 @@ public class ItemController { /** * @Description: 项目管理已超时表格查询 * @Param: [params] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wk * @Date: 2020/6/15 */ @@ -367,7 +367,7 @@ public class ItemController { /** * @Description: 项目管理超时项目单条数据查询 * @Param: [params] - * @return: com.elink.esua.epdc.commons.tools.utils.Result> + * @return: com.elink.esua.epdc.commons.tools.utils.Result> * @Author: wk * @Date: 2020/6/15 */ @@ -429,7 +429,7 @@ public class ItemController { /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 北尚诉求列表 * @author wangtong * @date 2022/9/3 15:39 @@ -442,9 +442,9 @@ public class ItemController { } /** - * @Description: 导出北尚诉求列表 * @param params: * @param response: + * @Description: 导出北尚诉求列表 * @Return void * @Author: lichao * @Date: 2023/4/23 15:42 @@ -453,12 +453,12 @@ public class ItemController { public void exportItemAppealList(@RequestParam Map params, HttpServletResponse response) throws IOException { ExcelWriter excelWriter = null; String name = "诉求列表"; - if (params.get("appealType")!=null){ - if (params.get("appealType").toString().equals("0")){ + if (params.get("appealType") != null) { + if (params.get("appealType").toString().equals("0")) { name = "民生诉求列表"; - }else if (params.get("appealType").toString().equals("1")){ + } else if (params.get("appealType").toString().equals("1")) { name = "发展诉求列表"; - }else if (params.get("appealType").toString().equals("2")){ + } else if (params.get("appealType").toString().equals("2")) { name = "执法诉求列表"; } } @@ -479,8 +479,8 @@ public class ItemController { WriteSheet writeSheet = EasyExcel.writerSheet("Sheet1").registerWriteHandler(new FreezeAndFilter()).build(); List list = ConvertUtils.sourceToTarget(itemService.exportList(params), ItemAppealExcel.class); excelWriter.write(list, writeSheet); - } catch (Exception e) { - log.error(name+"export exception", e); + } catch (Exception e) { + log.error(name + "export exception", e); } finally { if (excelWriter != null) { excelWriter.finish(); @@ -489,7 +489,7 @@ public class ItemController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 北尚诉求列表(不满意列表) * @author wgf * @date 2022/10/10 08:39 @@ -502,7 +502,7 @@ public class ItemController { } /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 北尚诉求详情 * @author wangtong * @date 2022/9/3 16:06 @@ -515,7 +515,7 @@ public class ItemController { /** - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @describe: 获取社区结案审批列表 * @author wangtong * @date 2022/9/4 17:44 @@ -556,8 +556,8 @@ public class ItemController { /** - * @Description: 下发评价 * @param formDto: + * @Description: 下发评价 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2023/6/1 15:49 @@ -565,7 +565,7 @@ public class ItemController { @PostMapping("evaluationIssue") public Result evaluationIssue(@LoginUser TokenDto userDetail, @RequestBody EvaluationIssueformDTO formDto) { ValidatorUtils.validateEntity(formDto); - AcceptPlantformProcessDTO acceptPlantformProcessDTO = itemService.evaluationIssue(formDto,userDetail); + AcceptPlantformProcessDTO acceptPlantformProcessDTO = itemService.evaluationIssue(formDto, userDetail); ValidatorUtils.validateEntity(acceptPlantformProcessDTO); return itemService.pushItemProcess(acceptPlantformProcessDTO); } @@ -644,13 +644,13 @@ public class ItemController { /** - * 市级青诉即办平台对区(市)诉求进行在线督办 - * - * @param formDTO + * @param * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhy - * @date 2022/10/21 16:13 - */ + * @description: 2.32热线数据评价接口–2024-06新增 + * @author qushutong + * @date 2024/11/4 17:45 + * @Version1.0 + **/ @PostMapping("gov/case/evaluation") public Result caseEvaluation(@RequestBody QsjbEvaluation formDTO) { // ValidatorUtils.validateEntity(formDTO); @@ -658,7 +658,6 @@ public class ItemController { } - /** * 市级平台驳回区(市)上报的吹哨诉求 * @@ -744,6 +743,7 @@ public class ItemController { /** * 标记为重复案件 + * * @param dto * @return */ @@ -754,7 +754,8 @@ public class ItemController { /** - * 诉求分类 + * 诉求分类 + * * @param dto * @return */ @@ -765,8 +766,8 @@ public class ItemController { /** - * @Description: 失败的重新上报市平台 * @param : + * @Description: 失败的重新上报市平台 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2023/7/25 15:22 @@ -778,67 +779,64 @@ public class ItemController { /** - * - * @description: S诉求申诉列表 - * @author qushutong - * @date 2023/9/4 14:02 * @param * @return com.elink.esua.epdc.commons.tools.utils.Result + * @description: S诉求申诉列表 + * @author qushutong + * @date 2023/9/4 14:02 * @Version1.0 **/ @PostMapping("closedPage") - public Result closedPage(@RequestParam Map params){ + public Result closedPage(@RequestParam Map params) { return itemService.getClosePage(params); } /** - * + * @param + * @return com.elink.esua.epdc.commons.tools.utils.Result * @description: 诉求申诉 * @author qushutong * @date 2023/9/14 15:06 - * @param - * @return com.elink.esua.epdc.commons.tools.utils.Result * @Version1.0 **/ @PostMapping("sqAppeal") - public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO){ + public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) { return itemService.sqAppeal(appealAuditFormDTO); } /** - * + * @param ’startTime endTime deptName + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @description: 产品调用当天 * @author qushutong * @date 2023/10/25 10:53 - * @param ’startTime endTime deptName - * @return com.elink.esua.epdc.commons.tools.utils.Result> * @Version1.0 **/ @GetMapping("getItemList") - public Result> getItemList(@RequestParam Map params){ - log.info("产品调用"+params.toString()); + public Result> getItemList(@RequestParam Map params) { + log.info("产品调用" + params.toString()); Result> itemList = itemService.getItemList(params); - log.info("产品调用返回"+itemList.toString()); + log.info("产品调用返回" + itemList.toString()); return itemList; } @PostMapping("gov/pushToCityAgain") - public Result niceItem(){ + public Result niceItem() { return itemService.pushToCityAgain(); } @PostMapping("gov/pushToCityAgainDan") - public Result pushToCityAgainDan(){ + public Result pushToCityAgainDan() { return itemService.pushToCityAgainDan(); } /** - * @Description: 获取12345列表数据 * @param : - * @Return com.elink.esua.epdc.commons.tools.utils.Result> + * @Description: 获取12345列表数据 + * @Return com.elink.esua.epdc.commons.tools.utils.Result> * @Author: lichao * @Date: 2024/6/27 16:57 */ @@ -848,8 +846,8 @@ public class ItemController { } /** - * @Description: 分发给街道 * @param dto: + * @Description: 分发给街道 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2024/8/2 14:12 @@ -861,8 +859,8 @@ public class ItemController { /** - * @Description: 民生 转换 * @param dto: + * @Description: 民生 转换 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2024/6/28 13:39 @@ -873,8 +871,8 @@ public class ItemController { } /** - * @Description: 发展 转换 * @param dto: + * @Description: 发展 转换 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2024/6/28 13:39 @@ -887,8 +885,8 @@ public class ItemController { /** - * @Description: 执法 转换 * @param dto: + * @Description: 执法 转换 * @Return com.elink.esua.epdc.commons.tools.utils.Result * @Author: lichao * @Date: 2024/6/28 13:39 @@ -900,16 +898,15 @@ public class ItemController { /** - * - * @description: 事件回退到区中心用于驳回市里 - * @author qushutong - * @date 2024/8/20 13:52 * @param * @return com.elink.esua.epdc.commons.tools.utils.Result + * @description: 事件回退到区中心用于驳回市里 + * @author qushutong + * @date 2024/8/20 13:52 * @Version1.0 **/ @PostMapping("backItem") - public Result backItem(@RequestBody ItemDTO dto){ + public Result backItem(@RequestBody ItemDTO dto) { itemService.backItem(dto); return new Result(); diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java index ee3350d1a..7e1bce51a 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java @@ -1729,7 +1729,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService { public String sendUpdateAgain(UpdateAppealSendDTO appealSendDTO) { //发送到市平台 String resultString = cityGridApi.sendItemToCity(appealSendDTO, PushToCityGridConstant.UPDATEAGAIN, "设置诉求重办信息已接收接口"); - this.saveLog(appealSendDTO.getSqid(),"12345","设置诉求重办信息已接收接口",PushToCityGridConstant.UPDATEAGAIN,JSONObject.toJSONString(appealSendDTO),resultString); + this.saveLog(appealSendDTO.getCbid(),"12345","设置诉求重办信息已接收接口",PushToCityGridConstant.UPDATEAGAIN,JSONObject.toJSONString(appealSendDTO),resultString); return resultString; }