From 054fa20bab50520905f1c42dc4af38d491f8f6e2 Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Wed, 23 Oct 2024 19:39:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0sort=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/njcn/system/pojo/vo/EleEpdPqdListVO.java  | 2 ++
 .../njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java | 1 +
 2 files changed, 3 insertions(+)

diff --git a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdListVO.java b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdListVO.java
index 6f368b076..f564b7b6a 100644
--- a/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdListVO.java
+++ b/pqs-system/system-api/src/main/java/com/njcn/system/pojo/vo/EleEpdPqdListVO.java
@@ -21,6 +21,8 @@ public class EleEpdPqdListVO implements Serializable {
 
     private String dataTypeName;
 
+    private Integer sort;
+
     private List<EleEpdPqd> eleEpdPqdVOS;
 
 
diff --git a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java
index 1cb4c617b..b8db31b19 100644
--- a/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java
+++ b/pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/CsStatisticalSetPOServiceImpl.java
@@ -76,6 +76,7 @@ public class CsStatisticalSetPOServiceImpl extends MppServiceImpl<CsStatisticalS
             dictTreeVOS.forEach(temp -> {
                 EleEpdPqdListVO vo = new EleEpdPqdListVO();
                 vo.setDataType(temp.getId());
+                vo.setSort(temp.getSort());
                 List<CsStatisticalSetPO> collect2 = result.stream().filter(csStatisticalSetPO -> Objects.equals(csStatisticalSetPO.getStatisicalId(), temp.getId())).collect(Collectors.toList());
                 List<EleEpdPqd> eleEpdPqds = new ArrayList<>();
                 if (!CollectionUtil.isEmpty(collect2)) {