平衡关系导出

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

@@ -476,6 +476,9 @@ public class ExportWrapper {
         @ApiModelProperty("课程类型")
         private String courseType;
 
+        @ApiModelProperty("课程类型")
+        private String courseTypeCode;
+
         @ApiModelProperty("老师编号")
         private Integer teacherId;
 

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

@@ -4351,7 +4351,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 			Map<String, TeacherDefaultMusicGroupSalary> collect = teacherSalaryList.stream().collect(Collectors.toMap(e->e.getCourseScheduleType().getCode(), teacherDefaultMusicGroupSalary -> teacherDefaultMusicGroupSalary));
 
 			TeacherDefaultMusicGroupSalary teacherDefaultMusicGroupSalary =
-					collect.get(StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH.getCode())? CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode():noCour.getCourseType());
+					collect.get(StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH.getCode())? CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode():noCour.getCourseTypeCode());
 
 			if (teacherDefaultMusicGroupSalary == null) {
 				continue;
@@ -4367,11 +4367,11 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 
 			salary = baseSalary.multiply(classTimeDuty).setScale(2, RoundingMode.HALF_UP);
 			//课堂课课酬
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.CLASSROOM.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.CLASSROOM.getCode())) {
 				salary = teacherDefaultMusicGroupSalary.getMainTeacher90MinSalary();
 			}
 			//基础技能提高课
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode()) || StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.HIGH.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH_ONLINE.getCode()) || StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.HIGH.getCode())) {
 
 				if(StringUtils.isBlank(teacherDefaultMusicGroupSalary.getSalaryRuleJson())){
 					continue;
@@ -4387,7 +4387,7 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
 				salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal(studentNum+"");
 			}
 
-			if (StringUtils.equals(noCour.getCourseType(),CourseSchedule.CourseScheduleType.MUSIC_NETWORK.getCode())) {
+			if (StringUtils.equals(noCour.getCourseTypeCode(),CourseSchedule.CourseScheduleType.MUSIC_NETWORK.getCode())) {
 				salary = JSON.parseObject(teacherDefaultMusicGroupSalary.getSalaryRuleJson()).getBigDecimal("1");
 			}
 

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

@@ -1336,7 +1336,7 @@
     <select id="exportBalancedRelationshipMusicNoCourse"
             resultType="com.ym.mec.biz.dal.dto.ExportWrapper$ExportBalancedRelationshipMusicNoCourse">
         select o.name_ organName,mg.name_ musicGroupName,cgtm.user_id_,cgsm.class_group_id_ classId,
-               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cgtm.user_id_ teacherId,
+               mgpscd.music_group_id_ musicGroupId,cg.name_ className,cgtm.user_id_ teacherId,cg.type_ courseTypeCode,
         CASE WHEN cg.type_ = 'NORMAL' THEN '声部班'
         WHEN cg.type_ = 'MIX' THEN '合奏班'
         WHEN cg.type_ = 'HIGH' THEN '基础技能班'