乐团缴费不用登陆

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

@@ -282,12 +282,6 @@ public interface ClassGroupService extends BaseService<Integer, ClassGroup> {
      */
     boolean batchIncreaseClassTimes(List<Integer> classGroupList);
 
-    /**
-     * 获取提高班班级
-     * @param musicGroupId
-     * @return
-     */
-    List<ClassGroup> highClassGroupList(String musicGroupId);
 
 
     List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId);

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

@@ -1569,17 +1569,6 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
     }
 
     @Override
-    public List<ClassGroup> highClassGroupList(String musicGroupId) {
-        List<ClassGroup> classGroupList = classGroupDao.findClassGroupByMusicGroupIdAndType(musicGroupId, ClassGroupTypeEnum.HIGH);
-        for (ClassGroup classGroup : classGroupList) {
-            List<String> subjects = subjectService.findBySubIds(classGroup.getSubjectIdList());
-            String subjectName = StringUtils.join(subjects, ",");
-            classGroup.setSubjectName(subjectName);
-        }
-        return classGroupList;
-    }
-
-    @Override
     public List<ClassGroupTeachersDto> classGroupAndTeacher(Integer classGroupId) {
         List<ClassGroupTeachersDto> classGroups = classGroupDao.findClassGroupByMixClassGroupId(classGroupId);
         String classGroupIds = "";

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

@@ -142,7 +142,9 @@
 
     <!-- 查询当前表的总记录数 -->
     <select id="queryCount" resultType="int">
-        SELECT COUNT(*) FROM class_group where del_flag_ = 0
+        SELECT COUNT(*)
+        FROM class_group
+        where del_flag_ = 0
     </select>
 
     <!-- 查询根据主教助教查询班级信息 -->
@@ -207,7 +209,7 @@
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
-		LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
+        LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
         <include refid="global.limit"/>
     </select>
@@ -281,7 +283,7 @@
         FROM student_payment_order spo
         LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
         <where>
-                cg.del_flag_ = 0
+            cg.del_flag_ = 0
             <if test="search != null and search != ''">
                 AND cg.name_ LIKE CONCAT('%',#{search},'%')
             </if>
@@ -307,7 +309,7 @@
         FROM student_payment_order spo
         LEFT JOIN class_group cg ON cg.id_ = spo.class_group_id_
         <where>
-                spo.status_ = 'SUCCESS' AND cg.del_flag_ = 0
+            spo.status_ = 'SUCCESS' AND cg.del_flag_ = 0
             <if test="search != null and search != ''">
                 AND cg.name_ LIKE CONCAT('%',#{search},'%')
             </if>
@@ -362,22 +364,22 @@
     </select>
     <select id="findByVipGroup" resultMap="ClassGroup">
         SELECT
-            cg.*
+        cg.*
         FROM
-            vip_group_class_group_mapper vcgm
-            LEFT JOIN class_group cg ON vcgm.class_group_id_ = cg.id_
-            WHERE vcgm.vip_group_id_=#{vipGroupId}
-            <if test="delFlag!=null">
-                AND cg.del_flag_ = #{delFlag}
-            </if>
+        vip_group_class_group_mapper vcgm
+        LEFT JOIN class_group cg ON vcgm.class_group_id_ = cg.id_
+        WHERE vcgm.vip_group_id_=#{vipGroupId}
+        <if test="delFlag!=null">
+            AND cg.del_flag_ = #{delFlag}
+        </if>
     </select>
 
     <select id="lockClassGroup" resultMap="ClassGroup">
         SELECT
-            cg.*
+        cg.*
         FROM
-            class_group cg
-            WHERE cg.id_=#{classGroupId} FOR UPDATE
+        class_group cg
+        WHERE cg.id_=#{classGroupId} FOR UPDATE
     </select>
     <select id="countTeacherVipNum" resultType="java.util.Map">
         SELECT vg.user_id_ `key`,COUNT(vg.id_) `value` FROM vip_group vg
@@ -407,79 +409,79 @@
 
     <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 cs.status_ != 'OVER'
+        AND cs.type_ != 'VIP'
+        AND cs.type_ != 'DEMO'
+        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 vip_group_class_group_mapper vgcgm ON vg.id_ = vgcgm.vip_group_id_
-            LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.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 vip_group_class_group_mapper vgcgm ON vg.id_ = vgcgm.vip_group_id_
+        LEFT JOIN class_group cg ON vgcgm.class_group_id_=cg.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_
         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_
+        vg.id_,cg.id_
     </select>
     <select id="countGroupCourses" resultType="java.lang.Integer">
         SELECT COUNT(DISTINCT mg.id_)
         FROM class_group_teacher_mapper cgtm
         LEFT JOIN music_group mg ON cgtm.music_group_id_ = mg.id_
         LEFT JOIN class_group cg ON cg.id_ = cgtm.class_group_id_
-		LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
+        LEFT JOIN teacher t ON t.id_ = cgtm.user_id_
         WHERE cgtm.user_id_ = #{search} AND cg.del_flag_ = 0 AND (cg.type_ = 'NORMAL' OR cg.type_ = 'MIX')
     </select>
     <select id="findStudentOrganIdsByClassGroup" resultType="int">
         SELECT
-            DISTINCT su.organ_id_
+        DISTINCT su.organ_id_
         FROM
-            class_group_student_mapper cgsm
-            LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
-            WHERE cgsm.class_group_id_=#{classGroupId}
+        class_group_student_mapper cgsm
+        LEFT JOIN sys_user su ON cgsm.user_id_=su.id_
+        WHERE cgsm.class_group_id_=#{classGroupId}
     </select>
 
     <select id="queryNamesByClassId" resultType="java.util.Map">
@@ -520,7 +522,8 @@
     <select id="countStudyNum" resultType="java.util.Map">
         SELECT cgsm.class_group_id_ 'key',COUNT(cgsm.user_id_) 'value' FROM class_group_student_mapper cgsm
         LEFT JOIN student_registration sr ON (sr.user_id_ = cgsm.user_id_ AND sr.music_group_id_ = cgsm.music_group_id_)
-        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_='NORMAL' AND FIND_IN_SET(sr.music_group_status_,'NORMAL,LEAVE') GROUP BY cgsm.class_group_id_
+        WHERE FIND_IN_SET(cgsm.class_group_id_,#{classGroupIds}) AND cgsm.status_='NORMAL' AND
+        FIND_IN_SET(sr.music_group_status_,'NORMAL,LEAVE') GROUP BY cgsm.class_group_id_
     </select>
 
     <select id="countQuitNum" resultType="java.util.Map">
@@ -531,7 +534,7 @@
 
     <sql id="queryMusicGroupCourseScheduleSql">
         <where>
-                cg.del_flag_ = 0
+            cg.del_flag_ = 0
             <if test="classScheduleType != null">
                 AND cs.type_ = #{classScheduleType}
             </if>
@@ -615,7 +618,8 @@
         <result column="online_classes_num_" property="onlineClassesNum"/>
         <result column="offline_classes_num_" property="offLineClassesNum"/>
         <result column="teacher_school_id_" property="teacherSchoolId"/>
-        <result column="payment_status_" property="paymentStatus" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
+        <result column="payment_status_" property="paymentStatus"
+                typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
     </resultMap>
     <select id="queryStudentVipCourses" resultMap="CourseListDto">
         SELECT cg.id_ class_group_id_,vg.name_ music_group_name_,su.username_,
@@ -635,7 +639,8 @@
         FROM music_group mg
         LEFT JOIN class_group cg ON cg.music_group_id_ = mg.id_
         LEFT JOIN music_group_student_fee_ mgsf ON mgsf.music_group_id_ = mg.id_
-        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.type_ != 'VIP' AND cg.del_flag_ = 0 AND mgsf.user_id_ = #{userId}
+        WHERE FIND_IN_SET(mg.id_,#{musicGroupIds}) AND cg.type_ != 'VIP' AND cg.del_flag_ = 0 AND mgsf.user_id_ =
+        #{userId}
         GROUP BY mg.id_,mgsf.payment_status_
     </select>
 
@@ -649,21 +654,21 @@
     <update id="batchIncreaseClassTimes" parameterType="java.util.List">
         UPDATE class_group SET current_class_times_ = current_class_times_+1,update_time_ = now() WHERE id_ in
         <foreach collection="list" item="item" index="index" open="(" close=")" separator=",">
-        #{item}
+            #{item}
         </foreach>
     </update>
     <update id="batchUpdateClassGroupCourseTimes" parameterType="map">
-      <foreach collection="classGroupCourseTimes.entrySet()" index="key" item="value" open="" close="" separator=";">
-          UPDATE class_group SET total_class_times_=#{value} WHERE id_=#{key}
-      </foreach>
+        <foreach collection="classGroupCourseTimes.entrySet()" index="key" item="value" open="" close="" separator=";">
+            UPDATE class_group SET total_class_times_=#{value} WHERE id_=#{key}
+        </foreach>
     </update>
 
     <select id="findClassGroupByMusicGroupIdAndType" resultMap="ClassGroup">
-        SELECT * FROM class_group  WHERE music_group_id_=#{musicGroupId}
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
         <if test="type !=null ">
-           AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
+            AND type_=#{type,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
         </if>
-         AND del_flag_='0'
+        AND del_flag_='0'
     </select>
 
     <!-- 根据合奏班id获取子班及老师 -->
@@ -674,22 +679,22 @@
     </select>
     <select id="findClassGroupNamesByClassGroups" resultType="string">
         SELECT
-            name_
+        name_
         FROM
-            class_group
+        class_group
         WHERE
-            id_ IN
-            <foreach collection="classGroups" open="(" close=")" item="classGroupId" separator=",">
-                #{classGroupId}
-            </foreach>
+        id_ IN
+        <foreach collection="classGroups" open="(" close=")" item="classGroupId" separator=",">
+            #{classGroupId}
+        </foreach>
         AND del_flag_ = 0
     </select>
     <select id="findByCourseSchedules" resultMap="ClassGroup">
         SELECT
-            cg.*
+        cg.*
         FROM
-            course_schedule cs
-            LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+        course_schedule cs
+        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         WHERE cs.id_ IN
         <foreach collection="courseScheduleIds" item="courseScheduleId" open="(" close=")" separator=",">
             #{courseScheduleId}
@@ -698,17 +703,17 @@
     </select>
     <select id="findByCourseSchedule" resultMap="ClassGroup">
         SELECT
-            cg.*
+        cg.*
         FROM
-            course_schedule cs
-            LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
+        course_schedule cs
+        LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         WHERE cs.id_=#{courseScheduleId} AND cg.del_flag_ = 0
     </select>
     <select id="findClassGroupsByMixClassGroup" resultMap="ClassGroup">
         SELECT
-            cg.*
+        cg.*
         FROM
-            class_group_relation cgr
+        class_group_relation cgr
         LEFT JOIN class_group cg ON cgr.sub_class_group_id_=cg.id_
         WHERE cgr.class_group_id_=#{maxCourseScheduleId} AND cg.del_flag_ = 0
     </select>
@@ -731,7 +736,10 @@
         <result column="current_class_times_" property="currentClassTimes"/>
     </resultMap>
     <select id="findClassGroupByMusicGroupIdAndSubjectId" resultMap="HighClassGroup">
-        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId} AND FIND_IN_SET(#{subjectId},subject_id_list_)
+        SELECT * FROM class_group WHERE music_group_id_=#{musicGroupId}
+        <if test="subjectId != null">
+            AND FIND_IN_SET(#{subjectId},subject_id_list_)
+        </if>
         AND type_='HIGH' AND del_flag_='0';
     </select>
 

mec-web/src/main/java/com/ym/mec/web/controller/ClassGroupController.java

@@ -219,7 +219,7 @@ public class ClassGroupController extends BaseController {
     @PreAuthorize("@pcs.hasPermissions('classGroup/highClassGroups')")
     @ApiImplicitParams({@ApiImplicitParam(name = "musicGroupId", value = "乐团id", required = true, dataType = "String")})
     public HttpResponseResult highClassGroups(String musicGroupId) throws Exception {
-        return succeed(classGroupService.highClassGroupList(musicGroupId));
+        return succeed(classGroupService.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId,null));
     }
 
     @ApiOperation(value = "合奏子班列表（班级调整）")