浏览代码

1、作业消息推送
2、对外课程组查看

Joburgess 5 年之前
父节点
当前提交
3b3968ecf0

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageAttendanceQueryInfo.java

@@ -1,5 +1,6 @@
 package com.ym.mec.biz.dal.page;
 
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import io.swagger.annotations.ApiModelProperty;
 
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -18,6 +19,8 @@ public class StudentManageAttendanceQueryInfo extends QueryInfo {
     @ApiModelProperty(value = "班级类型(普通班级、合奏班级、提高课班级、VIP班级)",required = true)
     private ClassGroupTypeEnum classGroupType;
 
+    private CourseSchedule.CourseScheduleType courseScheduleType;
+
     @ApiModelProperty(value = "班级名称",required = false)
     private String classGroupName;
 
@@ -38,6 +41,14 @@ public class StudentManageAttendanceQueryInfo extends QueryInfo {
         this.courseStatus = courseStatus;
     }
 
+    public CourseSchedule.CourseScheduleType getCourseScheduleType() {
+        return courseScheduleType;
+    }
+
+    public void setCourseScheduleType(CourseSchedule.CourseScheduleType courseScheduleType) {
+        this.courseScheduleType = courseScheduleType;
+    }
+
     public Integer getStudentId() {
         return studentId;
     }

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

@@ -257,12 +257,12 @@
                 AND cs.status_ = #{courseStatus}
             </if>
             <if test="classGroupType!=null">
-                AND cg.type_ = #{classGroupType}
+                AND cs.type_ = #{courseScheduleType, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
-            <if test="attendanceStatus != null and attendanceStatus != 'TRUANT'">
+            <if test="attendanceStatus != null and attendanceStatus != @com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum@TRUANT">
                 AND sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
-            <if test="attendanceStatus != null and attendanceStatus == 'TRUANT'">
+            <if test="attendanceStatus != null and attendanceStatus == @com.ym.mec.biz.dal.enums.StudentAttendanceStatusEnum@TRUANT">
                 AND (sa.status_ = #{attendanceStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} OR sa.status_ IS NULL)
             </if>
             <if test="classGroupName!=null">