diff --git a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml b/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml index 46ab0f799..bac8043e0 100644 --- a/esua-epdc/epdc-admin/epdc-admin-server/src/main/resources/mapper/SysDeptDao.xml +++ b/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, diff --git a/esua-epdc/epdc-cloud-commons-shibei b/esua-epdc/epdc-cloud-commons-shibei index 568a831e4..6e58e092f 160000 --- a/esua-epdc/epdc-cloud-commons-shibei +++ b/esua-epdc/epdc-cloud-commons-shibei @@ -1 +1 @@ -Subproject commit 568a831e4f4cd768f06bea9442509272fdc3d99d +Subproject commit 6e58e092f0001b2a8f5bd5e1d08bf95136781f35 diff --git a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java b/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java index 6fd5270d6..cd238210f 100644 --- a/esua-epdc/epdc-module/epdc-events/epdc-events-client/src/main/java/com/elink/esua/epdc/dto/item/result/ItemAppealPageResultDTO.java +++ b/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执法诉求 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 ea5b75fc5..bc04c7c71 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 @@ -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 { * @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 listItemHandleDept(); + } 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 1f5158890..212c149ed 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 @@ -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 implem } IPage page = getPage(params); List list = baseDao.getItemAppealPage(params); + Map 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 implem } } + /** + * 处理中流程的当前处理部门 + * + * @param + * @return java.util.List + * @author zhy + * @date 2022/9/23 15:44 + */ + private Map listItemHandleDept() { + List list = baseDao.listItemHandleDept(); + if (list.isEmpty()) { + return new HashMap<>(); + } + return list.stream().collect(Collectors.toMap(ItemHandleProcessDTO::getItemId, ItemHandleProcessDTO::getHandlerDeptId, (key1, key2) -> key2)); + } + + } 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 53cca3192..2a86abf57 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 @@ -1937,4 +1937,38 @@ ORDER BY CREATED_TIME ASC LIMIT 1 + + + + +