diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml index d708ef7..127042f 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/dao/mapping/HuzhouProjectinfoMapper.xml @@ -563,7 +563,7 @@ order by create_date desc \ No newline at end of file diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java index cd6e11e..6963b7e 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouPlaninfoServiceImpl.java @@ -858,6 +858,10 @@ public class HuzhouPlaninfoServiceImpl extends ServiceImpl infoPageList = projectinfoService.getProjectInfoAndChildPageList(projectinfo, pageNo, pageSize,newStage); return infoPageList; diff --git a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java index 0e4c16d..d082084 100644 --- a/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java +++ b/huzhou/src/main/java/com/easy/admin/modules/huzhou/service/impl/HuzhouProjectinfoServiceImpl.java @@ -1595,6 +1595,9 @@ public class HuzhouProjectinfoServiceImpl extends ServiceImpl> groupedRecords = new HashMap<>(); groupedRecords.put("市卫健委", records.stream().filter(r -> shiweiJianwei.contains(r.getDutyWorkplace())).collect(Collectors.toList())); groupedRecords.put("市级医院", records.stream().filter(r -> shijiYiyuan.contains(r.getDutyWorkplace())).collect(Collectors.toList()));