fix 学时排序

zhongzheng-common/src/main/java/com/zhongzheng/common/utils/DateUtils.java

@@ -213,7 +213,7 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             minute = time / 60;
             if (minute < 60) {
                 second = time % 60;
-                timeStr = unitFormat(minute) + ":" + unitFormat(second);
+                timeStr = "00:"+unitFormat(minute) + ":" + unitFormat(second);
             } else {
                 hour = minute / 60;
                 if (hour > 99)

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -1017,6 +1017,7 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         //查找最外层课程目录 模块 章 节
         List<ClassPeriodVo> classPeriodVos = baseMapper.listPeriodAudit(bo);
         classPeriodVos.addAll(baseMapper.listPeriodAuditSection(bo));
+        Collections.sort(classPeriodVos);
         for (ClassPeriodVo classPeriodVo : classPeriodVos) {
             //为模块搜索下面的章 和节 并搜索学时记录
             if (classPeriodVo.getType() == 1){

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

@@ -18,7 +18,7 @@ import java.util.List;
  */
 @Data
 @ApiModel("学员视图对象")
-public class ClassPeriodVo {
+public class ClassPeriodVo implements Comparable<ClassPeriodVo> {
 	private static final long serialVersionUID = 1L;
 
 	/** 学员ID */
@@ -133,6 +133,8 @@ public class ClassPeriodVo {
 	@Excel(name = "分数")
 	@ApiModelProperty("分数")
 	private BigDecimal performance;
+	@ApiModelProperty("排序")
+	private Integer sort;
 
 
 	/** 审核时间 */
@@ -158,4 +160,8 @@ public class ClassPeriodVo {
 	private List<UserPeriodStatusVo> userPeriodStatusVos;
 
 
+	@Override
+	public int compareTo(ClassPeriodVo o) {
+		return this.getSort() - o.getSort();
+	}
 }

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

@@ -116,6 +116,7 @@
         <result property="status" column="status"/>
         <result property="auditTime" column="audit_time"/>
         <result property="type" column="type"/>
+        <result property="sort" column="sort"/>
         <result property="courseId" column="course_id"/>
         <result property="studyEndTime" column="study_end_time"/>
         <result property="durationTime" column="duration_time"/>
@@ -433,6 +434,7 @@
     <select id="listPeriodAudit" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultMap="ClassPeriodVo">
         SELECT
+        cm.sort,
         cm.menu_id as id,
         cm.course_id,
         (SELECT u.realname FROM `user` u where 1=1      <if test="userId != null and userId !='' ">
@@ -458,6 +460,7 @@
         AND cm.type=1
         UNION
         SELECT
+        cm.sort,
         cm.menu_id as id,
         cm.course_id,
         (SELECT u.realname FROM `user` u where 1=1  <if test="userId != null and userId !='' ">
@@ -486,6 +489,7 @@
     <select id="listPeriodAuditSection" parameterType="com.zhongzheng.modules.grade.bo.ClassGradeUserQueryBo"
             resultMap="ClassPeriodVo">
         SELECT
+        cm.sort,
         cm.menu_id as id,
         cm.course_id,
         (SELECT u.realname FROM `user` u where 1=1