feat:六一活动排课

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

@@ -956,7 +956,7 @@
         </if>
     </sql>
     <select id="queryPageName" resultMap="Teacher">
-        SELECT su.id_,su.real_name_,su.avatar_,GROUP_CONCAT(s.name_) subject_name_ FROM teacher t
+        SELECT su.id_,su.real_name_,su.avatar_,t.subject_id_,GROUP_CONCAT(s.name_) subject_name_ FROM teacher t
         LEFT JOIN sys_user su ON t.id_ = su.id_
         LEFT JOIN subject s ON FIND_IN_SET(s.id_, t.subject_id_)
         WHERE su.del_flag_ != 1 AND su.lock_flag_!=1

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

@@ -29,8 +29,8 @@ public class EduSubjectController extends BaseController {
     }
 
     @ApiOperation(value = "根据科目编号查询科目")
-    @GetMapping("/get")
-    public Object get(Integer id){
-        return succeed(subjectService.get(id));
+    @GetMapping("/findBySubjectByIdList")
+    public Object get(String subjectIdList){
+        return succeed(subjectService.findBySubjectByIdList(subjectIdList));
     }
 }