诉求申诉+ 申诉审核

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/ItemDTO.java

@@ -277,4 +277,16 @@ public class ItemDTO implements Serializable {
 
 
     private String backItemResult;
+
+    private String jjqk;
+    private Integer pjjg;
+
+    // 审核结果
+    private String shjg;
+    // 处理时间
+    private String clsj;
+    // 审核意见
+    private String shyj;
+    private Integer appealFlag;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/AppealResultDTO.java

@@ -0,0 +1,44 @@
+package com.elink.esua.epdc.dto.item.result;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ *
+ * @description: 诉求申诉结果
+ * @author qushutong
+ * @date 2024/11/13 10:23
+ * @param
+ * @return
+ * @Version1.0
+ **/
+@NoArgsConstructor
+@Data
+public class AppealResultDTO {
+
+    private static final long serialVersionUID = 6430172710732648497L;
+    /**
+     * clrId : 处理人唯一标识
+     * cldw : 处理单位
+     * pjjg : 01
+     * shyj : 审核意见
+     * cldwId : 处理单位唯一标识
+     * shjg : 01
+     * clr : 处理人
+     * jjqk : 01
+     * sqid :  e2d096bd7e62462ebc28bb89bde737c0
+     * clsj : 处理时间
+     */
+    private String clrId;
+    private String cldw;
+    private String pjjg;
+    private String shyj;
+    private String cldwId;
+    private String shjg;
+    private String clr;
+    private String jjqk;
+    private String sqid;
+    private String clsj;
+
+
+}

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

@@ -927,6 +927,22 @@ public class ItemController {
         return itemService.getDissatisfied(params);
     }
 
+    /**
+     *
+     * @description:  市级青诉即办平台审核诉求申诉申请的处置结果。
+     * @author qushutong
+     * @date 2024/11/13 15:24
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Version1.0
+     **/
+    @PostMapping("case/backAudit")
+    public Result backAudit(@RequestBody AppealResultDTO resultDTO){
+        itemService.backAudit(resultDTO);
+
+        return new Result();
+
+    }
 
 }
 

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/entity/ItemEntity.java

@@ -304,4 +304,15 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private Integer evaluationSystemFlag;
 
+
+    private String jjqk;
+    private Integer pjjg;
+    // 审核结果
+    private String shjg;
+    // 处理时间
+    private String clsj;
+    // 审核意见
+    private String shyj;
+    private Integer appealFlag;
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/ItemService.java

@@ -867,4 +867,6 @@ public interface ItemService extends BaseService<ItemEntity> {
     void backItem(ItemDTO dto);
 
     Result<PageData<ItemDTO>> getDissatisfied( Map<String, Object> params);
+
+    void backAudit(AppealResultDTO resultDTO);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/PushToCityGridService.java

@@ -274,7 +274,7 @@ public interface PushToCityGridService {
     /**
      * 诉求申诉
      */
-    void appeal(AppealFormDTO appealFormDTO);
+    String appeal(AppealFormDTO appealFormDTO);
 
 
 
@@ -351,10 +351,6 @@ public interface PushToCityGridService {
     List<HotLineBackResultData>  hotLineBackResult();
 
 
-
-
-
-
     /**
      *
      * @description: 2.39设置诉求最终办理结果已接收接口–2024-10新增
@@ -366,4 +362,8 @@ public interface PushToCityGridService {
      **/
     String updateBackResult(UpdateAppealSendDTO dto);
 
+
+
+
+
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java

@@ -6236,7 +6236,20 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         appealFormDTO.setShjg(appealAuditFormDTO.getShjg());
         appealFormDTO.setSqid(appealAuditFormDTO.getSqid());
         appealFormDTO.setSsyy(appealAuditFormDTO.getSsyy());
-        pushToCityGridServiceImpl.appeal(appealFormDTO);
+        String appeal = pushToCityGridServiceImpl.appeal(appealFormDTO);
+        if (NumConstant.ZERO_STR.equals(JSONObject.parseObject(appeal).get("code").toString())) {
+            itemDTO.setJjqk(appealAuditFormDTO.getJjqk());
+            if("01".equals(appealAuditFormDTO.getPjjg())){
+                itemDTO.setPjjg(2);
+            }else if("03".equals(appealAuditFormDTO.getPjjg())){
+                itemDTO.setPjjg(0);
+            }else{
+                itemDTO.setPjjg(1);
+            }
+            itemDTO.setAppealFlag(1);
+            ItemEntity itemEntity = ConvertUtils.sourceToTarget(itemDTO, ItemEntity.class);
+            baseDao.updateById(itemEntity);
+        }
         return new Result();
     }
 
@@ -7317,4 +7330,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         PageData<ItemDTO> itemDTOPageData = new PageData<>(list, page.getTotal());
         return new Result<PageData<ItemDTO>>().ok(itemDTOPageData);
     }
+
+    @Override
+    public void backAudit(AppealResultDTO resultDTO) {
+        ItemEntity item = baseDao.getItemBySqid(resultDTO.getSqid());
+        item.setShjg(resultDTO.getShjg());
+        item.setClsj(resultDTO.getClsj());
+        item.setShyj(resultDTO.getShyj());
+        if("01".equals(resultDTO.getShjg())){
+            item.setSolutionInfo(item.getJjqk());
+            item.setEvaluationScore(item.getPjjg());
+        }
+        baseDao.updateById(item);
+    }
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/PushToCityGridServiceImpl.java

@@ -1596,10 +1596,12 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
 
 
     @Override
-    public void appeal(AppealFormDTO appealFormDTO) {
+    public String appeal(AppealFormDTO appealFormDTO) {
 
         String result = cityGridApi.sendItemToCity(appealFormDTO, PushToCityGridConstant.APPEAL, "诉求申诉");
         saveLog(appealFormDTO.getCzr().getId(), "", "诉求申诉", PushToCityGridConstant.APPEAL, JSONObject.toJSONString(appealFormDTO), result);
+
+        return  result;
     }