Merge branch 'master' of http://git.dayaedu.com/yonge/mec

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

@@ -23,6 +23,10 @@ public class StudentManageVipGroupClassDto {
     private String activeName;
 
     private Date courseStartDate;
+    
+    private Integer eduTeacherId;
+    
+    private String eduTeacherName;
 
     public Integer getCurrentClassTimes() {
         return currentClassTimes;
@@ -103,4 +107,20 @@ public class StudentManageVipGroupClassDto {
     public void setCourseStartDate(Date courseStartDate) {
         this.courseStartDate = courseStartDate;
     }
+
+	public Integer getEduTeacherId() {
+		return eduTeacherId;
+	}
+
+	public void setEduTeacherId(Integer eduTeacherId) {
+		this.eduTeacherId = eduTeacherId;
+	}
+
+	public String getEduTeacherName() {
+		return eduTeacherName;
+	}
+
+	public void setEduTeacherName(String eduTeacherName) {
+		this.eduTeacherName = eduTeacherName;
+	}
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/page/VipGroupQueryInfo.java

@@ -24,8 +24,6 @@ public class VipGroupQueryInfo extends QueryInfo {
 
     private Boolean hasEducationalTeacherId;
     
-    private Integer userId;
-
     public Boolean getHasEducationalTeacherId() {
         return hasEducationalTeacherId;
     }
@@ -89,12 +87,4 @@ public class VipGroupQueryInfo extends QueryInfo {
     public void setOrganId(String organId) {
         this.organId = organId;
     }
-
-	public Integer getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Integer userId) {
-		this.userId = userId;
-	}
 }

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

@@ -369,10 +369,12 @@ public class StudentManageServiceImpl implements StudentManageService {
             params.put("offset", pageInfo.getOffset());
             dataList = studentManageDao.findStudentVipGroupClass(params);
             Set<Integer> teacherIds = dataList.stream().map(e -> e.getTeacherId()).collect(Collectors.toSet());
+            teacherIds.addAll(dataList.stream().map(e -> e.getEduTeacherId()).collect(Collectors.toSet()));
             List<Map<Integer, String>> maps = teacherDao.queryNameByIds(StringUtils.join(teacherIds, ","));
             Map<Integer, String> teacherNameMap = MapUtil.convertMybatisMap(maps);
             dataList.forEach(e->{
                 e.setTeacherName(teacherNameMap.get(e.getTeacherId()));
+                e.setEduTeacherName(teacherNameMap.get(e.getEduTeacherId()));
             });
         }
         if (count == 0) {

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

@@ -538,6 +538,7 @@
         <result property="vipGroupName" column="vip_group_name_"/>
         <result property="vipGroupStatus" column="status_"/>
         <result property="teacherId" column="user_id_"/>
+        <result property="eduTeacherId" column="educational_teacher_id_"/>
         <result property="studentNum" column="student_num_"/>
         <result property="activeName" column="name_"/>
         <result property="courseStartDate" column="courses_start_date"/>
@@ -545,7 +546,7 @@
         <result property="totalClassTimes" column="total_class_times_"/>
     </resultMap>
     <select id="findStudentVipGroupClass" resultMap="StudentManageVipGroupClassDto">
-        SELECT vg.id_,vg.name_ vip_group_name_,vg.group_status_ status_,vg.user_id_,cg.student_num_,
+        SELECT vg.id_,vg.name_ vip_group_name_,vg.group_status_ status_,vg.user_id_,vg.educational_teacher_id_,cg.student_num_,
         vgc.name_,vg.courses_start_date,cg.current_class_times_,cg.total_class_times_
         FROM class_group_student_mapper cgsm
         LEFT JOIN class_group cg ON cgsm.class_group_id_ = cg.id_

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

@@ -189,9 +189,6 @@
             <if test="educationalTeacherId!=null">
                 AND vg.educational_teacher_id_=#{educationalTeacherId}
             </if>
-            <if test="userId!=null">
-                AND cssp.user_id_ = #{userId}
-            </if>
         </where>
     </sql>
 
@@ -204,24 +201,17 @@
             vip_group vg
             LEFT JOIN sys_user su ON vg.user_id_=su.id_
             LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_=vga.id_
-            left join course_schedule_student_payment cssp on cssp.music_group_id_ = vg.id_ and cssp.group_type_ = 'VIP'
         <include refid="vipGroupQueryCondition"/>
-        group by vg.id_
         ORDER BY vg.id_ DESC
         <include refid="global.limit"/>
 	</select>
 
     <select id="countVipGroupByOrgan" resultType="int">
-    	select count(*) from
-    	(
-        SELECT
-        count(distinct vg.id_)
+    	SELECT
+        count(*)
         FROM
         vip_group vg
-        left join course_schedule_student_payment cssp on cssp.music_group_id_ = vg.id_ and cssp.group_type_ = 'VIP'
         <include refid="vipGroupQueryCondition"/>
-        GROUP BY vg.id_
-        ) t
     </select>
 
     <!-- 向数据库增加一条记录 -->