zouxuan 5 년 전
부모
커밋
4fa9b5ddcd

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/StudentManageCourseListDto.java

@@ -38,6 +38,17 @@ public class StudentManageCourseListDto {
     @ApiModelProperty(value = "当前课时",required = false)
     private Integer currentCLassTimes;
 
+    @ApiModelProperty(value = "总课时",required = false)
+    private Integer totalClassTimes;
+
+    public Integer getTotalClassTimes() {
+        return totalClassTimes;
+    }
+
+    public void setTotalClassTimes(Integer totalClassTimes) {
+        this.totalClassTimes = totalClassTimes;
+    }
+
     public Integer getCurrentCLassTimes() {
         return currentCLassTimes;
     }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/StudentManageDao.xml

@@ -22,6 +22,7 @@
         <result property="courseStatus" column="course_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result property="teacherName" column="teacher_name_" />
         <result property="currentCLassTimes" column="current_class_times_" />
+        <result property="totalClassTimes" column="total_class_times_" />
         <result property="attendanceStatus" column="status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
 
@@ -265,7 +266,8 @@
             CONCAT(cs.class_date_," ",cs.start_class_time_) course_date_,
             su.real_name_ teacher_name_,
             sa.status_,
-            sa.current_class_times_
+            sa.current_class_times_,
+            cg.total_class_times_
         FROM
             student_attendance sa
             LEFT JOIN class_group cg ON sa.class_group_id_=cg.id_

+ 1 - 1
mec-biz/src/main/resources/config/mybatis/TeacherAttendanceMapper.xml

@@ -165,7 +165,7 @@
             teacher_attendance ta
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
         <include refid="queryCondition"/>
-        ORDER BY class_date_ DESC
+        ORDER BY cs.class_date_ DESC,cs.start_class_time_ DESC
         <include refid="global.limit"/>
     </select>