From b8f6a68dd3e294b4d3751c87b05e4d4987596f9b Mon Sep 17 00:00:00 2001
From: wanggongfeng <1305282856@qq.com>
Date: Wed, 12 Oct 2022 11:00:37 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BD=91=E6=A0=BC=E5=8C=96?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0=E6=8B=89=E5=85=A5=E7=9A=84=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AF=BC=E8=87=B4=E7=9A=84=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E8=AF=A6=E6=83=85=E5=A4=8D=E6=98=BE=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/modules/item/dao/ItemDao.java |  2 ++
 .../modules/item/service/impl/ItemServiceImpl.java    | 11 +++++++++--
 .../src/main/resources/mapper/item/ItemDao.xml        | 11 +++++++++++
 3 files changed, 22 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 0abe152c5..6925e70b1 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
@@ -186,6 +186,8 @@ public interface ItemDao extends BaseDao<ItemEntity> {
      * @Date: 2019/9/16 10:11
      */
     ItemDetailForPCEndResultDTO selectOneOfItemDetailForPCEnd(String itemId);
+    ItemDetailForPCEndResultDTO getHandlerDeptIdByItemId(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 3444e7c2e..5a0c927af 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
@@ -941,10 +941,17 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         List<IssueProgressResultDTO> issueProgressResultDTOS = issueService.listIssueProgress(entity.getIssueId());
         resultDTO.setIssueProgressResultDTOS(issueProgressResultDTOS);
 
-        // todo
+        // 处理详情获取存在多条1065的作物数据情况
+        Long handlerDeptId = 0L;
+        if(resultDTO.getHandlerDeptId() == 0){
+            ItemDetailForPCEndResultDTO byItemId = baseDao.getHandlerDeptIdByItemId(id);
+            handlerDeptId = byItemId.getHandlerDeptId();
+        }else{
+            handlerDeptId = resultDTO.getHandlerDeptId();
+        }
 
         // 根据操作人部门，获取上一级部门ID
-        Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(resultDTO.getHandlerDeptId());
+        Result<SysDeptDTO> sysDeptInfo = adminFeignClient.getSysDeptInfo(handlerDeptId);
         if (sysDeptInfo.success()) {
             SysDeptDTO sysDeptDTO = sysDeptInfo.getData();
 
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 b68068dcb..aadc7e767 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
@@ -1057,6 +1057,17 @@
             item.DEL_FLAG = '0'
             AND item.ID = #{itemId}
     </select>
+    <select id="getHandlerDeptIdByItemId" resultType="com.elink.esua.epdc.dto.item.result.ItemDetailForPCEndResultDTO">
+        SELECT
+            ID,
+            HANDLER_DEPT_ID
+        FROM epdc_item_handle_process
+        where DEL_FLAG = '0'
+        and HANDLER_DEPT != '网格化平台'
+        and  ITEM_ID = #{itemId}
+        order by CREATED_TIME desc
+        LIMIT 1
+    </select>
     <select id="selectOneOfItemDetailForWork" resultMap="itemDetailMap">
         SELECT
             item.ID,