活动排课搜索学员调整

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

@@ -54,15 +54,17 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
     */
     ActivityWaitCourseStudentNumDto getActivityWaitCourseStudentNum(@Param("userId") Integer userId, @Param("activityId") Integer activityId);
 
-    /**
-    * @description: 获取活动学员课排课次数
-     * @param userId
-     * @param activityId
-    * @return com.ym.mec.biz.dal.dto.ActivityWaitCourseStudentNumDto
-    * @author zx
-    * @date 2021/10/11 15:02
-    */
-	List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(@Param("userId") Integer userId, @Param("activityId") Integer activityId);
+	/**
+	 * @description: 获取活动学员课排课次数
+	 * @param userId
+	 * @param activityId
+	 * @return com.ym.mec.biz.dal.dto.ActivityWaitCourseStudentNumDto
+	 * @author zx
+	 * @date 2021/10/11 15:02
+	 */
+	List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(@Param("userId") Integer userId,
+																		 @Param("activityId") Integer activityId,
+																		 @Param("search") String search);
 
 	/**
 	* @description: 双十一活动统计

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

@@ -67,7 +67,7 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
     * @author zx
     * @date 2021/10/11 15:00
     */
-    List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(Integer userId, Integer activityId);
+    List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(Integer userId, Integer activityId,String search);
 
     /**
     * @description: 分部双11活动统计

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

@@ -190,8 +190,8 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
     }
 
 	@Override
-	public List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(Integer userId, Integer activityId) {
-		return vipGroupActivityDao.getActivityStudentCanCourseNum(userId,activityId);
+	public List<ActivityWaitCourseStudentNumDto> getActivityStudentCanCourseNum(Integer userId, Integer activityId,String search) {
+		return vipGroupActivityDao.getActivityStudentCanCourseNum(userId,activityId,search);
 	}
 
     @Override

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

@@ -329,6 +329,9 @@
 		<if test="userId != null">
 			AND aum.teacher_id_ = #{userId}
 		</if>
+		<if test="search != null and search != ''">
+			AND (aum.user_id_ = #{search} OR su.username_ LIKE CONCAT('%',#{search},'%') OR su.phone_ LIKE CONCAT('%',#{search},'%'))
+		</if>
 		GROUP BY aum.user_id_
 	</select>
 	<resultMap id="DoubleEleven2021ActivityDto" type="com.ym.mec.biz.dal.dto.DoubleEleven2021ActivityDto">

mec-teacher/src/main/java/com/ym/mec/teacher/controller/VipGroupActivityController.java

@@ -19,7 +19,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
-
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -66,12 +65,12 @@ public class VipGroupActivityController extends BaseController {
 
     @ApiOperation(value = "获取活动学员课排课次数")
     @RequestMapping("/getActivityStudentCanCourseNum")
-    public Object getActivityStudentCanCourseNum(Integer activityId){
+    public Object getActivityStudentCanCourseNum(Integer activityId,String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-        return succeed(vipGroupActivityService.getActivityStudentCanCourseNum(sysUser.getId(),activityId));
+        return succeed(vipGroupActivityService.getActivityStudentCanCourseNum(sysUser.getId(),activityId,search));
     }
 
     @ApiOperation(value = "新增vip课活动方案")

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

@@ -96,12 +96,12 @@ public class ActivityController extends BaseController {
 
     @ApiOperation(value = "获取活动学员课排课次数")
     @RequestMapping("/getActivityStudentCanCourseNum")
-    public Object getActivityStudentCanCourseNum(Integer activityId){
+    public Object getActivityStudentCanCourseNum(Integer activityId,String search){
         SysUser sysUser = sysUserFeignService.queryUserInfo();
         if(sysUser == null){
             return failed("用户信息获取失败");
         }
-        return succeed(vipGroupActivityService.getActivityStudentCanCourseNum(null,activityId));
+        return succeed(vipGroupActivityService.getActivityStudentCanCourseNum(null,activityId,search));
     }