he2802 3 år sedan
förälder
incheckning
9018dd7dbd

+ 1 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseServiceImpl.java

@@ -292,6 +292,7 @@ public class CourseServiceImpl extends ServiceImpl<CourseMapper, Course> impleme
             goodsUserVo.setClassStartTime(classGradeVo.getClassStartTime());
             goodsUserVo.setClassEndTime(classGradeVo.getClassEndTime());
             goodsUserVo.setPeriodStatus(classGradeVo.getPeriodStatus());
+            goodsUserVo.setClassStatus(classGradeVo.getClassStatus());
             Long secLong = 0L;
             Long studyLong = 0L;
             SubjectStudyRecordQueryBo subjectStudyRecordQueryBo = new SubjectStudyRecordQueryBo();

+ 4 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/vo/GoodsUserVo.java

@@ -318,4 +318,8 @@ public class GoodsUserVo {
 	@Excel(name = "考试日期")
 	@ApiModelProperty("考试日期")
 	private Long subApplySiteExamTime;
+	/** 开班状态 0未开班 1开班 */
+	@Excel(name = "开班状态 0未开班 1开班")
+	@ApiModelProperty("开班状态 0未开班 1开班")
+	private Integer classStatus;
 }

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/CourseChapterSectionMapper.xml

@@ -112,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cs.`status` = 1
           AND ccs.chapter_id = #{chapterId}
         ORDER BY
-            c_sort ASC
+        ccs.sort ASC
     </select>
 
     <select id="examList" parameterType="com.zhongzheng.modules.course.bo.CourseMenuQueryBo"  resultMap="CourseUserChapterSectionVo">

+ 1 - 0
zhongzheng-system/src/main/resources/mapper/modules/course/CourseMapper.xml

@@ -512,6 +512,7 @@
             cgu.grade_id,
             cg.class_start_time,
             cg.class_end_time,
+            cg.class_status,
             cg.status,
             cg.learning_status,
             cgu.period_status

+ 1 - 1
zhongzheng-system/src/main/resources/mapper/modules/course/CourseModuleChapterMapper.xml

@@ -68,7 +68,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             cc.`status` =1
 	AND cmc.module_id = #{moduleId}
         ORDER BY
-            c_sort DESC
+            cmc.sort
     </select>
 
     <select id="rebuildChapterCheck" parameterType="map"  resultType="Integer">