Merge remote-tracking branch 'origin/master'

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/PracticeTeacherSearch.java

@@ -16,12 +16,7 @@ public class PracticeTeacherSearch extends QueryInfo {
     @ApiModelProperty(value = "老师名称")
     private String search;
 
-    @ApiModelProperty(value = "排序字段(starGrade,expTime,subjectPrice)")
-    private String sortField;
-
-    @ApiModelProperty(value = "排序规则(升序:ASC 降序:DESC)")
-    private String collation;
-
+    @ApiModelProperty(value = "排序字段(starGrade,expTime,subjectPrice) 排序规则(升序:ASC 降序:DESC)")
     private String sort;
 
     @Override
@@ -51,20 +46,4 @@ public class PracticeTeacherSearch extends QueryInfo {
     public void setSearch(String search) {
         this.search = search;
     }
-
-    public String getSortField() {
-        return sortField;
-    }
-
-    public void setSortField(String sortField) {
-        this.sortField = sortField;
-    }
-
-    public String getCollation() {
-        return collation;
-    }
-
-    public void setCollation(String collation) {
-        this.collation = collation;
-    }
 }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/CourseScheduleServiceImpl.java

@@ -748,13 +748,6 @@ public class CourseScheduleServiceImpl extends ServiceImpl<CourseScheduleDao, Co
      */
     @Override
     public IPage<PracticeTeacherVo> teacherList(IPage<PracticeTeacherVo> page, PracticeTeacherSearch search) {
-        String collation = search.getCollation();//排序规则
-        String sortField = search.getSortField();//排序字段
-        if (StringUtils.isNotBlank(sortField)) {
-            if (StringUtils.isNotBlank(collation)) {
-                search.setSort(sortField + " " + collation);
-            } else search.setSort(sortField);
-        }
         return page.setRecords(baseMapper.teacherList(page, search));
     }
 

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

@@ -322,28 +322,27 @@
     </select>
     <select id="teacherList" resultType="com.yonge.cooleshow.biz.dal.vo.PracticeTeacherVo">
         SELECT
-            cs.teacher_id_ AS teacherId,
-            u.username_ AS userName,
-            u.avatar_ AS avatar,
+        t.user_id_ AS teacherId,
+        u.username_ AS userName,
+        u.avatar_ AS avatar,
 
-            tt.star_grade_ AS starGrade,
-            tt.exp_time_ AS expTime,
-            t.graduate_school_ AS school,
-            t.subject_ AS schoolSubject,
+        tt.star_grade_ AS starGrade,
+        tt.exp_time_ AS expTime,
+        t.graduate_school_ AS school,
+        t.subject_ AS schoolSubject,
 
-            (SELECT group_concat(p.subject_name_) FROM teacher_subject_price p WHERE find_in_set(cs.teacher_id_,p.teacher_id_)) AS configSubject,
-            sp.subject_id_ AS subjectId,
-            sp.subject_name_ AS subjectName,
-            sp.subject_price_ AS subjectPrice,
-            sp.course_minutes_ AS courseMinutes
+        (SELECT group_concat(p.subject_name_) FROM teacher_subject_price p WHERE find_in_set(t.user_id_,p.teacher_id_)) AS configSubject,
+        sp.subject_id_ AS subjectId,
+        sp.subject_name_ AS subjectName,
+        sp.subject_price_ AS subjectPrice,
+        sp.course_minutes_ AS courseMinutes
 
-        FROM course_schedule cs
-        LEFT JOIN sys_user u ON cs.teacher_id_ = u.id_
-        LEFT JOIN teacher_total tt ON cs.teacher_id_=tt.user_id_
-        LEFT JOIN teacher t ON cs.teacher_id_=t.user_id_
-        LEFT JOIN teacher_subject_price sp ON cs.teacher_id_=sp.teacher_id_
+        FROM teacher t
+        LEFT JOIN sys_user u ON t.user_id_ = u.id_
+        LEFT JOIN teacher_total tt ON t.user_id_=tt.user_id_
+        LEFT JOIN teacher_subject_price sp ON t.user_id_=sp.teacher_id_
 
-        WHERE cs.type_='PRACTICE'
+        WHERE t.user_id_ IN (SELECT teacher_id_ FROM teacher_free_time GROUP BY teacher_id_)
         <if test="param.subjectId !=null">
             AND sp.subject_id_=#{param.subjectId}
         </if>

cooleshow-user/user-student/src/main/java/com/yonge/cooleshow/student/controller/StudentCourseScheduleController.java

@@ -95,7 +95,7 @@ public class StudentCourseScheduleController extends BaseController {
         return succeed(courseScheduleService.queryCourseScheduleStudent(search));
     }
 
-    @ApiOperation("学生端-首页-陪练课老师列表")
+    @ApiOperation(value = "学生端-首页-陪练课老师列表", notes = "search:{'subjectId':null,'search':'','sort':'starGrade ASC,expTime DESC,subjectPrice DESC'}")
     @PostMapping("/teacherList")
     public HttpResponseResult<PageInfo<PracticeTeacherVo>> teacherList(@RequestBody PracticeTeacherSearch search) {
         IPage<PracticeTeacherVo> pages = courseScheduleService.teacherList(PageUtil.getPage(search), search);
@@ -149,7 +149,7 @@ public class StudentCourseScheduleController extends BaseController {
     @ApiOperation("查询老师陪练课配置")
     @GetMapping("/getTeacherSubjectPrice")
     public HttpResponseResult<TeacherSubjectPrice> getTeacherSubjectPrice(@NotNull Long teacherId, @NotNull Long subjectId) {
-        return succeed(courseScheduleService.teacherSubjectPrice(teacherId,subjectId));
+        return succeed(courseScheduleService.teacherSubjectPrice(teacherId, subjectId));
     }
 }