feat：服务指标/运营指标增加乐团名称

mec-biz/src/main/java/com/ym/mec/biz/dal/entity/CourseSchedule.java

@@ -53,8 +53,6 @@ public class CourseSchedule {
 	/**  */
 	private Long id;
 
-	private Long newCourseId;
-
 	private GroupType groupType;
 
 	/**  */
@@ -160,14 +158,6 @@ public class CourseSchedule {
 
 	private int isSignOut = 3;
 
-	public Long getNewCourseId() {
-		return newCourseId;
-	}
-
-	public void setNewCourseId(Long newCourseId) {
-		this.newCourseId = newCourseId;
-	}
-
 	public Integer getOrganId() {
 		return organId;
 	}

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

@@ -8,7 +8,6 @@
 
     <resultMap type="com.ym.mec.biz.dal.entity.CourseSchedule" id="CourseSchedule">
         <result column="id_" property="id"/>
-        <result column="new_course_id_" property="newCourseId"/>
         <result column="group_type_" property="groupType" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
         <result column="music_group_id_" property="musicGroupId"/>
         <result column="class_group_id_" property="classGroupId"/>
@@ -121,7 +120,6 @@
     <!-- 根据主键查询一条记录 -->
     <select id="get" resultMap="CourseSchedule">
         SELECT id_,
-                new_course_id_,
                music_group_id_,
                group_type_,
                class_group_id_,
@@ -163,10 +161,10 @@
         </selectKey>
         -->
         INSERT INTO course_schedule
-        (id_,new_course_id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
+        (id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
         schoole_id_,is_lock_,note_,teaching_content_,organ_id_)
-        VALUES(#{id},#{newCourseId},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
+        VALUES(#{id},#{groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{musicGroupId},#{classGroupId},
         #{status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{subsidy},#{classDate},#{startClassTime},
         #{endClassTime},#{teacherId},#{teacherId},now(),now(),
         #{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{name},
@@ -177,12 +175,12 @@
     <insert id="batchAddCourseSchedules" parameterType="java.util.List" useGeneratedKeys="true" keyColumn="id"
             keyProperty="id">
         INSERT INTO course_schedule
-        (new_course_id_,group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
+        (group_type_,music_group_id_,class_group_id_,status_,subsidy_,class_date_,start_class_time_,end_class_time_,
         teacher_id_,actual_teacher_id_,create_time_,update_time_,type_,name_,teach_mode_,student_num_,leave_student_num_,
         schoole_id_,is_lock_,note_,teaching_content_,organ_id_)
         VALUE
         <foreach collection="list" item="course" separator=",">
-            (#{newCourseId},#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
+            (#{course.groupType,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},#{course.musicGroupId},
             #{course.classGroupId},#{course.status,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
             #{course.subsidy},#{course.classDate},#{course.startClassTime},#{course.endClassTime},#{course.teacherId},
             #{course.teacherId},now(),now(),#{course.type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler},
@@ -195,9 +193,6 @@
     <update id="update" parameterType="com.ym.mec.biz.dal.entity.CourseSchedule">
         UPDATE course_schedule
         <set>
-            <if test="newCourseId != null">
-                new_course_id_ = #{newCourseId},
-            </if>
             <if test="organId != null">
                 organ_id_ = #{organId},
             </if>
@@ -3214,7 +3209,6 @@
     </select>
     <select id="queryNoStartCourseByTeacherId" resultMap="CourseSchedule">
         SELECT cs.id_,
-               cs.new_course_id_,
                cs.music_group_id_,
                cs.group_type_,
                cs.class_group_id_,
@@ -3254,7 +3248,6 @@
 
     <select id="getTeacherPrevCourseWithStartTime" resultMap="CourseSchedule">
         SELECT  cs.id_,
-                cs.new_course_id_,
                 cs.music_group_id_,
                 cs.group_type_,
                 cs.class_group_id_,
@@ -3285,7 +3278,6 @@
 
     <select id="getTeacherAttendanceCourseBeforeStartTime" resultMap="CourseSchedule">
         SELECT  cs.id_,
-                cs.new_course_id_,
                 cs.music_group_id_,
                 cs.group_type_,
                 cs.class_group_id_,

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

@@ -667,8 +667,14 @@
         GROUP BY mg.organ_id_
     </select>
 
+
+    <resultMap id="UserGroupDto" type="com.ym.mec.biz.dal.dto.UserGroupDto">
+        <result column="user_id_" property="userId"/>
+        <result column="group_id_" property="groupId"/>
+        <result column="group_name_" property="groupName"/>
+    </resultMap>
     <select id="getUserGroups" resultMap="UserGroupDto">
-        SELECT DISTINCT sr.user_id_, mg.name_ FROM student_registration sr
+        SELECT DISTINCT sr.user_id_, mg.id_ group_id_, mg.name_ group_name_ FROM student_registration sr
         LEFT JOIN music_group mg ON sr.music_group_id_=mg.id_
         WHERE sr.payment_status_=2 AND sr.user_id_ IN
         <foreach collection="userIds" item="userId" open="(" close=")" separator=",">