Merge remote-tracking branch 'origin/master'

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

@@ -11,7 +11,8 @@ public enum SalarySettlementTypeEnum implements BaseEnum<String,SalarySettlement
     TEACHER_DEFAULT("TEACHER_DEFAULT","老师默认课酬"),
     RATIO_DISCOUNT("RATIO_DISCOUNT","课程单价比例折扣"),
     FIXED_SALARY("FIXED_SALARY","固定课酬"),
-    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬");
+    GRADIENT_SALARY("GRADIENT_SALARY","梯度课酬"),
+    CLASSROOM_SALARY("CLASSROOM_SALARY","课堂课课酬");
 
     private String code;
 

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

@@ -436,6 +436,7 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
         //乐团班级及班级老师
         List<ClassGroupTeachersDto> classGroupAndTeachers = getClassGroupAndTeachers(musicGroupId, "NORMAL,MIX,HIGH", classGroupId);
         BigDecimal zeroSalary = new BigDecimal(0);
+        MusicGroup musicGroup = musicGroupDao.get(musicGroupId);
         for (ClassGroupTeachersDto classGroupAndTeacher : classGroupAndTeachers) {
             //班级的教师列表
             List<ClassGroupTeacherMapper> classGroupTeacherMapperList = classGroupAndTeacher.getClassGroupTeacherMapperList();
@@ -443,35 +444,18 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
                 //获取老师的默认课酬
                 String courseType = classGroupAndTeacher.getType().equals(ClassGroupTypeEnum.NORMAL) ? "SINGLE" : classGroupAndTeacher.getType().getCode();
 
+                if(musicGroup.getSettlementType().equals(SalarySettlementTypeEnum.CLASSROOM_SALARY)){
+                    courseType = "CLASSROOM_SALARY";
+                }
+
                 List<TeacherDefaultMusicGroupSalary> teacherSalaryByUserIdAndType = teacherDefaultMusicGroupSalaryService.getTeacherSalaryByUserIdAndType(classGroupTeacherMapper.getUserId(), courseType, type);
                 //老师课酬没有设置，设置成0
                 if (teacherSalaryByUserIdAndType == null || teacherSalaryByUserIdAndType.size() == 0) {
-                    if (type.equals(SalarySettlementTypeEnum.GRADIENT_SALARY)) {
-                        String paramName = courseType.equals("SINGLE") ? "sigle_gradient_settlement_rule" : (courseType.equals("MIX") ? "max_gradient_settlement_rule" : "high_gradient_settlement_rule");
-                        SysConfig sysConfig = sysConfigService.findByParamName(paramName);
-
-                        List<Map<String, String>> configs = JSONArray.parseObject(sysConfig.getParanValue(), List.class);
-                        for (Map<String, String> config : configs) {
-                            TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                            //teacherDefaultMusicGroupSalary.setDurationMin(Integer.parseInt(config.get("min")));
-                            //teacherDefaultMusicGroupSalary.setDurationMax(Integer.parseInt(config.get("max")));
-                            //teacherDefaultMusicGroupSalary.setSettlementType(type);
-                            teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
-                            teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
-                            teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
-
-                            teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
-                        }
-                    } else {
-                        TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
-                        teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
-                        teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
-                        //teacherDefaultMusicGroupSalary.setSettlementType(type);
-                        teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
-
-                        teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
-                    }
-
+                    TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary = new TeacherDefaultMusicGroupSalary();
+                    teacherDefaultMusicGroupSalary.setAssistantTeacher30MinSalary(zeroSalary);
+                    teacherDefaultMusicGroupSalary.setMainTeacher30MinSalary(zeroSalary);
+                    teacherDefaultMusicGroupSalary.setUserId(classGroupTeacherMapper.getUserId());
+                    teacherSalaryByUserIdAndType.add(teacherDefaultMusicGroupSalary);
                 }
                 classGroupTeacherMapper.setTeacherDefaultMusicGroupSalaryList(teacherSalaryByUserIdAndType);
             }
@@ -1628,15 +1612,15 @@ public class ClassGroupServiceImpl extends BaseServiceImpl<Integer, ClassGroup>
             ClassGroupTeacherMapper bishopTeacher = classGroupTeacherMapperDao.findByClassGroupAndRole(highClassGroup.getId().longValue(), TeachTypeEnum.BISHOP);
             highClassGroup.setTeacherName(bishopTeacher.getUserName());
             CourseSchedule courseSchedule = courseScheduleDao.findOneCourseScheduleByClassGroupId(highClassGroup.getId());
-            highClassGroup.setStartClassTime(DateUtil.format(courseSchedule.getStartClassTime(),"HH:mm:ss"));
-            highClassGroup.setEndClassTime(DateUtil.format(courseSchedule.getEndClassTime(),"HH:mm:ss"));
+            highClassGroup.setStartClassTime(DateUtil.format(courseSchedule.getStartClassTime(), "HH:mm:ss"));
+            highClassGroup.setEndClassTime(DateUtil.format(courseSchedule.getEndClassTime(), "HH:mm:ss"));
 
             Calendar calendar = Calendar.getInstance();
             calendar.setTime(courseSchedule.getClassDate());
             int dayOfWeek = calendar.get(Calendar.DAY_OF_WEEK);
-            highClassGroup.setDayOfWeek(dayOfWeek-1);
+            highClassGroup.setDayOfWeek(dayOfWeek - 1);
 
         }
-        return  highClassGroupList;
+        return highClassGroupList;
     }
 }

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

@@ -77,6 +77,7 @@ public class ClassGroupController extends BaseController {
         List<HighClassGroupDto> highClassGroups = classGroupService.findClassGroupByMusicGroupIdAndSubjectId(musicGroupId, studentRegistration.getActualSubjectId());
         List<ClassGroupStudentMapper> ClassGroupStudentMapper = classGroupStudentMapperDao.findHighClassGroupHasUser(musicGroupId, userId);
         classGroupAndStatusMap.put("highClassGroups", highClassGroups);
+        classGroupAndStatusMap.put("hasReg", false);
         if (ClassGroupStudentMapper.size() > 0) {
             classGroupAndStatusMap.put("hasReg", true);
         }