1. 增加课表测试类

admin-core/src/main/java/com/ibeetl/admin/core/util/BeanUtil.java

@@ -56,7 +56,7 @@ public class BeanUtil extends cn.hutool.core.bean.BeanUtil {
      * @param obj
      * @return
      */
-    public static MultiValueMap<String, String> beanToStrMultiMap(Object obj) {
+    public static MultiValueMap<String, String> toMultiMap(Object obj) {
         Map<String, String> stringMap = BeanUtil.beanToMapStr(obj);
         MultiValueMapAdapter multiValueMapAdapter = new MultiValueMapAdapter(new HashMap<String, String>());
         stringMap.forEach(multiValueMapAdapter::add);

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

@@ -123,12 +123,20 @@ public class TeacherOpenCourseScheduleSessionController{
     @PostMapping(MODEL + "/list.json")
     @Function("teacherOpenCourseScheduleSession.query")
     @ResponseBody
+    @Deprecated
     public JsonResult<PageQuery> list(TeacherOpenCourseScheduleSessionQuery condition){
         PageQuery page = condition.getPageQuery();
         teacherOpenCourseScheduleSessionService.queryByCondition(page);
         return JsonResult.success(page);
     }
 
+    /**
+     * 教师端-学生端
+     * 分组后的分页课表信息
+     *
+     * @param condition
+     * @return
+     */
     @PostMapping(MODEL + "/listGroup.json")
     @Function("teacherOpenCourseScheduleSession.query")
     @ResponseBody
@@ -235,15 +243,4 @@ public class TeacherOpenCourseScheduleSessionController{
         return JsonResult.success();
     }
 
-    /**
-     * 排课列表（带分组）
-     */
-    @PostMapping(MODEL + "/groupList.json")
-    @Function("teacherOpenCourseScheduleSession.query")
-    @ResponseBody
-    public JsonResult<PageQuery> groupList(TeacherOpenCourseScheduleSessionQuery condition){
-        PageQuery page = condition.getPageQuery();
-        teacherOpenCourseScheduleSessionService.queryByCondition(page);
-        return JsonResult.success(page);
-    }
 }

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

@@ -147,10 +147,10 @@ queryByConditionGroup
   and find_in_set(t.user_id,#userIdPlural#)
     @}
     @if(!isEmpty(teacherOpenCourseScheduleSessionStartDate)){
-  and t.teacher_open_course_schedule_session_start_date =#teacherOpenCourseScheduleSessionStartDate#
+  and t.teacher_open_course_schedule_session_start_date like #teacherOpenCourseScheduleSessionStartDate+'%'#
     @}
     @if(!isEmpty(teacherOpenCourseScheduleSessionEndDate)){
-  and t.teacher_open_course_schedule_session_end_date =#teacherOpenCourseScheduleSessionEndDate#
+  and t.teacher_open_course_schedule_session_end_date like #teacherOpenCourseScheduleSessionEndDate+'%'#
     @}
     @if(!isEmpty(teacherOpenCourseScheduleSessionWeekNum)){
   and t.teacher_open_course_schedule_session_week_num =#teacherOpenCourseScheduleSessionWeekNum#

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

@@ -19,7 +19,7 @@ class ResourcesQuestionControllerTest extends BaseTest {
 
     @Test
     void list() throws Exception {
-        MultiValueMap<String, String> multiValueMap = BeanUtil.beanToStrMultiMap(new ResourcesQuestionQuery());
+        MultiValueMap<String, String> multiValueMap = BeanUtil.toMultiMap(new ResourcesQuestionQuery());
 
         //构造请求参数
         RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/list.json")

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

@@ -62,7 +62,7 @@ public class TeacherOpenCourseMergeSchoolClassControllerTest extends BaseTest {
 
         // 自动填充属性
         TeacherOpenCourseMergeSchoolClass teacherOpenCourseMergeSchoolClass = randomPojo(TeacherOpenCourseMergeSchoolClass.class);
-        MultiValueMap<String, String> multiValueMap = BeanUtil.beanToStrMultiMap(teacherOpenCourseMergeSchoolClass);
+        MultiValueMap<String, String> multiValueMap = BeanUtil.toMultiMap(teacherOpenCourseMergeSchoolClass);
 
         //构造请求参数
         RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/add.json").contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)

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

@@ -0,0 +1,41 @@
+package com.ibeetl.jlw.web;
+
+import base.BaseTest;
+import com.ibeetl.jlw.web.query.TeacherOpenCourseScheduleSessionQuery;
+import org.junit.jupiter.api.Test;
+import org.springframework.http.MediaType;
+import org.springframework.test.web.servlet.RequestBuilder;
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
+
+import static com.ibeetl.admin.core.util.BeanUtil.toMultiMap;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+class TeacherOpenCourseScheduleSessionControllerTest extends BaseTest {
+
+    private static final String MODEL = "/jlw/teacherOpenCourseScheduleSession";
+    private static final String API = "/api/teacherOpenCourseScheduleSession";
+
+    @Test
+    void listGroup() throws Exception {
+        // 构建查询条件实体
+        TeacherOpenCourseScheduleSessionQuery teacherOpenCourseScheduleSessionQuery = new TeacherOpenCourseScheduleSessionQuery();
+        teacherOpenCourseScheduleSessionQuery.setTeacherOpenCourseScheduleSessionStatus(1);
+        // 模糊查询9月的数据
+        teacherOpenCourseScheduleSessionQuery.setTeacherOpenCourseScheduleSessionStartDate("2022-09");
+
+        //构造请求参数
+        RequestBuilder rb = MockMvcRequestBuilders.post(MODEL + "/listGroup.json")
+                .contentType(MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+                .params(toMultiMap(teacherOpenCourseScheduleSessionQuery));
+
+        //发送请求，验证返回结果
+        String result = mvc.perform(rb)
+                .andExpect(status().isOk())
+                .andExpect(MockMvcResultMatchers.jsonPath("$.code").value("0"))
+                .andReturn().getResponse().getContentAsString();
+
+        System.out.println(result);
+
+    }
+}