2023年11月10日 修改判断是否上课的问题
This commit is contained in:
parent
041441b5ff
commit
54646bf0b2
|
@ -110,7 +110,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
|||
String nowTimeStr = starTime.toString("HHmm");
|
||||
int nowTimeNum = Integer.parseInt(nowTimeStr);
|
||||
|
||||
DateTime nowPlus30Time = DateUtil.offset(starTime,DateField.MINUTE,30);//提前30分钟
|
||||
DateTime nowPlus30Time = DateUtil.offset(starTime,DateField.MINUTE,-30);//提前30分钟
|
||||
String nowPlus30TimeStr = nowPlus30Time.toString("HHmm");
|
||||
int nowPlus30TimeNum = Integer.parseInt(nowPlus30TimeStr);
|
||||
starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
|
||||
|
@ -146,7 +146,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
|||
jieciIntTime.setKsTime(Integer.parseInt(x.getHhks()));
|
||||
jieciIntTime.setJsTime(Integer.parseInt(x.getHhjs()));
|
||||
|
||||
if(jieciIntTime.getKsTime() <= nowTimeNum && nowPlus30TimeNum <= jieciIntTime.getJsTime()){
|
||||
if(jieciIntTime.getKsTime() <= nowPlus30TimeNum && nowTimeNum <= jieciIntTime.getJsTime()){
|
||||
//符合当前节
|
||||
kcJieciMap.put(x.getJieci(), jieciIntTime);
|
||||
jieci.set(x.getJieci());
|
||||
|
@ -198,13 +198,14 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
|
|||
if(kcJieciMap.containsKey(x.getHh())){
|
||||
kcKetangbiaoNowSet.put(x.getJsbh(), x);
|
||||
}
|
||||
//下一节不是01、02的归类为明天的
|
||||
//下一节不是12节的是今天的下一节(34,56,78)
|
||||
if(nextKcJieciSet.contains(x.getHh()) && !StringUtils.equals(x.getHh(),"01、02")){
|
||||
kcKetangbiaoNextSet.put(x.getJsbh(), x);
|
||||
}
|
||||
});
|
||||
if(kcJieciMap.isEmpty() || kcJieciMap.containsKey("11、12")){//当前没有节次,当前匹配节次为最后一节,使用明天的课程填充进去
|
||||
nextDayKcKetangbiaoList.forEach(x -> {
|
||||
//下一节是01、02的归类为明天的
|
||||
if(StringUtils.equals(x.getHh(),"01、02")){
|
||||
kcKetangbiaoNextSet.put(x.getJsbh(), x);
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue