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 b57c10e5..5b20fbf3 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 @@ -21,7 +21,9 @@ import org.apache.commons.lang.StringUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.system.query.QueryGenerator; import org.jeecg.common.util.oConvertUtils; +import org.jeecg.modules.kc.jiaoshi.entity.KcJiaoxuelouInfo; import org.jeecg.modules.kc.jiaoshi.entity.KcZhihuijiaoshi; +import org.jeecg.modules.kc.jiaoshi.service.IKcJiaoxuelouInfoService; import org.jeecg.modules.kc.jiaoshi.service.IKcZhihuijiaoshiService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -76,6 +78,9 @@ public class KcZhihuijiaoshiController extends JeecgController kcKetangbiaoList = kcKetangbiaoService.list(ktqw); + //查询全部的教学楼 + //QueryWrapper jxlqw = new QueryWrapper<>(); + List jiaoxuelouInfoList = kcJiaoxuelouInfoService.list(); + + Map jiaoxuelouInfoMap = jiaoxuelouInfoList.stream().collect(Collectors.toMap(KcJiaoxuelouInfo::getId,a -> a, (a,b) -> a)); + //下一节次映射表 Map nextJcMap = Maps.newHashMap(); nextJcMap.put("01、02","03、04"); @@ -184,6 +195,10 @@ public class KcZhihuijiaoshiController extends JeecgController