fix 学时排序

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/vo/ClassPeriodVo.java

@@ -135,7 +135,8 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private BigDecimal performance;
 	@ApiModelProperty("排序")
 	private Integer sort;
-
+	@ApiModelProperty("课程排序")
+	private Integer courseSort;
 
 	/** 审核时间 */
 	@Excel(name = "审核照片")
@@ -162,6 +163,11 @@ public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 
 	@Override
 	public int compareTo(ClassPeriodVo o) {
-		return this.getSort() - o.getSort();
+		if(o.getCourseSort()==this.getCourseSort()){
+			return this.getSort() - o.getSort();
+		}else{
+			return this.getCourseSort() - o.getCourseSort();
+		}
+
 	}
 }

zhongzheng-system/src/main/resources/mapper/modules/grade/ClassGradeUserMapper.xml

@@ -120,6 +120,7 @@
         <result property="courseId" column="course_id"/>
         <result property="studyEndTime" column="study_end_time"/>
         <result property="durationTime" column="duration_time"/>
+        <result property="courseSort" column="course_sort"/>
     </resultMap>
 
     <resultMap type="com.zhongzheng.modules.grade.vo.ClassPeriodChapterVo" id="ClassPeriodChapterVo">
@@ -434,6 +435,7 @@
     <select id="listPeriodAudit" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultMap="ClassPeriodVo">
         SELECT
+        gc.sort as course_sort,
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
@@ -460,6 +462,7 @@
         AND cm.type=1
         UNION
         SELECT
+        gc.sort as course_sort,
         cm.sort,
         cm.menu_id as id,
         cm.course_id,
@@ -489,6 +492,7 @@
     <select id="listPeriodAuditSection" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultMap="ClassPeriodVo">
         SELECT
+        gc.sort as course_sort,
         cm.sort,
         cm.menu_id as id,
         cm.course_id,