增加 街道提交申诉 区级审核，增加区级审核不通过

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

@@ -301,4 +301,20 @@ public class ItemDTO implements Serializable {
      */
     private String evaluationContent;
 
+    /**
+     * 0，街道未申诉，1街道申诉，2区坐席驳回申诉
+     */
+    private String streetAppealFlag;
+
+
+    /**
+     * 区驳回原因
+     */
+    private String districtReject;
+
+    /**
+     * 申诉材料文件链接
+     */
+    private String appealUrl;
+
 }

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

@@ -792,19 +792,6 @@ public class ItemController {
     }
 
 
-    /**
-     * @param
-     * @return com.elink.esua.epdc.commons.tools.utils.Result
-     * @description: 诉求申诉
-     * @author qushutong
-     * @date 2023/9/14 15:06
-     * @Version1.0
-     **/
-    @PostMapping("sqAppeal")
-    public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
-
-        return itemService.sqAppeal(appealAuditFormDTO);
-    }
 
     /**
      * @param ’startTime endTime deptName
@@ -914,6 +901,50 @@ public class ItemController {
     }
 
 
+
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @description: 区级诉求申诉
+     * @author qushutong
+     * @date 2023/9/14 15:06
+     * @Version1.0
+     **/
+    @PostMapping("sqAppeal")
+    public Result sqAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
+
+        return itemService.sqAppeal(appealAuditFormDTO);
+    }
+
+    /**
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @description: 街道申诉
+     * @author qushutong
+     * @date 2023/9/14 15:06
+     * @Version1.0
+     **/
+    @PostMapping("streetAppeal")
+    public Result streetAppeal(@RequestBody AppealAuditFormDTO appealAuditFormDTO) {
+
+        return itemService.streetAppeal(appealAuditFormDTO);
+    }
+    
+    /**
+     *
+     * @description: 区级驳回申诉
+     * @author qushutong
+     * @date 2024/11/26 15:09
+     * @param 
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Version1.0
+     **/
+    @PostMapping("backAppeal")
+    public Result backAppeal(@RequestBody Map<String, Object> params){
+        itemService.backAppeal(params);
+        return  new Result();
+    }
+
     /**
      * @param
      * @return com.elink.esua.epdc.commons.tools.utils.Result
@@ -927,6 +958,10 @@ public class ItemController {
         return itemService.getDissatisfied(params);
     }
     
+    
+    
+    
+
     /**
      *
      * @description:  市级青诉即办平台审核诉求申诉申请的处置结果。
@@ -944,5 +979,23 @@ public class ItemController {
 
     }
     
+    /**
+     *
+     * @description: 诉求合并申请
+     * @author qushutong
+     * @date 2024/11/26 10:35
+     * @param 
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @Version1.0
+     **/
+    @PostMapping("case/merge")
+    public Result merge(@RequestBody ToCityMergeFormDTO mergeFormDTO){
+        itemService.merge(mergeFormDTO);
+
+        return  new Result();
+    }
+    
+    
+    
 }
 

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

@@ -317,4 +317,20 @@ public class ItemEntity extends BaseEpdcEntity {
 
     private String ssyy;
 
+    /**
+     * 0，街道未申诉，1街道申诉，2区坐席驳回申诉
+     */
+    private String streetAppealFlag;
+
+
+    /**
+     * 区驳回原因
+     */
+    private String districtReject;
+
+    /**
+     * 申诉材料文件链接
+     */
+    private String appealUrl;
+
 }

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

@@ -869,4 +869,10 @@ public interface ItemService extends BaseService<ItemEntity> {
     Result<PageData<ItemDTO>> getDissatisfied( Map<String, Object> params);
 
     void backAudit(AppealResultDTO resultDTO);
+
+    void merge(ToCityMergeFormDTO mergeFormDTO);
+
+    Result streetAppeal(AppealAuditFormDTO appealAuditFormDTO);
+
+    void backAppeal(Map<String, Object> params);
 }

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml

@@ -4338,6 +4338,16 @@
             AND appeal_source != '3'
             AND DEL_FLAG = '0'
             and  ITEM_STATE = '10'
+        <if test="streetAppealFlag != null and streetAppealFlag != ''">
+            <choose>
+                <when test="streetAppealFlag == '0'">
+                    and i.STREET_APPEAL_FLAG != '2'
+                </when >
+                <when test="streetAppealFlag == '1'">
+                    and i.STREET_APPEAL_FLAG != '1'
+                </when >
+            </choose>
+        </if>
         <if test="serialNum != null and serialNum != ''">
             and i.SERIAL_NUM like CONCAT('%', #{serialNum}, '%')
         </if>