活动排课

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

@@ -2,6 +2,7 @@ package com.ym.mec.biz.dal.dao;
 
 import com.ym.mec.biz.dal.dto.ActivityQueryDto;
 import com.ym.mec.biz.dal.dto.ExportVipGroupActivityDto;
+import com.ym.mec.biz.dal.dto.WaitCourseActivityDto;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.common.dal.BaseDAO;
 import org.apache.ibatis.annotations.Param;
@@ -35,4 +36,13 @@ public interface VipGroupActivityDao extends BaseDAO<Integer, VipGroupActivity>
 	 * @return
 	 */
 	List<ExportVipGroupActivityDto> exportVipGroupActivity(Map<String, Object> params);
+
+	/**
+	* @description: 获取老师待排课的活动方案列表
+	 * @param
+	* @return java.util.List<com.ym.mec.biz.dal.dto.WaitCourseActivityDto>
+	* @author zx
+	* @date 2021/10/11 11:17
+	*/
+    List<WaitCourseActivityDto> queryWaitCourseActivity(Integer teacherId);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dto/WaitCourseActivityDto.java

@@ -0,0 +1,34 @@
+package com.ym.mec.biz.dal.dto;
+
+public class WaitCourseActivityDto{
+
+    private Integer activityId;
+
+    private String activityName;
+
+    private Integer studentNum;
+
+    public Integer getActivityId() {
+        return activityId;
+    }
+
+    public void setActivityId(Integer activityId) {
+        this.activityId = activityId;
+    }
+
+    public String getActivityName() {
+        return activityName;
+    }
+
+    public void setActivityName(String activityName) {
+        this.activityName = activityName;
+    }
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+}

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

@@ -3,6 +3,7 @@ package com.ym.mec.biz.service;
 import com.ym.mec.biz.dal.dto.ActivityQueryDto;
 import com.ym.mec.biz.dal.dto.ExportVipGroupActivityDto;
 import com.ym.mec.biz.dal.dto.VipGroupActivityAddDto;
+import com.ym.mec.biz.dal.dto.WaitCourseActivityDto;
 import com.ym.mec.biz.dal.entity.VipGroupActivity;
 import com.ym.mec.biz.dal.page.VipGroupActivityQueryInfo;
 import com.ym.mec.common.service.BaseService;
@@ -38,4 +39,13 @@ public interface VipGroupActivityService extends BaseService<Integer, VipGroupAc
      * @return
      */
     List<ExportVipGroupActivityDto> exportVipGroupActivity(VipGroupActivityQueryInfo queryInfo);
+
+    /**
+    * @description: 获取老师待排课的活动方案列表
+     * @param
+    * @return java.lang.Object
+    * @author zx
+    * @date 2021/10/11 11:12
+    */
+    List<WaitCourseActivityDto> queryWaitCourseActivity(Integer teacherId);
 }

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

@@ -166,4 +166,9 @@ public class VipGroupActivityServiceImpl extends BaseServiceImpl<Integer, VipGro
 		MapUtil.populateMap(params, queryInfo);
 		return vipGroupActivityDao.exportVipGroupActivity(params);
 	}
+
+    @Override
+    public List<WaitCourseActivityDto> queryWaitCourseActivity(Integer teacherId) {
+		return vipGroupActivityDao.queryWaitCourseActivity(teacherId);
+    }
 }

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

@@ -352,4 +352,16 @@
     <select id="findByName" resultMap="VipGroupActivity">
 		SELECT * FROM vip_group_activity vga WHERE vga.name_ = #{name}
 	</select>
+	<resultMap id="WaitCourseActivityDto" type="com.ym.mec.biz.dal.dto.WaitCourseActivityDto">
+		<result property="activityId" column="activity_id_"/>
+		<result property="activityName" column="activity_name_"/>
+		<result property="studentNum" column="student_num_"/>
+	</resultMap>
+	<select id="queryWaitCourseActivity" resultMap="WaitCourseActivityDto">
+		SELECT aum.activity_id_,vga.name_ activity_name_,COUNT(DISTINCT aum.user_id_) student_num_ FROM student s
+		LEFT JOIN activity_user_mapper aum ON s.user_id_ = aum.user_id_
+		LEFT JOIN vip_group_activity vga ON aum.activity_id_ = vga.id_
+		WHERE s.teacher_id_ = #{teacherId} AND (aum.vip_flag_ = 1 OR aum.practice_flag_ = 1 OR aum.give_vip_flag_ = 1 OR aum.give_practice_flag_ = 1)
+		GROUP BY aum.activity_id_,aum.user_id_
+	</select>
 </mapper>

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

@@ -44,6 +44,16 @@ public class VipGroupActivityController extends BaseController {
     @Autowired
     private StudentDao studentDao;
 
+    @ApiOperation(value = "获取老师待排课的活动方案列表")
+    @PostMapping("/queryWaitCourseActivity")
+    public Object queryWaitCourseActivity(){
+        SysUser sysUser = sysUserFeignService.queryUserInfo();
+        if(sysUser == null){
+            return failed("用户信息获取失败");
+        }
+        return succeed(vipGroupActivityService.queryWaitCourseActivity(sysUser.getId()));
+    }
+
     @ApiOperation(value = "新增vip课活动方案")
     @PostMapping("/addVipGroupActivity")
     public Object addVipGroupActivity(@RequestBody VipGroupActivityAddDto vipGroupActivityAddDto){