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 ecff2947..cedd6138 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 @@ -109,14 +109,17 @@ public class KcZhihuijiaoshiController extends JeecgController ktqw = new QueryWrapper<>(); - ktqw.apply("skrq >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')"); - ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)"); + ktqw.eq("skrq",nowStr); +// ktqw.apply("skrq >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')"); +// ktqw.apply("skrq < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)"); + ktqw.isNotNull("jsbh"); List kcKetangbiaoList = kcKetangbiaoService.list(ktqw); starTime = starTime.offset(DateField.DAY_OF_MONTH,1);//明天 @@ -124,8 +127,10 @@ public class KcZhihuijiaoshiController extends JeecgController 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)"); +// 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)"); + ktqw.eq("skrq",nowStr); + ktqw.isNotNull("jsbh"); List nextDayKcKetangbiaoList = kcKetangbiaoService.list(nextDayKtqw); //查询全部的教学楼 @@ -151,7 +156,7 @@ public class KcZhihuijiaoshiController extends JeecgController nextKcJieciSet = Sets.newHashSet(); kcJieciList.forEach(x -> { JieciIntTime jieciIntTime = new JieciIntTime(); - jieciIntTime.setKsTime(Integer.parseInt(x.getHhks())-30);//提前30分钟 + jieciIntTime.setKsTime(Integer.parseInt(x.getHhks())); jieciIntTime.setJsTime(Integer.parseInt(x.getHhjs())); if(jieciIntTime.getKsTime() <= nowTimeNum && nowTimeNum <= jieciIntTime.getJsTime()){