yangjun
/
dbsd_kczx_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023年11月1日 新增返回当前和下节是否有课的课值

This commit is contained in:
bai 2023-11-01 00:30:36 +08:00
parent ba526028c5
commit 27966f1218
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/controller/KcZhihuijiaoshiController.java
View File

@ -172,23 +172,23 @@ public class KcZhihuijiaoshiController extends JeecgController<KcZhihuijiaoshi,
}); });
//根据节次信息包装进Map //根据节次信息包装进Map
Set<String> kcKetangbiaoNowSet = Sets.newHashSet(); Map<String, String> kcKetangbiaoNowSet = Maps.newHashMap();
Set<String> kcKetangbiaoNextSet = Sets.newHashSet(); Map<String, String> kcKetangbiaoNextSet = Maps.newHashMap();
kcKetangbiaoList.forEach(x -> { kcKetangbiaoList.forEach(x -> {
//匹配是否在上课范围内 //匹配是否在上课范围内
if(kcJieciMap.containsKey(x.getHh())){ if(kcJieciMap.containsKey(x.getHh())){
kcKetangbiaoNowSet.add(x.getJsbh()); kcKetangbiaoNowSet.put(x.getJsbh(), x.getId());
} }
//下一节不是01、02的归类为明天的 //下一节不是01、02的归类为明天的
if(nextKcJieciSet.contains(x.getHh()) && !StringUtils.equals(x.getHh(),"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")){//当前没有节次，当前匹配节次为最后一节，使用明天的课程填充进去 if(kcJieciMap.isEmpty() || kcJieciMap.containsKey("11、12")){//当前没有节次，当前匹配节次为最后一节，使用明天的课程填充进去
nextDayKcKetangbiaoList.forEach(x -> { nextDayKcKetangbiaoList.forEach(x -> {
if(StringUtils.equals(x.getHh(),"01、02")){ 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) //kcJieciMap.containsKey(x.getHh)
//nowTimeNum //nowTimeNum
if(kcKetangbiaoNowSet.contains(x.getJsbh())){ if(kcKetangbiaoNowSet.containsKey(x.getJsbh())){
x.setNowIsClass(true); x.setNowIsClass(true);
x.setNowIsClassId(kcKetangbiaoNowSet.get(x.getJsbh()));
} }
// x.setNowIsClass(true);//debug // x.setNowIsClass(true);//debug
if(kcKetangbiaoNextSet.contains(x.getJsbh())){ if(kcKetangbiaoNextSet.containsKey(x.getJsbh())){
x.setNextIsClass(true); x.setNextIsClass(true);
x.setNextIsClassId(kcKetangbiaoNowSet.get(x.getJsbh()));
} }
if(jiaoxuelouInfoMap.containsKey(x.getJxlId())){ if(jiaoxuelouInfoMap.containsKey(x.getJxlId())){
KcJiaoxuelouInfo info = jiaoxuelouInfoMap.get(x.getJxlId()); KcJiaoxuelouInfo info = jiaoxuelouInfoMap.get(x.getJxlId());

8
jeecg-module-main/src/main/java/org/jeecg/modules/kc/jiaoshi/entity/KcZhihuijiaoshi.java
View File

@ -137,10 +137,18 @@ public class KcZhihuijiaoshi implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private java.lang.Boolean nowIsClass; private java.lang.Boolean nowIsClass;
/**当前节是否有课的课堂ID*/
@TableField(exist = false)
private java.lang.String nowIsClassId;
/**下一节是否有课*/ /**下一节是否有课*/
@TableField(exist = false) @TableField(exist = false)
private java.lang.Boolean nextIsClass; private java.lang.Boolean nextIsClass;
/**当前节是否有课的课堂ID*/
@TableField(exist = false)
private java.lang.String nextIsClassId;
@TableField(exist = false) @TableField(exist = false)
private java.lang.String jsNum; private java.lang.String jsNum;

8
pom.xml
View File

@ -138,10 +138,10 @@
<artifactId>pegdown</artifactId> <artifactId>pegdown</artifactId>
<version>${pegdown.version}</version> <version>${pegdown.version}</version>
</dependency> </dependency>
<dependency> <!-- <dependency>-->
<groupId>org.jeecgframework.boot</groupId> <!-- <groupId>org.jeecgframework.boot</groupId>-->
<artifactId>jeecg-boot-base-core</artifactId> <!-- <artifactId>jeecg-boot-base-core</artifactId>-->
</dependency> <!-- </dependency>-->
</dependencies> </dependencies>