吹哨流程补充

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

@@ -112,5 +112,18 @@ public class ItemPendingHandleDTO implements Serializable {
      * 属事网格
      */
     private String gridName;
+    /**
+     * 诉求类型
+     */
+    private String peopleFlagName;
+    /**
+     * 项目状态
+     */
+    private String itemStateName;
+
+    /**
+     * 流程状态
+     */
+    private String processState;
 
 }

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

@@ -274,4 +274,8 @@ public class ItemEntity extends BaseEpdcEntity {
      */
     private String isDifficulty;
 
+    /**
+     * 是否市平台督办：0否1是
+     */
+    private String isWhistle;
 }

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

@@ -21,6 +21,7 @@ package com.elink.esua.epdc.modules.item.service;
 import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
+import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO;
 
 /**
  * 青岛市青诉即办平台接入
@@ -78,7 +79,7 @@ public interface PushToCityGridService {
      * @author zhy
      * @date 2022/9/19 9:51
      */
-    void appealWhistleReport(ItemDTO itemDTO);
+    void appealWhistleReport(ItemWhistle2GovFormDTO itemDTO);
 
     /**
      * 吹哨驳回

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

@@ -4085,6 +4085,9 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if (item == null) {
             return new Result().error("未查到相关项目，项目ID：" + formDTO.getId());
         }
+        // 吹哨上报
+        pushToCityGridService.appealWhistleReport(formDTO);
+        // 吹哨后记录流程，如果吹市中心失败，删掉流程即可正常操作
         process.setItemId(item.getId());
         process.setState(ItemHandleCategoryEnum.HANDLE_I_HANDLE_GOV_WHISTLE.getValue());
         process.setHandleAdvice(formDTO.getReason());

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

@@ -36,6 +36,7 @@ import com.elink.esua.epdc.dto.epdc.result.SysDeptAreaCodeResultDTO;
 import com.elink.esua.epdc.dto.events.PushToCityGridCaseClosedDTO;
 import com.elink.esua.epdc.dto.item.ItemDTO;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
+import com.elink.esua.epdc.dto.item.form.ItemWhistle2GovFormDTO;
 import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.enums.ItemGridPlatformHandleStatusEnum;
 import com.elink.esua.epdc.gird.city.api.CityGridApi;
@@ -292,7 +293,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
     }
 
     @Override
-    public void appealWhistleReport(ItemDTO itemDTO) {
+    public void appealWhistleReport(ItemWhistle2GovFormDTO itemDTO) {
         if (null != itemDTO && StringUtils.isNotBlank(itemDTO.getId())) {
             ItemDTO itemEntity = itemService.get(itemDTO.getId());
             AppealWhistleReportResultDTO dto = new AppealWhistleReportResultDTO();
@@ -300,7 +301,6 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             dto.setSqid(getSqid(itemEntity.getSqid()));
             dto.setJjcd(CityPushEnum.JJCD_YB.getCode());
             dto.setSqly(CityPushEnum.SQLY_WX.getCode());
-            // todo
             dto.setSqlx(itemEntity.getCategoryCodeOrigin());
             dto.setSbqs(CityPushEnum.SBQS_SB.getCode());
             dto.setSqrlxfs(itemEntity.getMobile());
@@ -312,7 +312,7 @@ public class PushToCityGridServiceImpl implements PushToCityGridService {
             if (!list.isEmpty()) {
                 dto.setSqzp(list.stream().map(ImgEntity::getImgUrl).collect(Collectors.joining(",")));
             }
-            dto.setSbsm("");
+            dto.setSbsm(itemDTO.getReason());
             // 组装好直接推送
             String result = cityGridApi.sendItemToCity(dto, PushToCityGridConstant.APPEAL_WHISTLE_REPORT, "吹哨上报");
             saveLog(itemEntity.getId(), "", "吹哨上报", PushToCityGridConstant.APPEAL_WHISTLE_REPORT, JSONObject.toJSONString(dto), result);

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

@@ -655,7 +655,7 @@
         item.ITEM_STATE,
         item.grid AS gridName,
         CASE item.PEOPLE_FLAG WHEN '0' THEN '民生诉求' WHEN '1' THEN '发展诉求' WHEN '2' THEN '执法诉求' ELSE '' END AS peopleFlagName,
-        CASE i.ITEM_STATE WHEN '0' THEN '处理中' WHEN '10' THEN '已结案' ELSE '' END AS itemStateName,
+        CASE item.ITEM_STATE WHEN '0' THEN '处理中' WHEN '10' THEN '已结案' ELSE '' END AS itemStateName,
         SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-', 1) AS streetName,
         SUBSTRING_INDEX(REPLACE (item.parent_dept_names, '市北区委-', ''), '-' ,- 1) AS communityName,
         CASE item.EVALUATION_SCORE
@@ -690,6 +690,7 @@
             ) as remainTime,
 
         ( eve.APPROVE_NUM + eve.OPPOSE_NUM + eve.COMMENT_NUM + eve.BROWSE_NUM ) AS participantsNum,
+        process.state AS processState,
         (case when d.ID is not null then '1' else '0' end) as isDelay
         FROM epdc_item item
         LEFT JOIN epdc_events eve ON item.EVENT_ID = eve.ID AND eve.DEL_FLAG = '0'
@@ -709,11 +710,7 @@
         ) process on process.ITEM_ID = item.ID
         WHERE item.DEL_FLAG = '0'
         and (process.state is not null and process.state not in (11,15))
-        and item.IS_PEOPLE = '0'
+        and (item.IS_PEOPLE = '0' or (item.IS_PEOPLE = '1' and item.PEOPLE_FLAG = '0'))
-        <if test="itemState != null and itemState != '' and itemState == '0'">
-            and (item.EVALUATION_SCORE is null or item.EVALUATION_SCORE = '')
-        </if>
-
         <if test="typeKey != null and typeKey != '' and typeKey == 'grid_party'">
             and (process.state != 0 or process.state is null)
         </if>