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

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/ClassGroupDao.java

@@ -3,6 +3,7 @@ package com.ym.mec.biz.dal.dao;
 import com.ym.mec.biz.dal.dto.*;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
 import com.ym.mec.common.dal.BaseDAO;
 import com.ym.mec.common.entity.ImGroupModel;
 import com.ym.mec.common.entity.ImUserModel;
@@ -512,11 +513,13 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
     List<ImGroupModel> queryTeacherGroup();
 
     List<ImUserModel> queryImUser();
-    
+
     /**
      * 批量更新班级学生数减一
      * @param classGroupIdList
      * @return
      */
     int batchUpdateStudentNumMinusOne(List<Integer> classGroupIdList);
+
+    int updateTest(@Param("delFlag") YesOrNoEnum delFlag);
 }

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -106,7 +106,7 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
      * @param startTime: 开始时间
      * @param endTime:   结束时间
      * @return int
-     * @describe 统计教师再指定时间区段内存在冲突的课程数量
+     * @describe 统计教师在指定时间区段内存在冲突的课程数量
      * @author Joburgess
      * @date 2019/10/28
      */

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

@@ -0,0 +1,31 @@
+package com.ym.mec.biz.dal.dto;
+
+import com.ym.mec.biz.dal.enums.AuditStatusEnum;
+import com.ym.mec.biz.dal.enums.YesOrNoEnum;
+
+/**
+ * @Author Joburgess
+ * @Date 2019/12/1
+ */
+public class TestDto {
+
+    private YesOrNoEnum delFlag;
+
+    private AuditStatusEnum auditStatus;
+
+    public YesOrNoEnum getDelFlag() {
+        return delFlag;
+    }
+
+    public void setDelFlag(YesOrNoEnum delFlag) {
+        this.delFlag = delFlag;
+    }
+
+    public AuditStatusEnum getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(AuditStatusEnum auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+}

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

@@ -906,7 +906,10 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 			throw new BizException("用户信息获取失败");
 		}
 
-		ClassGroup classGroup= classGroupDao.lockByMusicGroupAndType(vipGroupBuyParams.getVipGroupId().toString(),ClassGroupTypeEnum.VIP.getCode());
+		ClassGroup classGroup =classGroupDao.findByMusicGroupAndType(vipGroupBuyParams.getVipGroupId().toString(),ClassGroupTypeEnum.VIP.getCode());
+
+		classGroup= classGroupDao.lockClassGroup(classGroup.getId().longValue());
+
 		if(Objects.isNull(classGroup)){
 			throw new BizException("课程信息错误");
 		}
@@ -1033,7 +1036,7 @@ public class VipGroupServiceImpl extends BaseServiceImpl<Long, VipGroup> impleme
 
 		studentPaymentOrderDao.update(order);
 
-		ClassGroup classGroup=classGroupDao.lockByMusicGroupAndType(vipGroupId.toString(),ClassGroupTypeEnum.VIP.getCode());
+		ClassGroup classGroup=classGroupDao.lockClassGroup(order.getClassGroupId().longValue());
 
 		//将学生加入到班级，更新班级报名状态及人数信息
 		if(!isOk){

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

@@ -873,4 +873,8 @@
           #{classGroupId}
       </foreach>
 	</update>
+    <update id="updateTest">
+      update class_group set del_flag_=#{delFlag,typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler} where id_=1
+    </update>
+
 </mapper>

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

@@ -116,8 +116,9 @@
 
 	<sql id="queryCondition">
 		<where>
+			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
 			<if test="createTime != null">
-				DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
+				AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
 			</if>
 			<if test="musicGroupId != null">
 				and ch.music_group_id_ = #{musicGroupId}
@@ -192,7 +193,9 @@
 			LEFT JOIN course_schedule_teacher_salary csts ON ch.course_schedule_id_=csts.course_schedule_id_
 			LEFT JOIN class_group cg ON ch.class_group_id_=cg.id_
 			LEFT JOIN music_group mg ON cg.music_group_id_=mg.id_
-			WHERE csts.user_id_=#{userId}
+			WHERE
+			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			AND csts.user_id_=#{userId}
 			<if test="classGroupId!=null">
 				AND ch.class_group_id_=#{classGroupId}
 			</if>
@@ -222,6 +225,6 @@
 	</select>
 	
 	<select id="queryTeacerNoReplyNum" resultMap="Mapper">
-		select cs.actual_teacher_id_ key_,count(1) value_ from student_course_homework sch left join course_schedule cs on sch.course_schedule_id_ = cs.id_ where csh.is_replied_ = 0 group by cs.actual_teacher_id_
+		select cs.actual_teacher_id_ key_,count(1) value_ from student_course_homework sch left join course_schedule cs on sch.course_schedule_id_ = cs.id_ where (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL) AND csh.is_replied_ = 0 group by cs.actual_teacher_id_
 	</select>
 </mapper>

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

@@ -410,7 +410,9 @@
             LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
             LEFT JOIN sys_user su ON cs.teacher_id_=su.id_
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.class_group_id_ AND ta.teacher_id_=cs.teacher_id_
-        WHERE mg.organ_id_ = #{organId}
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND mg.organ_id_ = #{organId}
         AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
         <include refid="global.limit"/>
@@ -423,7 +425,9 @@
         music_group mg
         LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
-        WHERE mg.organ_id_ = #{organId}
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND mg.organ_id_ = #{organId}
         AND cs.id_ IS NOT NULL AND cg.group_type_ = 'MUSIC'
         AND cs.class_date_ = DATE_FORMAT(#{date},'%Y-%m-%d')
     </select>
@@ -449,7 +453,8 @@
             LEFT JOIN course_schedule_complaints csc ON csc.course_schedule_id_=cssp.course_schedule_id_ AND csc.user_id_=#{studentId}
             LEFT JOIN student_attendance sa ON sa.course_schedule_id_ = cs.id_  AND sa.user_id_=#{studentId}
         WHERE
-          cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         AND cssp.user_id_ = #{studentId}
         <if test="quitClassGroupIds != null and quitClassGroupIds.size()>0">
             AND cssp.class_group_id_ NOT IN
@@ -487,7 +492,8 @@
             LEFT JOIN school s ON cs.schoole_id_ = s.id_
             LEFT JOIN teacher_attendance ta ON cs.id_=ta.course_schedule_id_ AND ta.teacher_id_=#{teacherId}
         WHERE
-        cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.class_date_ = DATE_FORMAT(#{classDate},'%Y%m%d')
         <if test="type!=null and type!=''">
             AND cs.type_=#{type}
         </if>
@@ -619,7 +625,8 @@
         course_schedule_student_payment cssp
         LEFT JOIN course_schedule cs ON cssp.course_schedule_id_=cs.id_
         WHERE
-        cssp.user_id_ = #{studentId}
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cssp.user_id_ = #{studentId}
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
@@ -641,7 +648,8 @@
             LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
             LEFT JOIN class_group cg ON cs.class_group_id_ = cg.id_
         WHERE
-          csts.user_id_ = #{teacherId}
+          (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+          AND csts.user_id_ = #{teacherId}
           AND cg.del_flag_ = 0
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
@@ -663,7 +671,8 @@
         LEFT JOIN class_group cg ON mg.id_ = cg.music_group_id_
         LEFT JOIN course_schedule cs ON cg.id_ = cs.class_group_id_
         WHERE
-        mg.organ_id_ = #{organId} AND cs.id_ IS NOT NULL
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND mg.organ_id_ = #{organId} AND cs.id_ IS NOT NULL
         <if test="month==null">
             AND DATE_FORMAT( NOW(), '%Y%m' ) = DATE_FORMAT( cs.class_date_, '%Y%m' )
         </if>
@@ -689,7 +698,8 @@
 
     <sql id="queryStudentCourseScheduleRecordCondition">
         <where>
-            sa.user_id_=#{userId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND sa.user_id_=#{userId}
             AND cs.status_='OVER'
             <if test="teachMode!=null and teachMode!=''">
                 AND cs.teach_mode_=#{teachMode}
@@ -735,22 +745,24 @@
     </select>
     <select id="findStudentCourseScheduleNotStartRecords" resultMap="studentCourseScheduleRecord">
         SELECT
-        cs.teacher_id_,
-        su.username_ teacher_name_,
-        cs.id_ course_schedule_id_,
-        cs.name_,
-        cs.class_date_,
-        CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
-        CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
-        cs.teach_mode_,
-        (cg.total_class_times_-cg.current_class_times_) rest_of_class_
+            cs.teacher_id_,
+            su.username_ teacher_name_,
+            cs.id_ course_schedule_id_,
+            cs.name_,
+            cs.class_date_,
+            CONCAT(cs.class_date_,' ',cs.start_class_time_) start_class_time_,
+            CONCAT(cs.class_date_,' ',cs.end_class_time_) end_class_time_,
+            cs.teach_mode_,
+            (cg.total_class_times_-cg.current_class_times_) rest_of_class_
         FROM
-        class_group_student_mapper cgsm
-        LEFT JOIN course_schedule cs ON cs.class_group_id_=cgsm.class_group_id_
-        LEFT JOIN sys_user su ON cs.teacher_id_ = su.id_
-        LEFT JOIN class_group cg ON cgsm.class_group_id_=cg.id_
-        WHERE cs.status_='NOT_START' AND cgsm.user_id_=#{userId}
-        AND cs.class_date_=DATE_FORMAT(#{date},'%Y%m%d') AND cgsm.status_ != 'QUIT'
+            class_group_student_mapper cgsm
+            LEFT JOIN course_schedule cs ON cs.class_group_id_=cgsm.class_group_id_
+            LEFT JOIN sys_user su ON cs.teacher_id_ = su.id_
+            LEFT JOIN class_group cg ON cgsm.class_group_id_=cg.id_
+        WHERE
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cs.status_='NOT_START' AND cgsm.user_id_=#{userId}
+            AND cs.class_date_=DATE_FORMAT(#{date},'%Y%m%d') AND cgsm.status_ != 'QUIT'
         ORDER BY cs.class_date_,cs.start_class_time_
     </select>
     <select id="findCourseScheduleByMusicGroup" resultMap="CourseSchedule">
@@ -759,7 +771,9 @@
         FROM
         class_group cg
         LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-        WHERE cg.music_group_id_=#{musicGroupId}
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cg.music_group_id_=#{musicGroupId}
     </select>
     <select id="countClassTimes" resultType="int">
         SELECT
@@ -954,7 +968,8 @@
 
     <sql id="teacherClassCourseScheduleQueryCondition">
         <where>
-            cs.class_group_id_ = #{classGroupId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cs.class_group_id_ = #{classGroupId}
             AND csts.user_id_ = #{userId}
             AND csts.expect_salary_ != 0
             <if test="onlyHistory!=null and onlyHistory==1">
@@ -1013,7 +1028,9 @@
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
         LEFT JOIN sys_user su ON cs.actual_teacher_id_ = su.id_
         LEFT JOIN sys_user ssu ON sa.user_id_=ssu.id_
-        WHERE sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
         GROUP BY sa.course_schedule_id_
         ORDER BY cs.id_
         <include refid="global.limit"/>
@@ -1032,7 +1049,9 @@
             COUNT(DISTINCT sa.class_group_id_)
         FROM
             student_attendance sa
-        WHERE sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND sa.class_group_id_=#{classGroupId} AND sa.teacher_id_=#{userId}
     </select>
     <select id="countClassCourseNumByMusicGroup" resultType="java.util.Map">
         SELECT
@@ -1041,7 +1060,9 @@
         FROM
             class_group cg
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
-            WHERE music_group_id_ = #{musicGroupId}
+            WHERE
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND music_group_id_ = #{musicGroupId}
             GROUP BY cg.id_
     </select>
     <select id="findCourseScheduleCurrentTimes" resultType="java.util.Map">
@@ -1139,7 +1160,8 @@
           course_schedule_teacher_salary csts
         LEFT JOIN course_schedule cs ON csts.course_schedule_id_=cs.id_
         WHERE
-            csts.user_id_=#{teacherId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND csts.user_id_=#{teacherId}
             AND cs.class_date_ = DATE_FORMAT( #{classDate}, '%Y-%m-%d' )
             AND DATE_FORMAT( #{startTime}, '%H:%i:%S' ) &lt;= DATE_FORMAT( cs.end_class_time_, '%H:%i:%S' )
             AND DATE_FORMAT( #{endTime}, '%H:%i:%S' ) &gt;= DATE_FORMAT( cs.start_class_time_, '%H:%i:%S' )
@@ -1417,7 +1439,8 @@
             course_schedule_student_payment cssp
             LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
         WHERE
-            cssp.music_group_id_=#{musicGroupId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cssp.music_group_id_=#{musicGroupId}
             AND cssp.group_type_=#{groupType}
             AND cs.status_ = #{status}
             AND cssp.user_id_ = #{userId}

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

@@ -147,7 +147,8 @@
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
 		WHERE
-			cssp.user_id_ = #{userId}
+			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			AND cssp.user_id_ = #{userId}
 			AND cs.status_ = 'NOT_START'
 			AND cs.class_group_id_ = #{classGroupId}
     </select>
@@ -157,7 +158,9 @@
 		FROM
 			course_schedule_student_payment cssp
 			LEFT JOIN course_schedule cs ON cssp.course_schedule_id_ = cs.id_
-		WHERE cs.class_group_id_ = #{classGroupId}
+		WHERE
+		(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+		AND cs.class_group_id_ = #{classGroupId}
     </select>
 
     <delete id="deleteStudentCourseSchedule">

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

@@ -102,7 +102,8 @@
 
 	<sql id="courseScheduleTeacherSalaryQueryPage">
 		<where>
-			csts.settlement_time_ IS NOT NULL AND csts.teacher_role_ IS NOT NULL AND cs.type_ IS NOT NULL
+			(cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+			AND csts.settlement_time_ IS NOT NULL AND csts.teacher_role_ IS NOT NULL AND cs.type_ IS NOT NULL
 			<if test="organId != null">
 				AND su.organ_id_ = #{organId}
 			</if>

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

@@ -277,8 +277,10 @@
             LEFT JOIN class_group cg ON dg.id_=cg.music_group_id_ AND cg.group_type_='DEMO'
             LEFT JOIN course_schedule cs ON cg.id_=cs.class_group_id_
             LEFT JOIN `subject` s ON s.id_ = dg.subject_id_
-        WHERE cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
-          GROUP BY cs.class_date_
+        WHERE
+        (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+        AND cs.type_ = 'DEMO' AND dg.user_id_ = #{teacherId}
+        GROUP BY cs.class_date_
         <include refid="global.limit"/>
     </select>
     <select id="countTeacherDemoGroups" resultType="Integer">

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

@@ -230,6 +230,7 @@
 
     <sql id="queryCondition">
         <where>
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <if test="studentID != null">
                 and sa.user_id_ = #{studentID}
             </if>
@@ -291,7 +292,9 @@
         FROM
             student_attendance sa
             LEFT JOIN course_schedule cs ON sa.course_schedule_id_=cs.id_
-            WHERE sa.class_group_id_=#{classGroupId}
+            WHERE
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND sa.class_group_id_=#{classGroupId}
             AND sa.user_id_ IN
             <foreach collection="userIds" item="userId" open="(" close=")" separator=",">
                 #{userId}

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

@@ -143,7 +143,8 @@
 
     <sql id="queryCondition">
         <where>
-                cg.group_type_ = 'MUSIC'
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cg.group_type_ = 'MUSIC'
             <if test="createTime != null">
                 AND DATE_FORMAT(ch.create_time_,"%Y%m%d") = DATE_FORMAT(#{createTime},"%Y%m%d")
             </if>

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

@@ -185,7 +185,8 @@
 
     <sql id="studentManageCourseQueryCondition">
         <where>
-                cgsm.status_ != 'QUIT'
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cgsm.status_ != 'QUIT'
             <if test="studentId!=null">
                 and cgsm.user_id_ = #{studentId}
             </if>
@@ -237,7 +238,8 @@
 
     <sql id="studentManageAttendanceQueryCondition">
         <where>
-            CONCAT(cs.class_date_," ",cs.start_class_time_) &lt; NOW()
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND CONCAT(cs.class_date_," ",cs.start_class_time_) &lt; NOW()
             <if test="studentId!=null">
                 and sa.user_id_ = #{studentId}
             </if>
@@ -326,7 +328,8 @@
     </select>
     <sql id="studentPaymentSql">
         <where>
-            cs.id_ IS NOT NULL AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND cs.id_ IS NOT NULL AND CONCAT(cs.class_date_,' ',cs.start_class_time_) &lt; NOW()
             <if test="classGroupType != null">
                 AND cs.type_ = #{classGroupType}
             </if>
@@ -438,6 +441,7 @@
 
     <sql id="queryMusicGroupStudentsSignSql">
         <where>
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <if test="musicGroupId != null">
                 AND sa.music_group_id_ = #{musicGroupId}
             </if>

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

@@ -140,6 +140,7 @@
 
     <sql id="queryCondition">
         <where>
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
             <if test="teacherId != null">
                 and ta.teacher_id_ = #{teacherId}
             </if>
@@ -229,7 +230,8 @@
             LEFT JOIN music_group mg ON ta.music_group_id_ = mg.id_
             LEFT JOIN sys_user su ON su.id_ = ta.teacher_id_
         WHERE
-            mg.organ_id_ = #{organId}
+            (cs.del_flag_ != 1 OR cs.del_flag_ IS NULL)
+            AND mg.organ_id_ = #{organId}
             AND ta.sign_in_status_ = #{signInStatus}
             <if test="date==null">
                 AND DATE_FORMAT( ta.sign_in_time_, '%Y%m%d' ) = DATE_FORMAT( NOW(), '%Y%m%d' )

mec-common/common-core/src/main/java/com/ym/mec/common/config/EnumConverterFactory.java

@@ -1,11 +1,10 @@
 package com.ym.mec.common.config;
 
+import com.ym.mec.common.enums.BaseEnum;
 import org.springframework.core.convert.converter.Converter;
 import org.springframework.core.convert.converter.ConverterFactory;
 import org.springframework.stereotype.Component;
 
-import com.ym.mec.common.enums.BaseEnum;
-
 @Component
 public class EnumConverterFactory implements ConverterFactory<String, BaseEnum<?, ?>> {
 

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

@@ -2,6 +2,7 @@ package com.ym.mec.web.controller;
 
 import com.ym.mec.biz.dal.dto.ClassGroup4MixDto;
 import com.ym.mec.biz.dal.dto.HighClassGroupDto;
+import com.ym.mec.biz.dal.dto.TestDto;
 import com.ym.mec.biz.dal.entity.ClassGroup;
 import com.ym.mec.biz.dal.entity.ClassGroupTeacherMapper;
 import com.ym.mec.biz.dal.enums.ClassGroupTypeEnum;
@@ -244,4 +245,9 @@ public class ClassGroupController extends BaseController {
     public HttpResponseResult checkSetSalary(String musicGroupId){
         return succeed(classGroupService.checkSetSalary(musicGroupId));
     }
+
+    @PostMapping("/enumTest")
+    public HttpResponseResult enumTest(@RequestBody TestDto testDto){
+        return succeed(testDto.getDelFlag().getMsg());
+    }
 }