From dbf2b7ffcfd19ea72dd573bb386c0cb91aede262 Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 14 Jun 2023 23:27:30 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B46=E6=9C=8814=E6=97=A5=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcZhihuijiaoshiController.java | 31 ++++++++++++++++---
 1 file changed, 26 insertions(+), 5 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 d06cc99b..7a8c63f1 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
@@ -94,15 +94,15 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 		IPage<KcZhihuijiaoshi> pageList = kcZhihuijiaoshiService.page(page, queryWrapper);
 		//查询今天的课，
 		DateTime starTime = DateTime.now();
-		starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
 
-		String nowTimeStr = starTime.toString("HHmmss");
+		String nowTimeStr = starTime.toString("HHmm");
 		int nowTimeNum = Integer.parseInt(nowTimeStr);
+		starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
 		String nowStr = starTime.toString("yyyy-MM-dd");
 
 		QueryWrapper<KcKetangbiao> ktqw = new QueryWrapper<>();
-		ktqw.apply("sksj >= STR_TO_DATE('"+nowStr+"', '%Y-%m-%d')");
-		ktqw.apply("sksj < DATE_ADD(STR_TO_DATE('"+nowStr+"','%Y-%m-%d'),INTERVAL 1 DAY)");
+		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)");
 		List<KcKetangbiao> kcKetangbiaoList = kcKetangbiaoService.list(ktqw);
 
 		//下一节次映射表
@@ -124,6 +124,7 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 			JieciIntTime jieciIntTime = new JieciIntTime();
 			jieciIntTime.setKsTime(Integer.parseInt(x.getHhks()));
 			jieciIntTime.setJsTime(Integer.parseInt(x.getHhjs()));
+
 			if(jieciIntTime.getKsTime() <= nowTimeNum && nowTimeNum <= jieciIntTime.getJsTime()){
 				//符合当前节
 				kcJieciMap.put(x.getJieci(), jieciIntTime);
@@ -173,7 +174,27 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 		});
 		return Result.OK(pageList);
 	}
-	
+
+	 public static void main(String[] args) {
+		 DateTime starTime = DateTime.now();
+		 //starTime = DateUtil.endOfDay(starTime);//校正为今天末尾
+
+		 String nowTimeStr = starTime.toString("HHmm");
+		 int nowTimeNum = Integer.parseInt(nowTimeStr);
+
+//		 01、02, 0800, 0930
+//		 03、04, 1000, 1130
+//		 05、06, 1330, 1500
+//		 07、08, 1515, 1645
+//		 09、10, 1800, 1930
+//		 11、12, 1945, 2115
+		 //betweenStartDay >=0 && betweenEndDay <=0
+		 System.out.println(nowTimeStr);
+		 if(1945 <= nowTimeNum && nowTimeNum <= 2115){
+			 System.out.println("有效！");
+		 }
+	 }
+
 	/**
 	 *   添加
 	 *