开课增加学生编号和姓名查询

web/src/main/java/com/ibeetl/jlw/service/TeacherOpenCourseMergeStudentService.java

@@ -142,11 +142,15 @@ public class TeacherOpenCourseMergeStudentService extends CoreBaseService<Teache
     }
 
     public List<TeacherOpenCourseMergeStudent> getValuesByQuery (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
-        return teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery);
+        List<TeacherOpenCourseMergeStudent> valuesByQuery = teacherOpenCourseMergeStudentDao.getValuesByQuery(teacherOpenCourseMergeStudentQuery);
+        queryListAfter(valuesByQuery);
+        return valuesByQuery;
     }
 
     public List<TeacherOpenCourseMergeStudent> getValuesByQueryNotWithPermission (TeacherOpenCourseMergeStudentQuery teacherOpenCourseMergeStudentQuery){
-        return teacherOpenCourseMergeStudentDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeStudentQuery);
+        List<TeacherOpenCourseMergeStudent> valuesByQueryNotWithPermission = teacherOpenCourseMergeStudentDao.getValuesByQueryNotWithPermission(teacherOpenCourseMergeStudentQuery);
+        queryListAfter(valuesByQueryNotWithPermission);
+        return valuesByQueryNotWithPermission;
     }
 
     public TeacherOpenCourseMergeStudent getInfo (Long teacherOpenCourseSchoolClassMergeStudentId){

web/src/main/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentController.java

@@ -77,7 +77,7 @@ public class TeacherOpenCourseMergeStudentController{
         if(null == coreUser){
             return JsonResult.failMessage("请登录后再操作");
         }else{
-            List<TeacherOpenCourseMergeStudent>list = teacherOpenCourseMergeStudentService.getValuesByQuery(param);
+            List<TeacherOpenCourseMergeStudent>list = teacherOpenCourseMergeStudentService.getValuesByQueryNotWithPermission(param);
             return  JsonResult.success(list);
         }
     }

web/src/main/java/com/ibeetl/jlw/web/query/TeacherOpenCourseMergeStudentQuery.java

@@ -34,7 +34,15 @@ public class TeacherOpenCourseMergeStudentQuery extends PageParam {
     @Query(name = "用户ID", display = false)
     private Long userId;
 
+    // 学生学号或者姓名
+    private String studentSnOrName;
+
+    // 班级集合
+
+    private String schoolClassIdPlural;
+
     private String teacherOpenCourseSchoolClassMergeStudentIdPlural;
+
     private String teacherOpenCourseIdPlural;
     private String studentIdPlural;
     private String orgIdPlural;
@@ -157,4 +165,20 @@ private String teacherOpenCourseSchoolClassMergeStudentStatusPlural;
     public String getTeacherOpenCourseSchoolClassMergeStudentStatusPlural() {
         return teacherOpenCourseSchoolClassMergeStudentStatusPlural;
     }
+
+    public String getStudentSnOrName() {
+        return studentSnOrName;
+    }
+
+    public void setStudentSnOrName(String studentSnOrName) {
+        this.studentSnOrName = studentSnOrName;
+    }
+
+    public String getSchoolClassIdPlural() {
+        return schoolClassIdPlural;
+    }
+
+    public void setSchoolClassIdPlural(String schoolClassIdPlural) {
+        this.schoolClassIdPlural = schoolClassIdPlural;
+    }
 }

web/src/main/resources/sql/jlw/teacherOpenCourseMergeSchoolClass.md

@@ -210,7 +210,7 @@ getValuesByQuery
 
   select t.*
   from teacher_open_course_merge_school_class t
-  where 1=1 and #function("teacherOpenCourseMergeSchoolClass.query")#
+  where 1=1
   @if(!isEmpty(teacherOpenCourseMergeSchoolClassId)){
   and t.teacher_open_course_merge_school_class_id =#teacherOpenCourseMergeSchoolClassId#
   @}

web/src/main/resources/sql/jlw/teacherOpenCourseMergeStudent.md

@@ -66,7 +66,9 @@ queryByConditionQuery
   t.*
   @}
   from teacher_open_course_merge_student t
-  where 1=1  
+  left join student ta on ta.student_id = t.student_id
+  where 1=1
+  and ta.student_status = 1
   @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){
   and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId#
   @}
@@ -112,7 +114,12 @@ queryByConditionQuery
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
-
+  @if(!isEmpty(studentSnOrName)){
+  and (ta.student_sn like #'%'+studentSnOrName+'%'# or ta.student_name like #'%'+studentSnOrName+'%'#)
+  @}
+  @if(!isEmpty(schoolClassIdPlural)){
+  and find_in_set(ta.class_id, #schoolClassIdPlural#)
+  @}
 
 
 
@@ -243,7 +250,9 @@ getValuesByQuery
 
   select t.*
   from teacher_open_course_merge_student t
+  left join student ta on ta.student_id = t.student_id
   where 1=1 and #function("teacherOpenCourseMergeStudent.query")#
+  and ta.student_status = 1
   @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){
   and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId#
   @}
@@ -289,7 +298,12 @@ getValuesByQuery
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
-
+  @if(!isEmpty(studentSnOrName)){
+  and (ta.student_sn like #'%'+studentSnOrName+'%'# or ta.student_name like #'%'+studentSnOrName+'%'#)
+  @}
+  @if(!isEmpty(schoolClassIdPlural)){
+  and find_in_set(ta.class_id, #schoolClassIdPlural#)
+  @}
 
 getValuesByQueryNotWithPermission
 ===
@@ -298,7 +312,9 @@ getValuesByQueryNotWithPermission
 
   select t.*
   from teacher_open_course_merge_student t
-  where 1=1
+  left join student ta on ta.student_id = t.student_id
+  where 1=1 
+  and ta.student_status = 1
   @if(!isEmpty(teacherOpenCourseSchoolClassMergeStudentId)){
   and t.teacher_open_course_school_class_merge_student_id =#teacherOpenCourseSchoolClassMergeStudentId#
   @}
@@ -344,6 +360,12 @@ getValuesByQueryNotWithPermission
   @if(!isEmpty(userIdPlural)){
   and find_in_set(t.user_id,#userIdPlural#)
   @}
+  @if(!isEmpty(studentSnOrName)){
+  and (ta.student_sn like #'%'+studentSnOrName+'%'# or ta.student_name like #'%'+studentSnOrName+'%'#)
+  @}
+  @if(!isEmpty(schoolClassIdPlural)){
+  and find_in_set(ta.class_id, #schoolClassIdPlural#)
+  @}
 
 
 selectStudentIdListByTeacherId

web/src/test/java/com/ibeetl/jlw/web/TeacherOpenCourseMergeStudentControllerTest.java

@@ -101,4 +101,48 @@ class TeacherOpenCourseMergeStudentControllerTest extends BaseTest {
         System.out.println(result);
         clearEnvLoginInfo();
     }
+
+    @Test
+    void getList() throws Exception {
+            //构造请求参数
+            RequestBuilder rb = MockMvcRequestBuilders.get(API + "/getList.do")
+//                    .param("studentSnOrName", "云夏")
+                    .param("studentSnOrName", "1_002")
+                    .param("teacherOpenCourseId", "1569699103338831872")
+                    ;
+
+        // 测试账号，佟老师
+        putLoginInfoToEnv("102", "26");
+
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
+
+        System.out.println(result);
+        clearEnvLoginInfo();
+    }
+
+    @Test
+    void getPageList() throws Exception {
+        //构造请求参数
+        RequestBuilder rb = MockMvcRequestBuilders.post(API + "/getPageList.do")
+//                    .param("studentSnOrName", "云夏")
+                .param("studentSnOrName", "1_002")
+                .param("teacherOpenCourseId", "1569699103338831872")
+                ;
+
+        // 测试账号，佟老师
+        putLoginInfoToEnv("102", "26");
+
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString(Charset.defaultCharset());
+
+        System.out.println(result);
+        clearEnvLoginInfo();
+    }
 }