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 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 { EleEpdPqdListVO vo = new EleEpdPqdListVO(); vo.setDataType(temp.getId()); + vo.setSort(temp.getSort()); List collect2 = result.stream().filter(csStatisticalSetPO -> Objects.equals(csStatisticalSetPO.getStatisicalId(), temp.getId())).collect(Collectors.toList()); List eleEpdPqds = new ArrayList<>(); if (!CollectionUtil.isEmpty(collect2)) {