feat:六一活动排课

mec-biz/src/main/java/com/ym/mec/biz/dal/page/StudentManageQueryInfo.java

@@ -38,6 +38,8 @@ public class StudentManageQueryInfo extends QueryInfo {
     
     private Integer teacherId;
 
+    private Integer teacherIdForOrgan;
+
     private Integer isNewUser;
 
     private Integer carePackage;
@@ -48,6 +50,14 @@ public class StudentManageQueryInfo extends QueryInfo {
 
     private String activityCourseType;
 
+    public Integer getTeacherIdForOrgan() {
+        return teacherIdForOrgan;
+    }
+
+    public void setTeacherIdForOrgan(Integer teacherIdForOrgan) {
+        this.teacherIdForOrgan = teacherIdForOrgan;
+    }
+
     public Integer getSubjectId() {
         return subjectId;
     }

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

@@ -217,7 +217,7 @@
                 AND s.come_on_package_ = #{comeOnPackage}
             </if>
             <if test="subjectId!=null">
-                AND FIND_IN_SET( #{subjectId}, stu.subject_id_list_ )
+                AND FIND_IN_SET( #{subjectId}, s.subject_id_list_ )
             </if>
             <if test="activityCourseType!=null and activityCourseType!=''">
                 AND JSON_EXTRACT(activity_course_detail_, CONCAT('$.', #{activityCourseType}))>0

mec-web/src/main/java/com/ym/mec/web/controller/education/EduStudentStudentController.java

@@ -80,8 +80,8 @@ public class EduStudentStudentController extends BaseController {
         if (sysUser == null) {
             return failed("用户信息获取失败");
         }
-        if(Objects.nonNull(queryInfo.getTeacherId())){
-            Teacher teacher = teacherService.get(queryInfo.getTeacherId());
+        if(Objects.nonNull(queryInfo.getTeacherIdForOrgan())){
+            Teacher teacher = teacherService.get(queryInfo.getTeacherIdForOrgan());
             if(Objects.isNull(teacher)){
                 return failed("教师信息不存在");
             }