yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年10月23日 修改11.12下一节为明天的01.02节的数据

This commit is contained in:
bai 2023-10-23 23:08:35 +08:00
parent 8791db6d85
commit e210cf8774
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java
View File

@ -121,6 +121,15 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)");
List<KcKetangbiao> kcKetangbiaoList = kcKetangbiaoService.list(ktqw);
starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天
String nowStr2 = starTime.toString("yyyy-MM-dd");
QueryWrapper<KcKetangbiao> nextDayKtqw = new QueryWrapper<>();
nextDayKtqw.eq("hh","01、02");//明天的只查01、02这个节次的
nextDayKtqw.apply("skrq >= STR_TO_DATE('"+nowStr2+"', '%Y-%m-%d')");
nextDayKtqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr2+"','%Y-%m-%d'),INTERVAL 1 DAY)");
List<KcKetangbiao> nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw);
//查询全部的教学楼
//QueryWrapper<KcKetangbiao> jxlqw = new QueryWrapper<>();
List<KcJiaoxuelouInfo> jiaoxuelouInfoList = kcJiaoxuelouInfoService.list();
@ -173,10 +182,19 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
if(kcJieciMap.containsKey(x.getHh())){
kcKetangbiaoNowSet.add(x.getJsbh());
}
if(nextKcJieciSet.contains(x.getHh())){
//下一节不是01、02的归类为明天的
if(nextKcJieciSet.contains(x.getHh()) && !StringUtils.equals(x.getHh(),"01、02")){
kcKetangbiaoNextSet.add(x.getJsbh());
}
});
if(kcJieciMap.isEmpty() || kcJieciMap.containsKey("11、12")){//当前没有节次，当前匹配节次为最后一节，使用明天的课程填充进去
nextDayKcKetangbiaoList.forEach(x -> {
if(StringUtils.equals(x.getHh(),"01、02")){
kcKetangbiaoNextSet.add(x.getJsbh());
}
});
}
//计算哪节在时间范围内