From c50859ed5513c3de13dd100b7ea535c1fcd1ce28 Mon Sep 17 00:00:00 2001
From: Jackwang <wt373747285@163.com>
Date: Thu, 8 Sep 2022 20:02:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8C=97=E5=B0=9A=E8=AF=89=E5=8A=9E-=E7=BB=93?=
 =?UTF-8?q?=E6=A1=88=E8=AF=9D=E6=9C=AF=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/modules/item/dao/ItemDao.java  | 10 ++++++++++
 .../modules/item/service/impl/ItemServiceImpl.java     |  5 +++--
 .../src/main/resources/mapper/item/ItemDao.xml         | 10 ++++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
index 5aa63737e..9e2ecc49a 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/dao/ItemDao.java
@@ -28,6 +28,7 @@ import com.elink.esua.epdc.dto.item.result.*;
 import com.elink.esua.epdc.dto.result.KpiEvaluationAmountResultDTO;
 import com.elink.esua.epdc.dto.result.KpiItemHandleAmountResultDTO;
 import com.elink.esua.epdc.modules.item.entity.ItemEntity;
+import com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -413,4 +414,13 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @params [params]
      */
     List<ItemExaminePageResultDTO> getExaminePage(Map<String, Object> params);
+
+    /**
+    * @describe: 获取项目的第一个结案申请/吹哨的意见
+    * @author wangtong
+    * @date 2022/9/8 19:54
+    * @params [itemId]
+    * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity
+    */
+    ItemHandleProcessEntity selectFirstHandleProcessByItemId(@Param("itemId") String itemId);
 }
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
index 33810b27f..c92ba3e39 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/java/com/elink/esua/epdc/modules/item/service/impl/ItemServiceImpl.java
@@ -2614,8 +2614,9 @@ 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());
-            //内容组成：推到网格化时的结案申请内容+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
-            itemHandleProcessDto.setOutHandleAdvice(formDto.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile());
+            //内容组成：第一个发起结案申请/吹哨的意见+办理人：XXX+办理电话：XXX。换行(前端处理) 感谢您的支持，“北尚诉办”全程为您服务！
+            ItemHandleProcessEntity firsthandleProcess = baseDao.selectFirstHandleProcessByItemId(itemPlat.getReferenceId());
+            itemHandleProcessDto.setOutHandleAdvice(firsthandleProcess.getHandleAdvice()+" 办理人："+item.getHandlePeopleName()+"，办理电话："+item.getHandlePeopleMobile());
             item.setItemState(ItemHandleCategoryEnum.HANDLE_CLOSING_CASE.getValue());
             updateById(item);
         }else if("1".equals(formDto.getState())){
diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
index e0f316ea6..55ea7c7c3 100755
--- a/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
+++ b/esua-epdc/epdc-module/epdc-events/epdc-events-server/src/main/resources/mapper/item/ItemDao.xml
@@ -1466,4 +1466,14 @@
         </if>
         order by i.LAST_HANDLE_TIME desc
     </select>
+    <select id="selectFirstHandleProcessByItemId"
+            resultType="com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity">
+        SELECT *
+        FROM epdc_item_handle_process
+        WHERE DEL_FLAG='0'
+                    AND STATE IN (0,11)
+                    AND ITEM_ID=#{itemId}
+        ORDER BY CREATED_TIME DESC
+        LIMIT 1
+    </select>
 </mapper>