From ca219f7c924f86e813e64fe4fb0b7e10839aca78 Mon Sep 17 00:00:00 2001 From: bai <1643359946@qq.com> Date: Mon, 6 Nov 2023 22:46:35 +0800 Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=886=E6=97=A5=20=E6=8F=90?= =?UTF-8?q?=E5=8D=87=E6=99=BA=E6=85=A7=E6=95=99=E5=AE=A4=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=AF=BE=E7=A8=8B=E6=8F=90=E5=89=8D?= =?UTF-8?q?30=E5=88=86=E9=92=9F=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/KcZhihuijiaoshiController.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) 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()){