diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java index 8390924c..ecff2947 100644 --- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java +++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java @@ -172,23 +172,23 @@ public class KcZhihuijiaoshiController extends JeecgController kcKetangbiaoNowSet = Sets.newHashSet(); - Set kcKetangbiaoNextSet = Sets.newHashSet(); + Map kcKetangbiaoNowSet = Maps.newHashMap(); + Map kcKetangbiaoNextSet = Maps.newHashMap(); kcKetangbiaoList.forEach(x -> { //匹配是否在上课范围内 if(kcJieciMap.containsKey(x.getHh())){ - kcKetangbiaoNowSet.add(x.getJsbh()); + kcKetangbiaoNowSet.put(x.getJsbh(), x.getId()); } //下一节不是01、02的归类为明天的 if(nextKcJieciSet.contains(x.getHh()) && !StringUtils.equals(x.getHh(),"01、02")){ - kcKetangbiaoNextSet.add(x.getJsbh()); + kcKetangbiaoNextSet.put(x.getJsbh(), x.getId()); } }); if(kcJieciMap.isEmpty() || kcJieciMap.containsKey("11、12")){//当前没有节次,当前匹配节次为最后一节,使用明天的课程填充进去 nextDayKcKetangbiaoList.forEach(x -> { if(StringUtils.equals(x.getHh(),"01、02")){ - kcKetangbiaoNextSet.add(x.getJsbh()); + kcKetangbiaoNextSet.put(x.getJsbh(), x.getId()); } }); } @@ -203,12 +203,14 @@ public class KcZhihuijiaoshiController extends JeecgControllerpegdown ${pegdown.version} - - org.jeecgframework.boot - jeecg-boot-base-core - + + + +