Merge remote-tracking branch 'origin/master'

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

@@ -483,7 +483,7 @@ public interface ClassGroupDao extends BaseDAO<Integer, ClassGroup> {
      * @author Joburgess
      * @date 2019/11/4
      */
-    ClassGroup findByCourseSchedule(Integer courseScheduleId);
+    ClassGroup findByCourseSchedule(@Param("courseScheduleId") Integer courseScheduleId, @Param("delFlag") Integer delFlag);
 
     /**
      * @param maxCourseScheduleId: 合奏班编号

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

@@ -31,7 +31,7 @@ public class CourseSchedule {
 
 		SINGLE("SINGLE", "单技课"), MIX("MIX", "合奏课"), HIGH("HIGH", "小班课"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), COMPREHENSIVE("COMPREHENSIVE", "综合课"), PRACTICE(
 				"PRACTICE", "网管课"), ENLIGHTENMENT("ENLIGHTENMENT", "启蒙课"), TRAINING_SINGLE("TRAINING_SINGLE", "集训单技课"), TRAINING_MIX("TRAINING_MIX", "集训合奏课"), CLASSROOM(
-				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","乐团网管课");
+				"CLASSROOM", "课堂课"),COMM("COMM","对外课程"),HIGH_ONLINE("HIGH_ONLINE","线上基础技能课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 		private String code;
 

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

@@ -2,6 +2,8 @@ package com.ym.mec.biz.dal.entity;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
+import com.ym.mec.biz.dal.entity.MusicGroupStudentFee.PaymentStatus;
+
 /**
  * 对应数据库表(music_group_payment_calender_detail):
  */
@@ -23,7 +25,7 @@ public class MusicGroupPaymentCalenderDetail {
 	private java.math.BigDecimal actualAmount;
 	
 	/**  */
-	private String paymentStatus;
+	private PaymentStatus paymentStatus;
 	
 	/**  */
 	private String userStatus;
@@ -77,11 +79,11 @@ public class MusicGroupPaymentCalenderDetail {
 		return this.actualAmount;
 	}
 			
-	public void setPaymentStatus(String paymentStatus){
+	public void setPaymentStatus(PaymentStatus paymentStatus){
 		this.paymentStatus = paymentStatus;
 	}
 	
-	public String getPaymentStatus(){
+	public PaymentStatus getPaymentStatus(){
 		return this.paymentStatus;
 	}
 			

mec-biz/src/main/java/com/ym/mec/biz/dal/enums/ClassGroupTypeEnum.java

@@ -7,7 +7,7 @@ import com.ym.mec.common.enums.BaseEnum;
  */
 public enum ClassGroupTypeEnum implements BaseEnum<String, ClassGroupTypeEnum> {
 	NORMAL("NORMAL", "普通班级"), MIX("MIX", "合奏班级"), HIGH("HIGH", "提高班"), VIP("VIP", "vip课"), DEMO("DEMO", "试听课"), PRACTICE("PRACTICE", "网管课"), SNAP("SNAP",
-			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "乐团网管课");
+			"临时班级"), COMM("COMM", "对外课程"), HIGH_ONLINE("HIGH_ONLINE", "线上基础技能课"),MUSIC_NETWORK("MUSIC_NETWORK","乐团网管课");
 
 	private String code;
 

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

@@ -699,7 +699,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //获取分页前的所有的乐团编号和vip编号
         params.put("offset", pageInfo.getOffset());
         List<String> musicGroupIds = null;
-        List<Group> groups=new ArrayList<>();
+        List<Group> groups;
         if (queryInfo.isHideOverGroup()) {
             groups = courseScheduleDao.queryMusicGroupIdsWithoutOverGroup(params);
             pageInfo.setTotal(courseScheduleDao.countMusicGroupIdsWithoutOverGroup(params));

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

@@ -71,7 +71,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         ClassGroup classGroup = classGroupService.get(classGroupId);
         Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
         if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) && studentNum <= 3) {
-            throw new BizException("乐团网管课班级人数不能少于3");
+            throw new BizException("线上基础技能课班级人数不能少于3");
         }
 
         ClassGroupStudentMapper classStudentMapper = findClassStudentMapperByUserIdAndClassGroupId(userId, classGroupId, "NORMAL");
@@ -199,7 +199,7 @@ public class ClassGroupStudentMapperServiceImpl extends BaseServiceImpl<Long, Cl
         Integer studentNum = classGroupStudentMapperDao.countClassGroupNormalStudentNum(classGroupId);
         if (classGroup.getType().equals(ClassGroupTypeEnum.HIGH_ONLINE) &&
                 ((studentNum + userIdStrSet.size()) < 3 || (studentNum + userIdStrSet.size()) > 5)) {
-            throw new BizException("乐团网管课班级人数不能小于3大于5");
+            throw new BizException("线上基础技能课班级人数不能小于3大于5");
         }
 
         //1、班级关系添加

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

@@ -4105,7 +4105,7 @@ public class CourseScheduleServiceImpl extends BaseServiceImpl<Long, CourseSched
 				break;
 			case MUSIC:
 				if(courseScheduleId != null){
-					ClassGroup byCourseSchedule = classGroupDao.findByCourseSchedule(courseScheduleId.intValue());
+					ClassGroup byCourseSchedule = classGroupDao.findByCourseSchedule(courseScheduleId.intValue(),null);
 					resultMap.put("groupName",byCourseSchedule.getName());
 					ClassGroupTeacherMapper groupTeachersRole = classGroupTeacherMapperService.getClassGroupTeachersRole(byCourseSchedule.getId(), "BISHOP");
 					if(groupTeachersRole != null){

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

@@ -1819,7 +1819,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
             courseScheduleTeacherSalaryDao.update(courseScheduleTeacherSalary);
         }
         Teacher teacher = teacherDao.get(teacherId);
-        MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue()).getMusicGroupId());
+        MusicGroup musicGroup = musicGroupDao.get(classGroupDao.findByCourseSchedule(courseScheduleId.intValue(),0).getMusicGroupId());
         Set<Integer> roleIds = new HashSet<>(1);
         roleIds.add(SysUserRole.SECTION_MANAGER);
 

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

@@ -459,7 +459,7 @@ public class StudentAttendanceServiceImpl extends BaseServiceImpl<Long, StudentA
 	@Transactional(rollbackFor = Exception.class, isolation = Isolation.READ_COMMITTED)
 	public void addStudentAttendanceRecord(Integer courseScheduleId, Integer userId, StudentAttendanceStatusEnum statusEnum,SignStatusEnum signStatusEnum) {
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
-		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId);
+		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId,0);
 		StudentAttendance studentAttendance = studentAttendanceDao.findByStatusAndCourseScheduleId(userId,courseScheduleId);
 		Date date = new Date();
 		if(studentAttendance == null){

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

@@ -241,7 +241,7 @@ public class TeacherAttendanceServiceImpl extends BaseServiceImpl<Long, TeacherA
 	@Transactional(rollbackFor = Exception.class)
 	public void addTeacherAttendanceRecord(Integer courseScheduleId, Integer userId, SignStatusEnum signStatus, boolean updateCourseScheduleStatus) {
 		TeacherAttendance teacherAttendance=teacherAttendanceDao.findByTeacherAttendanceInfo(userId.longValue(),courseScheduleId.longValue());
-		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId);
+		ClassGroup classGroup = classGroupDao.findByCourseSchedule(courseScheduleId,0);
 		CourseSchedule courseSchedule = courseScheduleDao.get(courseScheduleId.longValue());
 
 		if(Objects.isNull(teacherAttendance)){

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

@@ -936,7 +936,10 @@
         FROM
         course_schedule cs
         LEFT JOIN class_group cg ON cs.class_group_id_=cg.id_
-        WHERE cs.id_=#{courseScheduleId} AND cg.del_flag_ = 0
+        WHERE cs.id_=#{courseScheduleId}
+        <if test="delFlag != null">
+            AND cg.del_flag_ = #{delFlag}
+        </if>
     </select>
     <select id="findClassGroupsByMixClassGroup" resultMap="ClassGroup">
         SELECT

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

@@ -134,12 +134,6 @@
         <if test="search">
             AND (username_ LIKE CONCAT(#{search},'%') OR phone_ LIKE CONCAT(#{search},'%'))
         </if>
-        AND id_ NOT IN (
-        SELECT cssp.user_id_
-        FROM music_group mg
-        LEFT JOIN course_schedule_student_payment cssp ON mg.id_ = cssp.music_group_id_
-        WHERE cssp.group_type_ = 'MUSIC'
-        AND mg.repair_user_id_ != #{employeeId})
         <include refid="global.limit"/>
     </select>
 
@@ -150,13 +144,6 @@
         <if test="search">
             AND (username_ LIKE CONCAT(#{search},'%') OR phone_ LIKE CONCAT(#{search},'%'))
         </if>
-        AND id_ NOT IN (
-        SELECT cssp.user_id_
-        FROM music_group mg
-        LEFT JOIN course_schedule_student_payment cssp ON mg.id_ = cssp.music_group_id_
-        WHERE cssp.group_type_ = 'MUSIC'
-        AND mg.repair_user_id_ != #{employeeId}
-        )
     </select>
 
     <select id="queryPage" resultMap="StudentRepair">