update

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

@@ -201,5 +201,5 @@ public interface MusicGroupStudentFeeDao extends BaseDAO<Long, MusicGroupStudent
 	 * @param musicGroupId
 	 * @return
 	 */
-    List<FeeStudentDto> queryFeeStudents(String musicGroupId);
+    List<FeeStudentDto> queryFeeStudents(@Param("musicGroupId") String musicGroupId, @Param("search") String search, @Param("subjectId") Integer subjectId);
 }

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

@@ -50,5 +50,5 @@ public interface MusicGroupPaymentCalenderDetailService extends BaseService<Long
      * @param musicGroupId
      * @return
      */
-    List<FeeStudentDto> queryFeeStudents(String musicGroupId);
+    List<FeeStudentDto> queryFeeStudents(String musicGroupId,String search,Integer subjectId);
 }

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

@@ -224,7 +224,7 @@ public class MusicGroupPaymentCalenderDetailServiceImpl extends BaseServiceImpl<
 	}
 
 	@Override
-	public List<FeeStudentDto> queryFeeStudents(String musicGroupId) {
-		return musicGroupStudentFeeDao.queryFeeStudents(musicGroupId);
+	public List<FeeStudentDto> queryFeeStudents(String musicGroupId,String search,Integer subjectId) {
+		return musicGroupStudentFeeDao.queryFeeStudents(musicGroupId,search,subjectId);
 	}
 }

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

@@ -246,6 +246,13 @@
         LEFT JOIN sys_user su ON su.id_ = mgsf.user_id_
         LEFT JOIN `subject` s ON s.id_ = mgsf.subject_id_
         WHERE mgsf.music_group_id_ = #{musicGroupId}
+        <if test="search != null and search != ''">
+            AND (su.id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%')
+            OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+        </if>
+        <if test="subjectId != null">
+            AND mgsf.subject_id_ = #{subjectId}
+        </if>
     </select>
 
     <update id="batchUpdate" parameterType="java.util.List">

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

@@ -41,8 +41,8 @@ public class MusicGroupPaymentCalenderDetailController extends BaseController {
     @ApiOperation(value = "新增缴费学员列表获取")
     @PostMapping("/queryFeeStudents")
     @PreAuthorize("@pcs.hasPermissions('musicGroupPaymentCalenderDetail/queryFeeStudents')")
-    public Object queryFeeStudents(String musicGroupId) {
-        return succeed(musicGroupPaymentCalenderDetailService.queryFeeStudents(musicGroupId));
+    public Object queryFeeStudents(String musicGroupId,String search,Integer subjectId) {
+        return succeed(musicGroupPaymentCalenderDetailService.queryFeeStudents(musicGroupId,search,subjectId));
     }
 
     @ApiOperation(value = "乐团缴费记录新增学员")