增加显示具体的办理节点

esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml

@@ -199,6 +199,7 @@
         sd.id,
         sd.NAME,
         sd.pid,
+        sd.type_key,
         p.NAME AS parentName,
         sd.pids,
         NULL AS parentNames,

esua-epdc/epdc-cloud-commons-shibei

@@ -1 +1 @@
-Subproject commit 568a831e4f4cd768f06bea9442509272fdc3d99d
+Subproject commit 6e58e092f0001b2a8f5bd5e1d08bf95136781f35

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

@@ -56,6 +56,10 @@ public class ItemAppealPageResultDTO implements Serializable {
      */
     private String itemStateName;
 
+    /**
+     * 处理中项目当前的流转节点
+     */
+    private Long itemHandleDeptId;
 
     /**
      * 诉求分类：0民生诉求 1发展诉求 2执法诉求

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

@@ -18,6 +18,7 @@
 package com.elink.esua.epdc.modules.item.dao;
 
 import com.elink.esua.epdc.commons.mybatis.dao.BaseDao;
+import com.elink.esua.epdc.dto.item.ItemHandleProcessDTO;
 import com.elink.esua.epdc.dto.item.form.*;
 import com.elink.esua.epdc.dto.result.KpiItemTimeLimitByDeptResultDTO;
 import com.elink.esua.epdc.dto.form.KpiMetaDataOfEventsFormDTO;
@@ -442,4 +443,25 @@ public interface ItemDao extends BaseDao<ItemEntity> {
     * @return com.elink.esua.epdc.modules.item.entity.ItemHandleProcessEntity
     */
     ItemHandleProcessEntity selectFirstHandleProcessByItemId(@Param("itemId") String itemId);
+
+    /**
+     * 获取市平台诉求ID
+     *
+     * @param itemId
+     * @return java.lang.String
+     * @author zhy
+     * @date 2022/9/19 10:51
+     */
+    String getSqid(@Param("itemId") String itemId);
+
+    /**
+     * 获取市平台诉求ID
+     *
+     * @param
+     * @return java.lang.String
+     * @author zhy
+     * @date 2022/9/19 10:51
+     */
+    List<ItemHandleProcessDTO> listItemHandleDept();
+
 }

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

@@ -109,6 +109,7 @@ import org.springframework.web.bind.annotation.RequestParam;
 import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 项目表 项目表
@@ -2888,6 +2889,8 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
         IPage<ItemAppealPageResultDTO> page = getPage(params);
         List<ItemAppealPageResultDTO> list = baseDao.getItemAppealPage(params);
+        Map<String, Long> map = listItemHandleDept();
+        list.forEach(item -> item.setItemHandleDeptId(map.get(item.getId())));
         return new PageData<>(list, page.getTotal());
 
     }
@@ -3178,4 +3181,21 @@ public class ItemServiceImpl extends BaseServiceImpl<ItemDao, ItemEntity> implem
         }
     }
 
+    /**
+     * 处理中流程的当前处理部门
+     *
+     * @param
+     * @return java.util.List<com.elink.esua.epdc.dto.item.ItemHandleProcessDTO>
+     * @author zhy
+     * @date 2022/9/23 15:44
+     */
+    private Map<String, Long> listItemHandleDept() {
+        List<ItemHandleProcessDTO> list = baseDao.listItemHandleDept();
+        if (list.isEmpty()) {
+            return new HashMap<>();
+        }
+        return list.stream().collect(Collectors.toMap(ItemHandleProcessDTO::getItemId, ItemHandleProcessDTO::getHandlerDeptId, (key1, key2) -> key2));
+    }
+
+
 }

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

@@ -1937,4 +1937,38 @@
         ORDER BY CREATED_TIME ASC
         LIMIT 1
     </select>
+
+    <select id="getSqid" resultType="java.lang.String">
+        SELECT
+            SQID
+        FROM
+            epdc_item
+        WHERE
+            DEL_FLAG = '0'
+            AND id = #{itemId}
+    </select>
+
+    <select id="listItemHandleDept" resultType="com.elink.esua.epdc.dto.item.ItemHandleProcessDTO">
+        SELECT
+            b.ID,
+            b.ITEM_ID,
+            b.HANDLER_DEPT_ID,
+            b.HANDLER_DEPT,
+            b.state
+        FROM
+            epdc_item_handle_process b
+        WHERE
+                b.CREATED_TIME =(
+                SELECT
+                    max( CREATED_TIME )
+                FROM
+                    epdc_item_handle_process
+                WHERE
+                    b.ITEM_ID = ITEM_ID
+            )
+          AND b.ITEM_ID IN ( SELECT id FROM epdc_item WHERE ITEM_STATE = '0' AND DEL_FLAG = '0' AND IS_PEOPLE = '1' AND PEOPLE_FLAG = '0' )
+        GROUP BY
+            b.ITEM_ID
+    </select>
+
 </mapper>