fanxp 2 gadi atpakaļ
vecāks
revīzija
5a705b3082

+ 58 - 0
src/main/java/com/xjrsoft/common/enums/WeekEnum.java

@@ -0,0 +1,58 @@
+package com.xjrsoft.common.enums;
+
+public enum WeekEnum {
+    /**
+     * 周一
+     */
+    Monday(1, "周一"),
+
+    /**
+     * 周二
+     */
+    Tuesday(2, "周二"),
+    /**
+     * 周三
+     */
+    Wednesday(3, "周三"),
+    /**
+     * 周四
+     */
+    Thursday(4, "周四"),
+    /**
+     * 周五
+     */
+    Friday(5, "周五"),
+    /**
+     * 周六
+     */
+    Saturday(6, "周六"),
+    /**
+     * 周日
+     */
+    Sunday(0, "周日");
+
+    final int code;
+    final String value;
+
+    public int getCode() {
+        return this.code;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    WeekEnum(final int code, final String message) {
+        this.code = code;
+        this.value = message;
+    }
+
+    public static int getCode(String value) {
+        for (WeekEnum c : WeekEnum.values()) {
+            if (c.getValue().equals(value)) {
+                return c.getCode();
+            }
+        }
+        return 0;
+    }
+}

+ 3 - 0
src/main/java/com/xjrsoft/module/courseTable/dto/ClassListDto.java

@@ -12,4 +12,7 @@ public class ClassListDto {
     @ApiModelProperty("班级编号")
     @NotNull(message = "班级编号不能为空")
     private Long ClassId;
+
+    @ApiModelProperty("星期")
+    private Integer weeks;
 }

+ 13 - 1
src/main/java/com/xjrsoft/module/courseTable/service/impl/CourseTableServiceImpl.java

@@ -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();

+ 12 - 0
src/test/java/com/xjrsoft/xjrsoftboot/DateTime.java

@@ -0,0 +1,12 @@
+package com.xjrsoft.xjrsoftboot;
+
+import cn.hutool.core.date.DateUtil;
+import org.junit.jupiter.api.Test;
+
+public class DateTime {
+    @Test
+    public void DateTimeTest(){
+        cn.hutool.core.date.DateTime now = DateUtil.date();
+        System.out.println(now.dayOfWeek());
+    }
+}