From e210cf8774f16811fa31c27e1742ba6201ea2175 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Mon, 23 Oct 2023 23:08:35 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B410=E6=9C=8823=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B911.12=E4=B8=8B=E4=B8=80=E8=8A=82=E4=B8=BA=E6=98=8E?=
 =?UTF-8?q?=E5=A4=A9=E7=9A=8401.02=E8=8A=82=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcZhihuijiaoshiController.java | 20 ++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

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 5b20fbf3..8e3e79d0 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
@@ -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());
+				}
+			});
+		}
+
 
 
 		//计算哪节在时间范围内