北尚诉办-结案\吹哨话术调整

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

@@ -21,6 +21,7 @@ import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
 import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 项目处理流程表 项目处理流程表
@@ -53,4 +54,12 @@ public interface ItemHandleProcessDao extends BaseDao<ItemHandleProcessEntity> {
      */
     void updateDeptNameByDeptId(String newDeptName, Long deptId);
 
+    /**
+    * @describe: 查询项目的最后一次吹哨记录
+    * @author wangtong
+    * @date 2022/9/9 2:10
+    * @params [itemId]
+    * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity
+    */
+    ItemHandleProcessEntity selectByItemIdBestNew(@Param("itemId") String itemId);
 }

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

@@ -2768,12 +2768,13 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         if("0".equals(formDto.getState())){
             ItemEntity item = baseDao.selectById(itemPlat.getReferenceId());
             itemHandleProcessDto.setState(ItemGridPlatformHandleStatusEnum.HANDLE_JA.getValue());
-            ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
-            if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || 0 == firsthandleProcess.getState()){
+            //判断最后一条处理进展是吹哨还是结案，结案：取第一条处置意见；吹哨：取最后一条处置意见
+            if("1".equals(item.getPeopleFlag()) || "2".equals(item.getPeopleFlag()) || getItemIsCs(itemPlat.getReferenceId())){
                 //执法和发展填写网格化平台的意见
                 itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice());
             }else{
                 //内容组成：第一个发起结案申请+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
+                ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
                 itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile());
             }
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
@@ -2803,6 +2804,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         return new Result().ok("操作成功");
     }
 
+    /**
+    * @describe: 判断项目最后的提交网格化是不是吹哨
+    * @author wangtong
+    * @date 2022/9/9 2:08
+    * @params [itemId]
+    * @return boolean
+    */
+    private boolean getItemIsCs(String itemId) {
+        ItemHandleProcessEntity process = itemHandleProcessDao.selectByItemIdBestNew(itemId);
+        return process != null;
+    }
 
 
     /**

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

@@ -1595,9 +1595,9 @@
         SELECT *
         FROM epdc_item_handle_process
         WHERE DEL_FLAG='0'
-                    AND STATE IN (0,11)
+                    AND STATE IN 11
                     AND ITEM_ID=#{itemId}
-        ORDER BY CREATED_TIME DESC
+        ORDER BY CREATED_TIME ASC
         LIMIT 1
     </select>
 </mapper>

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

@@ -10,4 +10,14 @@
     <update id="updateDeptNameByDeptId">
         UPDATE epdc_item_handle_process SET HANDLER_DEPT = #{newDeptName}, UPDATED_TIME = NOW() WHERE HANDLER_DEPT_ID = #{deptId}
     </update>
+    <select id="selectByItemIdBestNew"
+            resultType="com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity">
+        select *
+        from epdc_item_handle_process
+        where DEL_FLAG='0'
+                    and STATE=0
+                    and item_id=#{itemId}
+        order by CREATED_TIME desc
+        limit 1
+    </select>
 </mapper>