zouxuan 3 سال پیش
والد
کامیت
1d6477ff65

+ 10 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseFormDto.java

@@ -8,6 +8,16 @@ public class CourseFormDto {
 
     private Integer num;
 
+    private Integer studentNum;
+
+    public Integer getStudentNum() {
+        return studentNum;
+    }
+
+    public void setStudentNum(Integer studentNum) {
+        this.studentNum = studentNum;
+    }
+
     public String getName() {
         return name;
     }

+ 3 - 1
mec-biz/src/main/resources/config/mybatis/ActivityUserMapperMapper.xml

@@ -387,10 +387,12 @@
 		<result property="id" column="id_"/>
 		<result property="name" column="name_"/>
 		<result property="num" column="num_"/>
+		<result property="studentNum" column="student_num_"/>
 	</resultMap>
 	<select id="queryWaitCourseCategory" resultMap="CourseFormDto">
 		SELECT CASE WHEN vgc.id_ IS NULL THEN '网管课' ELSE vgc.name_ END name_,
-		CASE WHEN vgc.id_ IS NULL THEN 0 ELSE vgc.id_ END id_,COUNT(DISTINCT aum.user_id_) num_
+		CASE WHEN vgc.id_ IS NULL THEN 0 ELSE vgc.id_ END id_,COUNT(DISTINCT aum.user_id_) num_,
+		CASE WHEN vgc.id_ IS NULL THEN 1 ELSE vgc.student_num_ END student_num_
 		FROM (select category_id_,user_id_ from activity_user_mapper aum WHERE aum.sub_course_num_ > 0 AND aum.return_fee_ = 0
 		UNION ALL
 		select give_category_id_ category_id_,user_id_ from activity_user_mapper aum

+ 0 - 3
mec-web/src/main/java/com/ym/mec/web/controller/education/EduActivityUserMapperController.java

@@ -1,6 +1,5 @@
 package com.ym.mec.web.controller.education;
 
-import com.ym.mec.biz.dal.dao.TeacherDao;
 import com.ym.mec.biz.dal.dao.VipGroupDefaultClassesUnitPriceDao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.CourseSchedule;
@@ -36,8 +35,6 @@ public class EduActivityUserMapperController extends BaseController {
     @Autowired
     private OrganizationService organizationService;
     @Autowired
-    private TeacherDao teacherDao;
-    @Autowired
     private SysUserService sysUserService;
 
     @ApiOperation(value = "获取老师待排课课程类型列表")