From 27966f1218752267190e43c1308cf617957f67db Mon Sep 17 00:00:00 2001
From: bai <1643359946@qq.com>
Date: Wed, 1 Nov 2023 00:30:36 +0800
Subject: [PATCH] =?UTF-8?q?2023=E5=B9=B411=E6=9C=881=E6=97=A5=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=E8=BF=94=E5=9B=9E=E5=BD=93=E5=89=8D=E5=92=8C=E4=B8=8B?=
 =?UTF-8?q?=E8=8A=82=E6=98=AF=E5=90=A6=E6=9C=89=E8=AF=BE=E7=9A=84=E8=AF=BE?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/KcZhihuijiaoshiController.java    | 16 +++++++++-------
 .../kc/jiaoshi/entity/KcZhihuijiaoshi.java       |  8 ++++++++
 pom.xml                                          |  8 ++++----
 3 files changed, 21 insertions(+), 11 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 8390924c..ecff2947 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
@@ -172,23 +172,23 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 		 });
 
 		 //根据节次信息包装进Map
-		 Set<String> kcKetangbiaoNowSet = Sets.newHashSet();
-		 Set<String> kcKetangbiaoNextSet = Sets.newHashSet();
+		 Map<String, String> kcKetangbiaoNowSet = Maps.newHashMap();
+		 Map<String, String> kcKetangbiaoNextSet = Maps.newHashMap();
 
 		 kcKetangbiaoList.forEach(x -> {
 			 //匹配是否在上课范围内
 			 if(kcJieciMap.containsKey(x.getHh())){
-				 kcKetangbiaoNowSet.add(x.getJsbh());
+				 kcKetangbiaoNowSet.put(x.getJsbh(), x.getId());
 			 }
 			 //下一节不是01、02的归类为明天的
 			 if(nextKcJieciSet.contains(x.getHh()) && !StringUtils.equals(x.getHh(),"01、02")){
-				 kcKetangbiaoNextSet.add(x.getJsbh());
+				 kcKetangbiaoNextSet.put(x.getJsbh(), x.getId());
 			 }
 		 });
 		 if(kcJieciMap.isEmpty() || kcJieciMap.containsKey("11、12")){//当前没有节次，当前匹配节次为最后一节，使用明天的课程填充进去
 			 nextDayKcKetangbiaoList.forEach(x -> {
 				 if(StringUtils.equals(x.getHh(),"01、02")){
-					 kcKetangbiaoNextSet.add(x.getJsbh());
+					 kcKetangbiaoNextSet.put(x.getJsbh(), x.getId());
 				 }
 			 });
 		 }
@@ -203,12 +203,14 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
 			 //kcJieciMap.containsKey(x.getHh)
 
 			 //nowTimeNum
-			 if(kcKetangbiaoNowSet.contains(x.getJsbh())){
+			 if(kcKetangbiaoNowSet.containsKey(x.getJsbh())){
 				 x.setNowIsClass(true);
+				 x.setNowIsClassId(kcKetangbiaoNowSet.get(x.getJsbh()));
 			 }
 //			 x.setNowIsClass(true);//debug
-			 if(kcKetangbiaoNextSet.contains(x.getJsbh())){
+			 if(kcKetangbiaoNextSet.containsKey(x.getJsbh())){
 				 x.setNextIsClass(true);
+				 x.setNextIsClassId(kcKetangbiaoNowSet.get(x.getJsbh()));
 			 }
 			 if(jiaoxuelouInfoMap.containsKey(x.getJxlId())){
 				 KcJiaoxuelouInfo info = jiaoxuelouInfoMap.get(x.getJxlId());
diff --git a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java
index abe55a59..45f792a2 100644
--- a/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java
+++ b/jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java
@@ -137,10 +137,18 @@ public class KcZhihuijiaoshi implements Serializable {
     @TableField(exist = false)
     private java.lang.Boolean nowIsClass;
 
+    /**当前节是否有课的课堂ID*/
+    @TableField(exist = false)
+    private java.lang.String nowIsClassId;
+
     /**下一节是否有课*/
     @TableField(exist = false)
     private java.lang.Boolean nextIsClass;
 
+    /**当前节是否有课的课堂ID*/
+    @TableField(exist = false)
+    private java.lang.String nextIsClassId;
+
     @TableField(exist = false)
     private java.lang.String jsNum;
 
diff --git a/pom.xml b/pom.xml
index 88567540..ecbf0da0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,10 +138,10 @@
 			<artifactId>pegdown</artifactId>
 			<version>${pegdown.version}</version>
 		</dependency>
-        <dependency>
-            <groupId>org.jeecgframework.boot</groupId>
-            <artifactId>jeecg-boot-base-core</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.jeecgframework.boot</groupId>-->
+<!--            <artifactId>jeecg-boot-base-core</artifactId>-->
+<!--        </dependency>-->
 
     </dependencies>