修改热线拉取驳回重办+ 热线回退数据接收评价

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<ItemHotlineDao, Item
 
 
     @Override
+    @Transactional
     public Result backHotLine(ItemBackHotlineDTO dto) {
         String id = dto.getId();
         ItemHotlineEntity itemHotlineEntity = baseDao.selectById(id);
@@ -279,11 +280,13 @@ public class ItemHotlineServiceImpl extends BaseServiceImpl<ItemHotlineDao, Item
             //  存入之后 告知市里
             appealSendDTO.setCbid(item.getCbid());
             appealSendDTO.setJzrq(getData());
+            appealSendDTO.setSqid(item.getSqid());
             String result = pushToCityGridServiceImpl.sendUpdateAgain(appealSendDTO);
             JSONObject res = JSONObject.parseObject(result);
             if (NumConstant.ZERO_STR.equals(res.get("code").toString())) {
                 // 告知市里然后更改状态
                 itemHotlineEntity.setCbYgzFlag("1");
+                itemHotlineEntity.setYgzFlag("1");
                 baseDao.updateById(itemHotlineEntity);
             }
             // 保存附件

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/controller/ItemController.java

@@ -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<String, Object> params, HttpServletResponse response) throws IOException {
         ExcelWriter excelWriter = null;
         String name = "诉求列表";
-        if (params.get("appealType")!=null){
+        if (params.get("appealType") != null) {
-            if (params.get("appealType").toString().equals("0")){
+            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 = "执法诉求列表";
             }
         }
@@ -480,7 +480,7 @@ public class ItemController {
             List<ItemAppealExcel> list = ConvertUtils.sourceToTarget(itemService.exportList(params), ItemAppealExcel.class);
             excelWriter.write(list, writeSheet);
         } catch (Exception e) {
-            log.error(name+"export exception", e);
+            log.error(name + "export exception", e);
         } finally {
             if (excelWriter != null) {
                 excelWriter.finish();
@@ -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
-     *
-     * @param formDTO
      * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @author zhy
+     * @description: 2.32热线数据评价接口–2024-06新增
-     * @date 2022/10/21 16:13
+     * @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
      */
@@ -755,6 +755,7 @@ 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,66 +779,63 @@ public class ItemController {
 
 
     /**
-     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @description: S诉求申诉列表
      * @author qushutong
      * @date 2023/9/4 14:02
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Version1.0
      **/
     @PostMapping("closedPage")
-    public Result closedPage(@RequestParam Map<String, Object> params){
+    public Result closedPage(@RequestParam Map<String, Object> 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<java.util.List   <   com.elink.esua.epdc.dto.item.result.ItemToEpmetDTO>>
      * @description: 产品调用当天
      * @author qushutong
      * @date 2023/10/25 10:53
-     * @param  ’startTime endTime deptName
-     * @return  com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.item.result.ItemToEpmetDTO>>
      * @Version1.0
      **/
     @GetMapping("getItemList")
-    public Result<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params){
+    public Result<List<ItemToEpmetDTO>> getItemList(@RequestParam Map<String, Object> params) {
-        log.info("产品调用"+params.toString());
+        log.info("产品调用" + params.toString());
         Result<List<ItemToEpmetDTO>> 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 :
+     * @Description: 获取12345列表数据
      * @Return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List       <       com.elink.esua.epdc.modules.events.entity.ItemHotlineEntity>>
      * @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<java.lang.Boolean>
      * @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<java.lang.Boolean>
      * @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<java.lang.Boolean>
      * @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<java.lang.Boolean>
      * @Author: lichao
      * @Date: 2024/6/28 13:39
@@ -900,16 +898,15 @@ public class ItemController {
 
 
     /**
-     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @description: 事件回退到区中心用于驳回市里
      * @author qushutong
      * @date 2024/8/20 13:52
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
      * @Version1.0
      **/
     @PostMapping("backItem")
-    public  Result backItem(@RequestBody ItemDTO dto){
+    public Result backItem(@RequestBody ItemDTO dto) {
         itemService.backItem(dto);
 
         return new Result();

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;
     }