Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeCalendarDto.java

@@ -33,4 +33,17 @@ public class AddClassTimeCalendarDto implements Serializable {
     @ApiModelProperty("补课日期")
     private LocalDate replaceDate;
 
+    /**
+     * 补课课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("补课课程")
+    private  String timePeriod;
+
+    /**
+     * 覆盖方式 1:选中覆盖 0:全天覆盖
+     */
+    @ApiModelProperty("覆盖方式 1:选中覆盖 0:全天覆盖")
+    private  Integer coverType;
+
 }

src/main/java/com/xjrsoft/module/classtime/dto/AddClassTimeDeleteDto.java

@@ -48,4 +48,11 @@ public class AddClassTimeDeleteDto implements Serializable {
     @ApiModelProperty("结束日期")
     private LocalDate endDate;
 
+    /**
+     * 删除课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("删除课程")
+    private  String timePeriod;
+
 }

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeCalendar.java

@@ -83,4 +83,17 @@ public class ClassTimeCalendar implements Serializable {
 
     @ApiModelProperty("状态(0:生效 1:锁定 2:作废)")
     private Integer status;
+
+    /**
+     * 补课课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("补课课程")
+    private  String timePeriod;
+
+    /**
+     * 覆盖方式 1:选中覆盖 0:全天覆盖
+     */
+    @ApiModelProperty("覆盖方式 1:选中覆盖 0:全天覆盖")
+    private  Integer coverType;
 }

src/main/java/com/xjrsoft/module/classtime/entity/ClassTimeDelete.java

@@ -99,5 +99,12 @@ public class ClassTimeDelete implements Serializable {
     @ApiModelProperty("状态(0:生效 1:锁定 2:作废)")
     private Integer status;
 
+    /**
+     * 删除课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("删除课程")
+    private  String timePeriod;
+
 
 }

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeCalendarPageVo.java

@@ -63,5 +63,17 @@ public class ClassTimeCalendarPageVo {
 
     @ApiModelProperty("状态(0:生效 1:锁定 2:作废)")
     private Integer status;
+    /**
+     * 补课课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("补课课程")
+    private  String timePeriod;
+
+    /**
+     * 覆盖方式 1:选中覆盖 0:全天覆盖
+     */
+    @ApiModelProperty("覆盖方式 1:选中覆盖 0:全天覆盖")
+    private  Integer coverType;
 
 }

src/main/java/com/xjrsoft/module/classtime/vo/ClassTimeDeletePageVo.java

@@ -58,5 +58,11 @@ public class ClassTimeDeletePageVo {
 
     @ApiModelProperty("状态(0:生效 1:锁定 2:作废)")
     private Integer status;
+    /**
+     * 删除课程 0:上1 1:上2 2:上3 3:上4 4:下1 5:下2 6:下3 7:下4 8:晚1 9:晚2 10:晚3
+     * 多个用逗号隔开
+     */
+    @ApiModelProperty("删除课程")
+    private  String timePeriod;
 
 }

src/main/resources/mapper/classtime/ClassTimeDeleteMapper.xml

@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xjrsoft.module.classtime.mapper.ClassTimeDeleteMapper">
     <select id="getPage" parameterType="com.xjrsoft.module.classtime.dto.ClassTimeDeletePageDto" resultType="com.xjrsoft.module.classtime.vo.ClassTimeDeletePageVo">
-        SELECT t1.id, t2.name AS class_name,t3.name AS type_cn,t1.type,t4.name AS operation_user_name,t1.remark,
+        SELECT t1.id, t2.name AS class_name,t3.name AS type_cn,t1.type,t4.name AS operation_user_name,t1.remark,t1.time_period,
         t1.start_date,t1.end_date,t1.status,IFNULL(t1.modify_date,t1.create_date) AS operation_time FROM class_time_delete t1
         INNER JOIN base_class t2 ON t1.class_id = t2.id
         LEFT JOIN xjr_dictionary_detail t3 ON t1.type = t3.code