修改查询条件

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/CourseGroupController.java

@@ -161,21 +161,17 @@ public class CourseGroupController extends BaseController {
     }
 
     @ApiOperation(value = "学员管理-琴房课",notes = "{\n" +
-            "    \"subjectId\":20,\n" +
+            "    \"studentId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
             "}")
     @PostMapping(value = "/piano/student")
     public HttpResponseResult<PageInfo<CourseGroupPianoVo>> selectPianoGroupStudent(@RequestBody CourseGroupSearch search) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        search.setStudentId(user.getId());
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupStudent(PageUtil.getPage(search), search)));
     }
 
     @ApiOperation(value = "学员管理-琴房课-详情",notes = "{\n" +
+            "    \"studentId\":20,\n" +
             "    \"courseGroupId\":334,\n" +
             "    \"search\":\"\",\n" +
             "    \"status\":\"\",\n" +
@@ -186,11 +182,6 @@ public class CourseGroupController extends BaseController {
             "}")
     @PostMapping(value = "/piano/student/detail")
     public HttpResponseResult<PageInfo<CourseGroupPianoDetailVo>> selectPianoGroupStudentDetail(@Validated @RequestBody CourseGroupDetailSearch search) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        search.setStudentId(user.getId());
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupStudentDetail(PageUtil.getPage(search), search)));
     }
 
@@ -205,21 +196,17 @@ public class CourseGroupController extends BaseController {
     }
 
     @ApiOperation(value = "老师管理-琴房课",notes = "{\n" +
-            "    \"subjectId\":20,\n" +
+            "    \"teacherId\":20,\n" +
             "    \"search\":\"师\",\n" +
             "    \"status\":\"ING\"\n" +
             "}")
     @PostMapping(value = "/piano/teacher")
     public HttpResponseResult<PageInfo<CourseGroupPianoVo>> selectPianoGroupTeacher(@RequestBody CourseGroupSearch search) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        search.setTeacherId(user.getId());
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupTeacher(PageUtil.getPage(search), search)));
     }
 
     @ApiOperation(value = "老师管理-琴房课-详情",notes = "{\n" +
+            "    \"teacherId\":20,\n" +
             "    \"courseGroupId\":334,\n" +
             "    \"search\":\"\",\n" +
             "    \"status\":\"\",\n" +
@@ -230,11 +217,6 @@ public class CourseGroupController extends BaseController {
             "}")
     @PostMapping(value = "/piano/teacher/detail")
     public HttpResponseResult<PageInfo<CourseGroupPianoDetailVo>> selectPianoGroupTeacherDetail(@Validated @RequestBody CourseGroupDetailSearch search) {
-        SysUser user = sysUserFeignService.queryUserInfo();
-        if (user == null || null == user.getId()) {
-            return failed(HttpStatus.FORBIDDEN, "请登录");
-        }
-        search.setTeacherId(user.getId());
         return succeed(PageUtil.pageInfo(courseGroupService.selectPianoGroupTeacherDetail(PageUtil.getPage(search), search)));
     }
 }

cooleshow-user/user-biz/src/main/resources/config/mybatis/CourseGroupMapper.xml

@@ -727,10 +727,10 @@
             AND cs.status_ = #{param.status}
         </if>
         <if test="param.startTime != null">
-            AND cs.start_time_ &lt;= #{param.startTime}
+            AND cs.start_time_ &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null">
-            AND cs.start_time_ &gt;= #{param.endTime}
+            AND cs.start_time_ &lt;= #{param.endTime}
         </if>
         <if test="param.teacherSign == 1">
             AND b.teacherInSign = #{param.teacherSign}
@@ -845,10 +845,10 @@
             AND `status` = #{param.status}
         </if>
         <if test="param.startTime != null">
-            AND startTime &lt;= #{param.startTime}
+            AND startTime &gt;= #{param.startTime}
         </if>
         <if test="param.endTime != null">
-            AND endTime &gt;= #{param.endTime}
+            AND startTime &lt;= #{param.endTime}
         </if>
         </where>
     </select>
@@ -939,10 +939,10 @@
                 AND `status` = #{param.status}
             </if>
             <if test="param.startTime != null">
-                AND startTime &lt;= #{param.startTime}
+                AND startTime &gt;= #{param.startTime}
             </if>
             <if test="param.endTime != null">
-                AND endTime &gt;= #{param.endTime}
+                AND endTime &lt;= #{param.endTime}
             </if>
         </where>
     </select>