update

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

@@ -335,6 +335,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                     courseSchedule.setUpdateTime(date);
                     courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                     courseSchedule.setType(CourseSchedule.CourseScheduleType.HIGH);
+                    courseSchedule.setGroupType(GroupType.MUSIC);
                     courseSchedule.setName(courseScheduleName + "-" + CourseSchedule.CourseScheduleType.HIGH.getMsg());
                     courseScheduleList.add(courseSchedule);
                     times++;
@@ -1012,6 +1013,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setUpdateTime(date);
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
+                courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
 
                 courseScheduleDao.insert(courseSchedule);
@@ -1219,6 +1221,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
+                courseSchedule.setGroupType(GroupType.MUSIC);
 
                 courseScheduleDao.insert(courseSchedule);
 
@@ -1422,6 +1425,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 courseSchedule.setUpdateTime(date);
                 courseSchedule.setTeachMode(TeachModeEnum.OFFLINE);
                 courseSchedule.setType(classGroup4MixDto.getCourseType());
+                courseSchedule.setGroupType(GroupType.MUSIC);
                 courseSchedule.setName(subjectNames + "-" + CourseSchedule.CourseScheduleType.SINGLE.getMsg());
 
                 courseScheduleDao.insert(courseSchedule);

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

@@ -3,9 +3,11 @@ package com.ym.mec.biz.service.impl;
 import com.ym.mec.auth.api.client.SysUserFeignService;
 import com.ym.mec.auth.api.entity.SysUser;
 import com.ym.mec.biz.dal.dao.CourseHomeworkDao;
+import com.ym.mec.biz.dal.dao.CourseScheduleDao;
 import com.ym.mec.biz.dal.dao.StudentCourseHomeworkDao;
 import com.ym.mec.biz.dal.dto.CourseHomeworkStudentDetailDto;
 import com.ym.mec.biz.dal.entity.CourseHomework;
+import com.ym.mec.biz.dal.entity.CourseSchedule;
 import com.ym.mec.biz.dal.entity.StudentCourseHomework;
 import com.ym.mec.biz.dal.enums.MessageTypeEnum;
 import com.ym.mec.biz.dal.enums.YesOrNoEnum;
@@ -38,7 +40,8 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 	private CourseHomeworkService courseHomeworkService;
 	@Autowired
 	private CourseHomeworkDao courseHomeworkDao;
-
+	@Autowired
+	private CourseScheduleDao courseScheduleDao;
 	@Autowired
 	private SysUserFeignService sysUserFeignService;
 
@@ -60,9 +63,13 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 		bean.setStatus(YesOrNoEnum.YES);
 		long insert = super.insert(bean);
 
+		CourseSchedule courseSchedule = courseScheduleDao.get(bean.getCourseScheduleId());
+
 		CourseHomework courseHomework = new CourseHomework();
 		courseHomework.setId(bean.getCourseHomeworkId());
+		courseHomework.setGroupType(courseSchedule.getGroupType());
 		courseHomework.setCompletedNum(studentCourseHomeworkDao.countCompletedStudentNum(bean.getCourseHomeworkId()));
+
 		courseHomeworkService.update(courseHomework);
 		return insert;
 	}
@@ -117,4 +124,4 @@ public class StudentCourseHomeworkServiceImpl extends BaseServiceImpl<Long, Stud
 					.getMusicGroup().getName(), sch.getCourseHomework().getClassGroup().getName());
 		}
 	}
-}
+}

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

@@ -282,6 +282,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 		classGroupTeacherSalary.setUserId(vipGroupApplyBaseInfoDto.getUserId());
 		classGroupTeacherSalary.setSalary(vipGroupApplyBaseInfoDto.getOfflineTeacherSalary());
 		classGroupTeacherSalary.setOnlineClassesSalary(vipGroupApplyBaseInfoDto.getOnlineTeacherSalary());
+		classGroupTeacherSalary.setGroupType(GroupType.VIP);
 		classGroupTeacherSalaryDao.insert(classGroupTeacherSalary);
 
 		//课程信息调整

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

@@ -415,60 +415,57 @@
 
     <select id="findTeacherMusicClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
-        cg.id_ class_group_id_,
-        cg.name_ class_group_name_,
-        cg.student_num_,
-        cg.current_class_times_,
-        cg.total_class_times_,
-        cg.subject_id_list_,
-        cg.type_,
-        COUNT(cg.id_) surplus_class_times_,
-        mg.id_ music_group_id_,
-        mg.name_ music_group_name_,
-        s.id_ school_id_,
-        s.name_ school_name_
+            cg.id_ class_group_id_,
+            cg.name_ class_group_name_,
+            cg.student_num_,
+            cg.current_class_times_,
+            cg.total_class_times_,
+            cg.subject_id_list_,
+            cg.type_,
+            COUNT(cg.id_) surplus_class_times_,
+            mg.id_ music_group_id_,
+            mg.name_ music_group_name_,
+            s.id_ school_id_,
+            s.name_ school_name_
         FROM
-        course_schedule_teacher_salary csts
-        LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
-        LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
-        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN school s ON mg.school_id_ = s.id_
+            course_schedule_teacher_salary csts
+            LEFT JOIN course_schedule cs ON cs.id_ = csts.course_schedule_id_
+            LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
+            LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
+            LEFT JOIN school s ON mg.school_id_ = s.id_
         WHERE
-        csts.user_id_ = #{teacherId}
-        AND cs.status_ != 'OVER'
-        AND cs.type_ != 'VIP'
-        AND cs.type_ != 'DEMO'
-        AND csts.expect_salary_!=0
-        AND cg.del_flag_ = 0
+            csts.user_id_ = #{teacherId}
+            AND cg.group_type_='MUSIC'
+            AND csts.expect_salary_!=0
+            AND cg.del_flag_ = 0
         GROUP BY cg.id_
     </select>
     <select id="findTeacherVipClassGroup" resultMap="TeacherClassGroupDto">
         SELECT
-        cg.id_ class_group_id_,
-        cg.name_ class_group_name_,
-        cg.type_,
-        cg.subject_id_list_,
-        vg.payment_expire_date_,
-        vg.courses_expire_date_,
-        vg.single_class_minutes_,
-        vg.courses_start_date,
-        IF(vg.online_classes_num_ IS NULL,0,vg.online_classes_num_) online_classes_num_,
-        IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
-        cg.total_class_times_,
-        COUNT(vg.id_) surplus_class_times_,
-        vg.id_ music_group_id_,
-        vg.name_ music_group_name_,
-        s.id_ school_id_,
-        s.name_ school_name_
+            cg.id_ class_group_id_,
+            cg.name_ class_group_name_,
+            cg.type_,
+            cg.subject_id_list_,
+            vg.payment_expire_date_,
+            vg.courses_expire_date_,
+            vg.single_class_minutes_,
+            vg.courses_start_date,
+            IF(vg.online_classes_num_ IS NULL,0,vg.online_classes_num_) online_classes_num_,
+            IF(vg.offline_classes_num_ IS NULL,0,vg.offline_classes_num_) offline_classes_num_,
+            cg.total_class_times_,
+            COUNT(vg.id_) surplus_class_times_,
+            vg.id_ music_group_id_,
+            vg.name_ music_group_name_,
+            s.id_ school_id_,
+            s.name_ school_name_
         FROM
-        vip_group vg
-        LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_
-        LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        LEFT JOIN music_group mg ON cg.music_group_id_ = mg.id_
-        LEFT JOIN school s ON vg.teacher_school_id_ = s.id_
+            vip_group vg
+            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_='VIP'
+            LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
+            LEFT JOIN school s ON vg.teacher_school_id_ = s.id_
         WHERE
-        vg.user_id_ = #{teacherId}
-        AND cg.del_flag_ = 0
+            vg.user_id_ = #{teacherId}
+            AND cg.del_flag_ = 0
         GROUP BY
         vg.id_,cg.id_
     </select>

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

@@ -796,7 +796,7 @@
         FROM
         	course_schedule cs
         WHERE
-          cs.music_group_id_ =#{vipGroupId}
+          cs.music_group_id_ =#{vipGroupId} AND cg.group_type_ = 'VIP'
     </select>
     <select id="findByClassGroupAndDate" resultMap="CourseSchedule">
         SELECT

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

@@ -190,7 +190,7 @@
 			csts.*
 		FROM
 			vip_group vg
-			LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_
+			LEFT JOIN course_schedule cs ON vg.id_ = cs.music_group_id_ AND cs.group_type_='VIP'
 			LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
 			<include refid="vipGroupSalaryQueryCondition"/>
 		ORDER BY id_

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

@@ -190,7 +190,7 @@
                 and cgsm.user_id_=#{studentId}
             </if>
             <if test="musicGroupId!=null">
-                and cg.music_group_id_=#{musicGroupId}
+                and cg.music_group_id_=#{musicGroupId} AND cg.group_type_='MUSIC'
             </if>
             <if test="classGroupType!=null">
                 and cg.type_=#{classGroupType}
@@ -205,7 +205,7 @@
                 and su.username_ like CONCAT("%",#{teacherName},"%")
             </if>
             <if test="vipGroupId!=null">
-                and cg.music_group_id_=#{vipGroupId}
+                and cg.music_group_id_=#{vipGroupId} AND cg.group_type_='VIP'
             </if>
         </where>
     </sql>

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

@@ -310,7 +310,7 @@
             vgc.name_ category_name_
         FROM
             vip_group vg
-            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_
+            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
             LEFT JOIN teacher t ON vg.user_id_=t.id_
             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_
@@ -324,7 +324,7 @@
             count(*)
         FROM
             vip_group vg
-        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_
+        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.id_ AND cg.group_type_ = 'VIP'
         <include refid="studentVipGroupQueryCondition"/>
     </select>
     <select id="getVipGroupBaseInfo" resultMap="vipGroupManageDetailDto">
@@ -341,7 +341,7 @@
         FROM
             vip_group vg
             LEFT JOIN sys_user su ON vg.user_id_=su.id_
-            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_
+            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
             LEFT JOIN vip_group_activity vga ON vg.vip_group_activity_id_=vga.id_
             LEFT JOIN vip_group_category vgc ON vg.vip_group_category_id_=vgc.id_
             LEFT JOIN school s ON vg.teacher_school_id_=s.id_
@@ -372,7 +372,7 @@
             cs.*
         FROM
             vip_group vg
-            LEFT JOIN teacher_attendance ta ON vg.id_=ta.music_group_id_
+            LEFT JOIN teacher_attendance ta ON vg.id_=ta.music_group_id_ AND ta.group_type_ = 'VIP'
             LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
         <include refid="vipGroupAttendanceQueryCondition"/>
         ORDER BY ta.id_
@@ -383,7 +383,7 @@
         count(*)
         FROM
         vip_group vg
-        LEFT JOIN teacher_attendance ta ON vg.id_=ta.music_group_id_
+        LEFT JOIN teacher_attendance ta ON vg.id_=ta.music_group_id_ AND ta.group_type_ = 'VIP'
         LEFT JOIN course_schedule cs ON ta.course_schedule_id_=cs.id_
         <include refid="vipGroupAttendanceQueryCondition"/>
         ORDER BY ta.id_
@@ -415,7 +415,7 @@
             cs.name_
         FROM
             vip_group vg
-            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_
+            LEFT JOIN class_group cg ON vg.id_=cg.music_group_id_ AND cg.group_type_ = 'VIP'
             LEFT JOIN course_schedule cs ON vgcgm.class_group_id_=cs.class_group_id_
 	        LEFT JOIN school s ON vg.teacher_school_id_=s.id_
             LEFT JOIN teacher t ON vg.user_id_=t.id_
@@ -573,7 +573,7 @@
              SUM(csts.actual_salary_) totalSalary
         FROM
             vip_group vg
-            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_
+            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_ AND cs.group_type_ = 'VIP'
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
         WHERE vg.id_=#{vipGroupId} AND cs.id_ IS NOT NULL
     </select>
@@ -582,7 +582,7 @@
              COUNT(csts.id_)
         FROM
             vip_group vg
-            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_
+            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_ AND cs.group_type_='VIP'
             LEFT JOIN course_schedule_teacher_salary csts ON cs.id_=csts.course_schedule_id_
         WHERE vg.id_=#{vipGroupId} AND cs.id_!=NULL AND csts.settlement_time_!=NULL AND csts.actual_salary_&lt;csts.expect_salary_
     </select>
@@ -593,7 +593,7 @@
             SUM(cssp.expect_price_) as 'value'
         FROM
             vip_group vg
-            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_
+            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_ AND cs.group_type_ = 'VIP'
             LEFT JOIN course_schedule_student_payment cssp ON cs.id_=cssp.course_schedule_id_
             WHERE vg.id_=#{vipGroupId} AND cs.status_='NOT_START'
         GROUP BY cssp.user_id_
@@ -605,7 +605,7 @@
 
     <select id="countTeacherVipClass" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT vg.id_) FROM vip_group vg
-        LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_
+        LEFT JOIN class_group cg ON cg.music_group_id_ = vg.id_ AND cg.group_type_ = 'VIP'
         LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
         WHERE cs.actual_teacher_id_ = #{teacherId} AND cs.type_ = 'VIP' AND cg.del_flag_ = 0
     </select>
@@ -633,7 +633,7 @@
         vg.payment_expire_date_,vg.courses_expire_date_,vg.online_classes_unit_price_,vg.offline_classes_unit_price_,
         cg.total_class_times_,cg.current_class_times_,cg.id_ class_group_id_,cg.student_num_,vg.vip_group_activity_id_
         FROM vip_group vg
-        LEFT JOIN class_group cg ON vg.id_ = cg.music_group_id_
+        LEFT JOIN class_group cg ON vg.id_ = cg.music_group_id_ AND cg.group_type_ = 'VIP'
         LEFT JOIN course_schedule cs ON cs.class_group_id_ = cg.id_
         WHERE cs.actual_teacher_id_ = #{teacherId} AND cs.type_ = 'VIP' AND cg.del_flag_ = 0 GROUP BY vg.id_,cg.id_
         <include refid="global.limit"/>
@@ -664,7 +664,7 @@
             vg.*
         FROM
             vip_group vg
-            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_
+            LEFT JOIN course_schedule cs ON vg.id_=cs.music_group_id_ AND cs.group_type_ = 'VIP'
             WHERE cs.id_=#{courseScheduleId}
     </select>