|
|
@@ -4,16 +4,21 @@ import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.date.DateField;
|
|
|
import cn.hutool.core.date.DateTime;
|
|
|
import cn.hutool.core.date.DateUtil;
|
|
|
+import cn.hutool.core.util.ObjectUtil;
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
|
|
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
import com.github.yulichang.wrapper.MPJLambdaWrapper;
|
|
|
import com.xjrsoft.common.enums.TimeNumberEnum;
|
|
|
import com.xjrsoft.common.enums.TimePeriodEnum;
|
|
|
+import com.xjrsoft.common.enums.WeekEnum;
|
|
|
import com.xjrsoft.common.exception.MyException;
|
|
|
import com.xjrsoft.common.utils.VoToColumnUtil;
|
|
|
import com.xjrsoft.config.TimetableConfig;
|
|
|
+import com.xjrsoft.module.app.entity.AppPageDesign;
|
|
|
+import com.xjrsoft.module.app.vo.AppPageDesignVo;
|
|
|
import com.xjrsoft.module.base.entity.BaseClass;
|
|
|
import com.xjrsoft.module.base.entity.BaseSemester;
|
|
|
import com.xjrsoft.module.base.service.IBaseClassService;
|
|
|
@@ -112,6 +117,9 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
if (xjrUser != null) {
|
|
|
courseTable.setTeacherId(xjrUser.getId());
|
|
|
}
|
|
|
+ if (item.getWeeksCn() != null) {
|
|
|
+ courseTable.setWeeks(WeekEnum.getCode(item.getWeeksCn()));
|
|
|
+ }
|
|
|
params.add(courseTable);
|
|
|
}
|
|
|
return this.saveBatch(params);
|
|
|
@@ -119,7 +127,11 @@ public class CourseTableServiceImpl extends ServiceImpl<CourseTableMapper, Cours
|
|
|
|
|
|
@Override
|
|
|
public List<ClassListVo> classList(ClassListDto dto) {
|
|
|
- List<CourseTable> courseTables = courseTableMapper.selectList(Wrappers.<CourseTable>query().lambda().eq(CourseTable::getClassId, dto.getClassId()));
|
|
|
+ LambdaQueryWrapper<CourseTable> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(CourseTable::getClassId, dto.getClassId())
|
|
|
+ .eq(ObjectUtil.isNotEmpty(dto.getWeeks()), CourseTable::getWeeks,dto.getWeeks());
|
|
|
+
|
|
|
+ List<CourseTable> courseTables = courseTableMapper.selectList(queryWrapper);
|
|
|
|
|
|
List<ClassListVo> classListVos = BeanUtil.copyToList(courseTables, ClassListVo.class);
|
|
|
Boolean isCurrentSummer = isCurrentSummer();
|