补充sqid，controller测试

esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/ItemFeignClient.java

@@ -147,3 +147,4 @@ public interface ItemFeignClient {
     @PostMapping(value = "events/shareenterprise/company", consumes = MediaType.APPLICATION_JSON_VALUE)
     Result<PageData<ShareEnterpriseDTO>> getCompany(ShareEnterpriseFormDTO formDTO);
 }
+

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

@@ -0,0 +1,84 @@
+package com.elink.esua.epdc.modules.item.controller;
+
+import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.modules.item.service.PushToCityGridService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.management.relation.RelationSupport;
+
+@RestController
+@RequestMapping("PushToCity")
+public class PushToCityGridController {
+
+    @Autowired
+    private PushToCityGridService pushToCityGridService;
+
+    /**
+     * 诉求结案
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/9/20 10:47
+     */
+    @PostMapping("caseClosed")
+    public Result Closed(){
+        return pushToCityGridService.caseClosedSentoCity();
+    }
+
+    /**
+     * 派遣审核
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/9/20 10:48
+     */
+    @PostMapping("DispatchAudit")
+    public Result DispatchAudit(){
+        return pushToCityGridService.DispatchAudit();
+    }
+
+    /**
+     * 诉求上报
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/9/20 10:48
+     */
+    @PostMapping("AppealReporting")
+    public Result AppealReporting(){
+        return pushToCityGridService.AppealReporting();
+    }
+
+    /**
+     * 上报驳回
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/9/20 10:52
+     */
+    @PostMapping("ReportRejection")
+    public Result ReportRejection(){
+        return pushToCityGridService.ReportRejection();
+    }
+
+    /**
+     * 诉求处理
+     *
+     * @param
+     * @return com.elink.esua.epdc.commons.tools.utils.Result
+     * @author LZN
+     * @date 2022/9/20 10:53
+     */
+    @PostMapping("AppealHandling")
+    public Result AppealHandling(){
+        return pushToCityGridService.AppealHandling();
+    }
+}

esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemHandleProcessDao.java

@@ -73,7 +73,7 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
      * @author LZN
      * @date 2022/9/16 15:11
      */
-    List<ItemHandleProcessCaseClosedToCityDTO> getHandler(Integer isPartyMember);
+    List<ItemHandleProcessCaseClosedToCityDTO> getHandler(@Param("state") Integer isPartyMember);
 
 
     /**

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

@@ -18,6 +18,8 @@
 package com.elink.esua.epdc.modules.item.service;
 
 
+import com.elink.esua.epdc.commons.tools.utils.Result;
+
 /**
  * 青岛市青诉即办平台接入
  *
@@ -28,9 +30,9 @@ public interface PushToCityGridService {
 
     /**
      * 诉求结案
-     * @param isPartyMember
+     * @param
      */
-    void caseClosedSentoCity(Integer isPartyMember);
+    Result caseClosedSentoCity();
 
     /**
      * 诉求派遣
@@ -64,7 +66,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 9:44
      */
-    void DispatchAudit();
+    Result DispatchAudit();
 
     /**
      * 吹哨上报
@@ -104,7 +106,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:22
      */
-    void AppealReporting();
+    Result AppealReporting();
 
     /**
      * 事件感知
@@ -124,7 +126,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 10:43
      */
-    void ReportRejection();
+    Result ReportRejection();
 
     /**
      * 诉求处理
@@ -134,7 +136,7 @@ public interface PushToCityGridService {
      * @author LZN
      * @date 2022/9/19 11:01
      */
-    void AppealHandling();
+    Result AppealHandling();
 
     /**
      * 2.8 诉求退件

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

@@ -22,6 +22,7 @@ import com.elink.esua.epdc.commons.tools.enums.CityPushEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushLinkEnum;
 import com.elink.esua.epdc.commons.tools.enums.CityPushStateEnum;
 import com.elink.esua.epdc.commons.tools.utils.DateUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.constant.PushToCityGridConstant;
 import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
@@ -129,14 +130,14 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     /**
      * 诉求结案
      *
-     * @param isPartyMember
+     * @param
      * @return void
      * @author LZN
      * @date 2022/9/16 14:45
      */
     @Override
-    public void caseClosedSentoCity(Integer isPartyMember) {
+    public Result caseClosedSentoCity() {
-        isPartyMember = ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue();
+        int isPartyMember = ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue();
         List<ItemHandleProcessCaseClosedToCityDTO> itemProcessDto = itemHandleProcessDao.getHandler(isPartyMember);
 
         // 组装数据(未完成) todo
@@ -163,6 +164,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setCzr(czr);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.CASE_CLOSED,"诉求结案");
         }
+        return new Result();
     }
 
     @Override
@@ -224,8 +226,8 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 9:44
      */
     @Override
-    public void DispatchAudit() {
+    public Result DispatchAudit() {
-        String state = "11";
+        String state = "1001";
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getDispatchAudit(state);
 
         // 添加值 todo
@@ -254,6 +256,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.DISP_ATCH_AUDIT,"派遣审核");
         }
+        return new Result();
     }
 
     @Override
@@ -311,7 +314,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:22
      */
     @Override
-    public void AppealReporting() {
+    public Result AppealReporting() {
         int state = ItemGridPlatformHandleStatusEnum.HANDLE_SB.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getAppealReporting(state);
 
@@ -340,6 +343,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.APPEAL_REPORT,"诉求上报");
         }
+        return new Result();
     }
 
     /**
@@ -351,7 +355,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 10:44
      */
     @Override
-    public void ReportRejection() {
+    public Result ReportRejection() {
         int state = ItemGridPlatformHandleStatusEnum.HANDLE_BH.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getReportRejection(state);
 
@@ -380,6 +384,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.REPORT_REBUT,"上报驳回");
         }
+        return new Result();
     }
 
     /**
@@ -391,7 +396,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
      * @date 2022/9/19 11:02
      */
     @Override
-    public void AppealHandling() {
+    public Result AppealHandling() {
         int state = ItemGridPlatformHandleStatusEnum.HANDLE_BL.getValue();
         List<ItemHandleProcessToCityResultDTO> list = itemHandleProcessDao.getAppealHandling(state);
 
@@ -437,6 +442,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             data.setCzr(dto);
             cityGridApi.sendItemToCity(data,PushToCityGridConstant.HANDLE,"诉求处理");
         }
+        return new Result();
     }
 
     @Override

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

@@ -22,13 +22,14 @@
     </select>
     <select id="getHandler" resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessCaseClosedToCityDTO">
         select
-            process.*,
+            process.*
         from
             epdc_item_handle_process process
         where
-            process.STATE = #{stat}
+            process.STATE = #{state}
         and
             process.del_flag = 0
+        and process.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
     </select>
     <select id="getProcessListByState" resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
         select
@@ -72,6 +73,7 @@
             p.del_flag = 0
         and
             p.state = #{state}
+        and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
     </select>
     <select id="getAppealReporting"
             resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
@@ -83,6 +85,7 @@
             p.del_flag = 0
         and
             p.state = #{state}
+        and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
     </select>
     <select id="getReportRejection"
             resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
@@ -94,6 +97,7 @@
             p.del_flag = 0
         and
             p.state = #{state}
+        and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
     </select>
     <select id="getAppealHandling"
             resultType="com.elink.esua.epdc.dto.item.result.ItemHandleProcessToCityResultDTO">
@@ -105,6 +109,7 @@
             p.del_flag = 0
         and
             p.state = #{state}
+        and p.item_id in (select id from epdc_item where del_flag = '0' and sqid is not null)
     </select>
     <select id="getURL" resultType="java.lang.String">
         SELECT