Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/StudentManageDao.java

@@ -287,7 +287,10 @@ public interface StudentManageDao {
      * @param musicGroupPaymentCalenderId
      * @return
      */
-    List<BasicUserDto> queryCanAddStudent(@Param("musicGroupId") String musicGroupId, @Param("musicGroupPaymentCalenderId") Long musicGroupPaymentCalenderId);
+    List<BasicUserDto> queryCanAddStudent(@Param("musicGroupId") String musicGroupId,
+                                          @Param("musicGroupPaymentCalenderId") Long musicGroupPaymentCalenderId,
+                                          @Param("search") String search,
+                                          @Param("subjectId") Integer subjectId);
 
     /**
      * 学员是否有课

mec-biz/src/main/java/com/ym/mec/biz/service/StudentManageService.java

@@ -174,5 +174,5 @@ public interface StudentManageService {
      * @param musicGroupPaymentCalenderId
      * @return
      */
-    List<BasicUserDto> queryCanAddStudent(String musicGroupId, Long musicGroupPaymentCalenderId);
+    List<BasicUserDto> queryCanAddStudent(String musicGroupId, Long musicGroupPaymentCalenderId,String search,Integer subjectId);
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentManageServiceImpl.java

@@ -557,7 +557,7 @@ public class StudentManageServiceImpl implements StudentManageService {
     }
 
     @Override
-    public List<BasicUserDto> queryCanAddStudent(String musicGroupId, Long musicGroupPaymentCalenderId) {
-        return studentManageDao.queryCanAddStudent(musicGroupId, musicGroupPaymentCalenderId);
+    public List<BasicUserDto> queryCanAddStudent(String musicGroupId, Long musicGroupPaymentCalenderId,String search,Integer subjectId) {
+        return studentManageDao.queryCanAddStudent(musicGroupId, musicGroupPaymentCalenderId,search,subjectId);
     }
 }

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

@@ -894,14 +894,19 @@
 		GROUP BY sr.user_id_
     </select>
     <select id="queryCanAddStudent" resultMap="com.ym.mec.biz.dal.dao.MusicGroupDao.BasicUserDto">
-        SELECT su.id_ user_id_,su.username_,su.phone_ FROM music_group_student_fee_ mgsf
-        LEFT JOIN sys_user su ON su.id_ = mgsf.user_id_
-        LEFT JOIN student_registration sr ON sr.music_group_id_ = mgsf.music_group_id_
-        WHERE mgsf.user_id_ NOT IN (
-        SELECT DISTINCT mgpcd.user_id_ FROM music_group_payment_calender_detail mgpcd
-        LEFT JOIN music_group_payment_calender mgpc ON mgpc.id_ = mgpcd.music_group_payment_calender_id_
-        WHERE mgpc.id_ = #{musicGroupPaymentCalenderId}
-        ) AND mgsf.music_group_id_ = #{musicGroupId} AND sr.user_id_ = mgsf.user_id_ AND sr.music_group_status_ != 'APPLY'
+        SELECT su.id_ user_id_,su.username_,su.phone_,s.name_ subject_name_ FROM music_group_payment_calender mgpc
+        LEFT JOIN student_registration sr ON sr.music_group_id_ = mgpc.music_group_id_
+        LEFT JOIN sys_user su ON su.id_ = sr.user_id_
+        LEFT JOIN `subject` s ON s.id_ = sr.subject_id_
+        WHERE mgpc.music_group_id_ = #{musicGroupId} AND sr.music_group_status_ != 'QUIT' AND sr.user_id_ NOT IN (
+        SELECT DISTINCT user_id_ FROM music_group_payment_calender_detail
+        WHERE music_group_payment_calender_id_ = #{musicGroupPaymentCalenderId})
+        <if test="search != null and search != ''">
+            AND sr.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%')
+        </if>
+        <if test="subjectId != null">
+            AND sr.subject_id_ = #{subjectId}
+        </if>
     </select>
     <select id="queryHasCourseMap" resultType="java.util.Map">
         SELECT su.id_ 'key',COUNT(DISTINCT su.id_) 'value' FROM sys_user su

mec-web/src/main/java/com/ym/mec/web/controller/StudentManageController.java

@@ -107,8 +107,8 @@ public class StudentManageController extends BaseController {
     @ApiOperation(value = "乐团修改--学员缴费记录--可新增学员列表")
     @GetMapping("/queryCanAddStudent")
     @PreAuthorize("@pcs.hasPermissions('studentManage/queryCanAddStudent')")
-    public Object queryCanAddStudent(String musicGroupId,Long musicGroupPaymentCalenderId){
-        return succeed(studentManageService.queryCanAddStudent(musicGroupId,musicGroupPaymentCalenderId));
+    public Object queryCanAddStudent(String musicGroupId,Long musicGroupPaymentCalenderId,String search,Integer subjectId){
+        return succeed(studentManageService.queryCanAddStudent(musicGroupId,musicGroupPaymentCalenderId,search,subjectId));
     }
 
     @ApiOperation(value = "乐团管理--乐团详情--学员列表--查看班级")