教师默认课酬导出新增助教课酬

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

@@ -31,34 +31,65 @@ public class TeacherDefaultSalaryDto {
 	private BigDecimal vip7 = new BigDecimal(0);
 	
 	private BigDecimal practiceSalary = new BigDecimal(0);
+
 	
-	private BigDecimal singleSalary2 = new BigDecimal(0);
+	private BigDecimal mainSingleSalary2 = new BigDecimal(0);
 	
-	private BigDecimal mixSalary2 = new BigDecimal(0);
+	private BigDecimal mainMixSalary2 = new BigDecimal(0);
 	
-	private BigDecimal comprehensiveSalary2 = new BigDecimal(0);
+	private BigDecimal mainComprehensiveSalary2 = new BigDecimal(0);
 	
-	private BigDecimal traningSigleSalary2 = new BigDecimal(0);
+	private BigDecimal mainTraningSigleSalary2 = new BigDecimal(0);
 	
-	private BigDecimal traningMixSalary2 = new BigDecimal(0);
+	private BigDecimal mainTraningMixSalary2 = new BigDecimal(0);
 	
-	private BigDecimal highSalary2 = new BigDecimal(0);
+	private BigDecimal mainHighSalary2 = new BigDecimal(0);
 	
-	private BigDecimal classroomSalary2 = new BigDecimal(0);
+	private BigDecimal mainClassroomSalary2 = new BigDecimal(0);
 	
-	private BigDecimal singleSalary = new BigDecimal(0);
+	private BigDecimal mainSingleSalary = new BigDecimal(0);
 	
-	private BigDecimal mixSalary = new BigDecimal(0);
+	private BigDecimal mainMixSalary = new BigDecimal(0);
 	
-	private BigDecimal comprehensiveSalary = new BigDecimal(0);
+	private BigDecimal mainComprehensiveSalary = new BigDecimal(0);
 	
-	private BigDecimal traningSigleSalary = new BigDecimal(0);
+	private BigDecimal mainTraningSigleSalary = new BigDecimal(0);
 	
-	private BigDecimal traningMixSalary = new BigDecimal(0);
+	private BigDecimal mainTraningMixSalary = new BigDecimal(0);
 	
-	private BigDecimal highSalary = new BigDecimal(0);
+	private BigDecimal mainHighSalary = new BigDecimal(0);
+
+	private BigDecimal mainClassroomSalary = new BigDecimal(0);
+
+
+	private BigDecimal assistantSingleSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantMixSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantComprehensiveSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantTraningSigleSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantTraningMixSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantHighSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantClassroomSalary2 = new BigDecimal(0);
+
+	private BigDecimal assistantSingleSalary = new BigDecimal(0);
+
+	private BigDecimal assistantMixSalary = new BigDecimal(0);
+
+	private BigDecimal assistantComprehensiveSalary = new BigDecimal(0);
+
+	private BigDecimal assistantTraningSigleSalary = new BigDecimal(0);
+
+	private BigDecimal assistantTraningMixSalary = new BigDecimal(0);
+
+	private BigDecimal assistantHighSalary = new BigDecimal(0);
 	
-	private BigDecimal classroomSalary = new BigDecimal(0);
+	private BigDecimal assistantClassroomSalary = new BigDecimal(0);
+
 	
 	private BigDecimal highOnline3Salary = new BigDecimal(0);
 	
@@ -68,6 +99,14 @@ public class TeacherDefaultSalaryDto {
 	
 	private BigDecimal musicNetwork1Salary = new BigDecimal(0);
 
+	public BigDecimal getMainClassroomSalary() {
+		return mainClassroomSalary;
+	}
+
+	public void setMainClassroomSalary(BigDecimal mainClassroomSalary) {
+		this.mainClassroomSalary = mainClassroomSalary;
+	}
+
 	public Integer getUserId() {
 		return userId;
 	}
@@ -164,163 +203,266 @@ public class TeacherDefaultSalaryDto {
 		this.practiceSalary = practiceSalary;
 	}
 
-	public BigDecimal getSingleSalary() {
-		return singleSalary;
+	public BigDecimal getHighOnline3Salary() {
+		return highOnline3Salary;
 	}
 
-	public void setSingleSalary(BigDecimal singleSalary) {
-		this.singleSalary = singleSalary;
+	public void setHighOnline3Salary(BigDecimal highOnline3Salary) {
+		this.highOnline3Salary = highOnline3Salary;
 	}
 
-	public BigDecimal getMixSalary() {
-		return mixSalary;
+	public BigDecimal getHighOnline4Salary() {
+		return highOnline4Salary;
 	}
 
-	public void setMixSalary(BigDecimal mixSalary) {
-		this.mixSalary = mixSalary;
+	public void setHighOnline4Salary(BigDecimal highOnline4Salary) {
+		this.highOnline4Salary = highOnline4Salary;
 	}
 
-	public BigDecimal getComprehensiveSalary() {
-		return comprehensiveSalary;
+	public BigDecimal getHighOnline5Salary() {
+		return highOnline5Salary;
 	}
 
-	public void setComprehensiveSalary(BigDecimal comprehensiveSalary) {
-		this.comprehensiveSalary = comprehensiveSalary;
+	public void setHighOnline5Salary(BigDecimal highOnline5Salary) {
+		this.highOnline5Salary = highOnline5Salary;
 	}
 
-	public BigDecimal getTraningSigleSalary() {
-		return traningSigleSalary;
+	public BigDecimal getMusicNetwork1Salary() {
+		return musicNetwork1Salary;
 	}
 
-	public void setTraningSigleSalary(BigDecimal traningSigleSalary) {
-		this.traningSigleSalary = traningSigleSalary;
+	public void setMusicNetwork1Salary(BigDecimal musicNetwork1Salary) {
+		this.musicNetwork1Salary = musicNetwork1Salary;
+	}
+	public BigDecimal getVip6() {
+		return vip6;
 	}
 
-	public BigDecimal getTraningMixSalary() {
-		return traningMixSalary;
+	public void setVip6(BigDecimal vip6) {
+		this.vip6 = vip6;
 	}
 
-	public void setTraningMixSalary(BigDecimal traningMixSalary) {
-		this.traningMixSalary = traningMixSalary;
+	public BigDecimal getVip7() {
+		return vip7;
 	}
 
-	public BigDecimal getHighSalary() {
-		return highSalary;
+	public void setVip7(BigDecimal vip7) {
+		this.vip7 = vip7;
 	}
 
-	public void setHighSalary(BigDecimal highSalary) {
-		this.highSalary = highSalary;
+	public BigDecimal getMainSingleSalary2() {
+		return mainSingleSalary2;
 	}
 
-	public BigDecimal getClassroomSalary() {
-		return classroomSalary;
+	public void setMainSingleSalary2(BigDecimal mainSingleSalary2) {
+		this.mainSingleSalary2 = mainSingleSalary2;
 	}
 
-	public void setClassroomSalary(BigDecimal classroomSalary) {
-		this.classroomSalary = classroomSalary;
+	public BigDecimal getMainMixSalary2() {
+		return mainMixSalary2;
 	}
 
-	public BigDecimal getHighOnline3Salary() {
-		return highOnline3Salary;
+	public void setMainMixSalary2(BigDecimal mainMixSalary2) {
+		this.mainMixSalary2 = mainMixSalary2;
 	}
 
-	public void setHighOnline3Salary(BigDecimal highOnline3Salary) {
-		this.highOnline3Salary = highOnline3Salary;
+	public BigDecimal getMainComprehensiveSalary2() {
+		return mainComprehensiveSalary2;
 	}
 
-	public BigDecimal getHighOnline4Salary() {
-		return highOnline4Salary;
+	public void setMainComprehensiveSalary2(BigDecimal mainComprehensiveSalary2) {
+		this.mainComprehensiveSalary2 = mainComprehensiveSalary2;
 	}
 
-	public void setHighOnline4Salary(BigDecimal highOnline4Salary) {
-		this.highOnline4Salary = highOnline4Salary;
+	public BigDecimal getMainTraningSigleSalary2() {
+		return mainTraningSigleSalary2;
 	}
 
-	public BigDecimal getHighOnline5Salary() {
-		return highOnline5Salary;
+	public void setMainTraningSigleSalary2(BigDecimal mainTraningSigleSalary2) {
+		this.mainTraningSigleSalary2 = mainTraningSigleSalary2;
 	}
 
-	public void setHighOnline5Salary(BigDecimal highOnline5Salary) {
-		this.highOnline5Salary = highOnline5Salary;
+	public BigDecimal getMainTraningMixSalary2() {
+		return mainTraningMixSalary2;
 	}
 
-	public BigDecimal getMusicNetwork1Salary() {
-		return musicNetwork1Salary;
+	public void setMainTraningMixSalary2(BigDecimal mainTraningMixSalary2) {
+		this.mainTraningMixSalary2 = mainTraningMixSalary2;
 	}
 
-	public void setMusicNetwork1Salary(BigDecimal musicNetwork1Salary) {
-		this.musicNetwork1Salary = musicNetwork1Salary;
+	public BigDecimal getMainHighSalary2() {
+		return mainHighSalary2;
 	}
 
-	public BigDecimal getSingleSalary2() {
-		return singleSalary2;
+	public void setMainHighSalary2(BigDecimal mainHighSalary2) {
+		this.mainHighSalary2 = mainHighSalary2;
 	}
 
-	public void setSingleSalary2(BigDecimal singleSalary2) {
-		this.singleSalary2 = singleSalary2;
+	public BigDecimal getMainClassroomSalary2() {
+		return mainClassroomSalary2;
 	}
 
-	public BigDecimal getMixSalary2() {
-		return mixSalary2;
+	public void setMainClassroomSalary2(BigDecimal mainClassroomSalary2) {
+		this.mainClassroomSalary2 = mainClassroomSalary2;
 	}
 
-	public void setMixSalary2(BigDecimal mixSalary2) {
-		this.mixSalary2 = mixSalary2;
+	public BigDecimal getMainSingleSalary() {
+		return mainSingleSalary;
 	}
 
-	public BigDecimal getComprehensiveSalary2() {
-		return comprehensiveSalary2;
+	public void setMainSingleSalary(BigDecimal mainSingleSalary) {
+		this.mainSingleSalary = mainSingleSalary;
 	}
 
-	public void setComprehensiveSalary2(BigDecimal comprehensiveSalary2) {
-		this.comprehensiveSalary2 = comprehensiveSalary2;
+	public BigDecimal getMainMixSalary() {
+		return mainMixSalary;
 	}
 
-	public BigDecimal getTraningSigleSalary2() {
-		return traningSigleSalary2;
+	public void setMainMixSalary(BigDecimal mainMixSalary) {
+		this.mainMixSalary = mainMixSalary;
 	}
 
-	public void setTraningSigleSalary2(BigDecimal traningSigleSalary2) {
-		this.traningSigleSalary2 = traningSigleSalary2;
+	public BigDecimal getMainComprehensiveSalary() {
+		return mainComprehensiveSalary;
 	}
 
-	public BigDecimal getTraningMixSalary2() {
-		return traningMixSalary2;
+	public void setMainComprehensiveSalary(BigDecimal mainComprehensiveSalary) {
+		this.mainComprehensiveSalary = mainComprehensiveSalary;
 	}
 
-	public void setTraningMixSalary2(BigDecimal traningMixSalary2) {
-		this.traningMixSalary2 = traningMixSalary2;
+	public BigDecimal getMainTraningSigleSalary() {
+		return mainTraningSigleSalary;
 	}
 
-	public BigDecimal getHighSalary2() {
-		return highSalary2;
+	public void setMainTraningSigleSalary(BigDecimal mainTraningSigleSalary) {
+		this.mainTraningSigleSalary = mainTraningSigleSalary;
 	}
 
-	public void setHighSalary2(BigDecimal highSalary2) {
-		this.highSalary2 = highSalary2;
+	public BigDecimal getMainTraningMixSalary() {
+		return mainTraningMixSalary;
 	}
 
-	public BigDecimal getClassroomSalary2() {
-		return classroomSalary2;
+	public void setMainTraningMixSalary(BigDecimal mainTraningMixSalary) {
+		this.mainTraningMixSalary = mainTraningMixSalary;
 	}
 
-	public void setClassroomSalary2(BigDecimal classroomSalary2) {
-		this.classroomSalary2 = classroomSalary2;
+	public BigDecimal getMainHighSalary() {
+		return mainHighSalary;
 	}
 
-	public BigDecimal getVip6() {
-		return vip6;
+	public void setMainHighSalary(BigDecimal mainHighSalary) {
+		this.mainHighSalary = mainHighSalary;
 	}
 
-	public void setVip6(BigDecimal vip6) {
-		this.vip6 = vip6;
+	public BigDecimal getAssistantSingleSalary2() {
+		return assistantSingleSalary2;
 	}
 
-	public BigDecimal getVip7() {
-		return vip7;
+	public void setAssistantSingleSalary2(BigDecimal assistantSingleSalary2) {
+		this.assistantSingleSalary2 = assistantSingleSalary2;
 	}
 
-	public void setVip7(BigDecimal vip7) {
-		this.vip7 = vip7;
+	public BigDecimal getAssistantMixSalary2() {
+		return assistantMixSalary2;
+	}
+
+	public void setAssistantMixSalary2(BigDecimal assistantMixSalary2) {
+		this.assistantMixSalary2 = assistantMixSalary2;
+	}
+
+	public BigDecimal getAssistantComprehensiveSalary2() {
+		return assistantComprehensiveSalary2;
+	}
+
+	public void setAssistantComprehensiveSalary2(BigDecimal assistantComprehensiveSalary2) {
+		this.assistantComprehensiveSalary2 = assistantComprehensiveSalary2;
+	}
+
+	public BigDecimal getAssistantTraningSigleSalary2() {
+		return assistantTraningSigleSalary2;
+	}
+
+	public void setAssistantTraningSigleSalary2(BigDecimal assistantTraningSigleSalary2) {
+		this.assistantTraningSigleSalary2 = assistantTraningSigleSalary2;
+	}
+
+	public BigDecimal getAssistantTraningMixSalary2() {
+		return assistantTraningMixSalary2;
+	}
+
+	public void setAssistantTraningMixSalary2(BigDecimal assistantTraningMixSalary2) {
+		this.assistantTraningMixSalary2 = assistantTraningMixSalary2;
+	}
+
+	public BigDecimal getAssistantHighSalary2() {
+		return assistantHighSalary2;
+	}
+
+	public void setAssistantHighSalary2(BigDecimal assistantHighSalary2) {
+		this.assistantHighSalary2 = assistantHighSalary2;
+	}
+
+	public BigDecimal getAssistantClassroomSalary2() {
+		return assistantClassroomSalary2;
+	}
+
+	public void setAssistantClassroomSalary2(BigDecimal assistantClassroomSalary2) {
+		this.assistantClassroomSalary2 = assistantClassroomSalary2;
+	}
+
+	public BigDecimal getAssistantSingleSalary() {
+		return assistantSingleSalary;
+	}
+
+	public void setAssistantSingleSalary(BigDecimal assistantSingleSalary) {
+		this.assistantSingleSalary = assistantSingleSalary;
+	}
+
+	public BigDecimal getAssistantMixSalary() {
+		return assistantMixSalary;
+	}
+
+	public void setAssistantMixSalary(BigDecimal assistantMixSalary) {
+		this.assistantMixSalary = assistantMixSalary;
+	}
+
+	public BigDecimal getAssistantComprehensiveSalary() {
+		return assistantComprehensiveSalary;
+	}
+
+	public void setAssistantComprehensiveSalary(BigDecimal assistantComprehensiveSalary) {
+		this.assistantComprehensiveSalary = assistantComprehensiveSalary;
+	}
+
+	public BigDecimal getAssistantTraningSigleSalary() {
+		return assistantTraningSigleSalary;
+	}
+
+	public void setAssistantTraningSigleSalary(BigDecimal assistantTraningSigleSalary) {
+		this.assistantTraningSigleSalary = assistantTraningSigleSalary;
+	}
+
+	public BigDecimal getAssistantTraningMixSalary() {
+		return assistantTraningMixSalary;
+	}
+
+	public void setAssistantTraningMixSalary(BigDecimal assistantTraningMixSalary) {
+		this.assistantTraningMixSalary = assistantTraningMixSalary;
+	}
+
+	public BigDecimal getAssistantHighSalary() {
+		return assistantHighSalary;
+	}
+
+	public void setAssistantHighSalary(BigDecimal assistantHighSalary) {
+		this.assistantHighSalary = assistantHighSalary;
+	}
+
+	public BigDecimal getAssistantClassroomSalary() {
+		return assistantClassroomSalary;
+	}
+
+	public void setAssistantClassroomSalary(BigDecimal assistantClassroomSalary) {
+		this.assistantClassroomSalary = assistantClassroomSalary;
 	}
 }

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

@@ -71,24 +71,41 @@
         <result column="vip6" property="vip6"/>
         <result column="vip7" property="vip7"/>
         <result column="practice" property="practiceSalary"/>
-        <result column="single2" property="singleSalary2"/>
-        <result column="mix2" property="mixSalary2"/>
-        <result column="comprehensive2" property="comprehensiveSalary2"/>
-        <result column="training_single2" property="traningSigleSalary2"/>
-        <result column="training_mix2" property="traningMixSalary2"/>
-        <result column="high2" property="highSalary2"/>
-        <result column="classroom2" property="classroomSalary2"/>
-        <result column="single" property="singleSalary"/>
-        <result column="mix" property="mixSalary"/>
-        <result column="comprehensive" property="comprehensiveSalary"/>
-        <result column="training_single" property="traningSigleSalary"/>
-        <result column="training_mix" property="traningMixSalary"/>
-        <result column="high" property="highSalary"/>
-        <result column="classroom" property="classroomSalary"/>
+
+        <result column="main_single2" property="mainSingleSalary2"/>
+        <result column="main_mix2" property="mainMixSalary2"/>
+        <result column="main_comprehensive2" property="mainComprehensiveSalary2"/>
+        <result column="main_training_single2" property="mainTraningSigleSalary2"/>
+        <result column="main_training_mix2" property="mainTraningMixSalary2"/>
+        <result column="main_high2" property="mainHighSalary2"/>
+        <result column="main_classroom2" property="mainClassroomSalary2"/>
+        <result column="main_single" property="mainSingleSalary"/>
+        <result column="main_mix" property="mainMixSalary"/>
+        <result column="main_comprehensive" property="mainComprehensiveSalary"/>
+        <result column="main_training_single" property="mainTraningSigleSalary"/>
+        <result column="main_training_mix" property="mainTraningMixSalary"/>
+        <result column="main_high" property="mainHighSalary"/>
+        <result column="main_classroom" property="mainClassroomSalary"/>
+
         <result column="high_online3" property="highOnline3Salary"/>
         <result column="high_online4" property="highOnline4Salary"/>
         <result column="high_online5" property="highOnline5Salary"/>
         <result column="music_network1" property="musicNetwork1Salary"/>
+
+        <result column="assistant_single2" property="assistantSingleSalary2"/>
+        <result column="assistant_mix2" property="assistantMixSalary2"/>
+        <result column="assistant_comprehensive2" property="assistantComprehensiveSalary2"/>
+        <result column="assistant_training_single2" property="assistantTraningSigleSalary2"/>
+        <result column="assistant_training_mix2" property="assistantTraningMixSalary2"/>
+        <result column="assistant_high2" property="assistantHighSalary2"/>
+        <result column="assistant_classroom2" property="assistantClassroomSalary2"/>
+        <result column="assistant_single" property="assistantSingleSalary"/>
+        <result column="assistant_mix" property="assistantMixSalary"/>
+        <result column="assistant_comprehensive" property="assistantComprehensiveSalary"/>
+        <result column="assistant_training_single" property="assistantTraningSigleSalary"/>
+        <result column="assistant_training_mix" property="assistantTraningMixSalary"/>
+        <result column="assistant_high" property="assistantHighSalary"/>
+        <result column="assistant_classroom" property="assistantClassroomSalary"/>
     </resultMap>
 
     <!-- 根据主键查询一条记录 -->
@@ -1169,20 +1186,36 @@
 		max(case when gc.`name_` = '1V6' then gs.`offline_classes_salary_` else 0 end) vip6,
 		max(case when gc.`name_` = '1V7' then gs.`offline_classes_salary_` else 0 end) vip7,
 		max(pgs.main_teacher_salary_) practice,
-		MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.main_teacher_30min_salary_ ELSE 0 END) single2,
-		MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.main_teacher_30min_salary_ ELSE 0 END) mix2,
-		MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.main_teacher_30min_salary_ ELSE 0 END) comprehensive2,
-		MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.main_teacher_30min_salary_ ELSE 0 END) training_single2,
-		MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.main_teacher_30min_salary_ ELSE 0 END) training_mix2,
-		MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.main_teacher_30min_salary_ ELSE 0 END) high2,
-		MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.main_teacher_30min_salary_ ELSE 0 END) classroom2,
-		MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) single,
-		MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) mix,
-		MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.main_teacher_90min_salary_ ELSE 0 END) comprehensive,
-		MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) training_single,
-		MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) training_mix,
-		MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.main_teacher_90min_salary_ ELSE 0 END) high,
-		MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.main_teacher_90min_salary_ ELSE 0 END) classroom,
+        MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_single2,
+        MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_mix2,
+        MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_comprehensive2,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_training_single2,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_training_mix2,
+        MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_high2,
+        MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.main_teacher_30min_salary_ ELSE 0 END) main_classroom2,
+        MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_single,
+        MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_mix,
+        MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_comprehensive,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_training_single,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_training_mix,
+        MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_high,
+        MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.main_teacher_90min_salary_ ELSE 0 END) main_classroom,
+
+        MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_single2,
+        MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_mix2,
+        MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_comprehensive2,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_training_single2,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_training_mix2,
+        MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_high2,
+        MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.assistant_teacher_30min_salary_ ELSE 0 END) assistant_classroom2,
+        MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_single,
+        MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_mix,
+        MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_comprehensive,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_training_single,
+        MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_training_mix,
+        MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_high,
+        MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.assistant_teacher_90min_salary_ ELSE 0 END) assistant_classroom,
+
 		MAX(case when mgs.course_schedule_type_ = 'HIGH_ONLINE' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."3"'),DECIMAL) END) high_online3,
 		MAX(case when mgs.course_schedule_type_ = 'HIGH_ONLINE' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."4"'),DECIMAL) END) high_online4,
 		MAX(case when mgs.course_schedule_type_ = 'HIGH_ONLINE' then CONVERT(JSON_EXTRACT(mgs.salary_rule_json_,'$."5"'),DECIMAL) END) high_online5,

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

@@ -2303,13 +2303,22 @@ public class ExportController extends BaseController {
         OutputStream outputStream = response.getOutputStream();
         try {
 
-            String[] header = {"老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "1v6", "1v7", "网管课", "单技课2.0", "合奏课2.0", "综合课2.0", "集训单技课2.0", "集训合奏课2.0",
-                    "基础技能课2.0", "课堂课2.0", "单技课3.0", "合奏课3.0", "综合课3.0", "集训单技课3.0", "集训合奏课3.0",
-                    "基础技能课3.0", "课堂课3.0", "网络基础训练课1v3", "网络基础训练课1v4", "网络基础训练课1v5", "乐团网管课1v1"};
+            String[] header = {"老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "1v6", "1v7",
+                    "网管课", "单技课2.0(主教)", "合奏课2.0(主教)", "综合课2.0(主教)", "集训单技课2.0(主教)", "集训合奏课2.0(主教)",
+                    "基础技能课2.0(主教)", "课堂课2.0(主教)", "单技课3.0(主教)", "合奏课3.0(主教)", "综合课3.0(主教)", "集训单技课3.0(主教)", "集训合奏课3.0(主教)",
+                    "基础技能课3.0(主教)"
+                    , "单技课2.0(助教)", "合奏课2.0(助教)", "综合课2.0(助教)", "集训单技课2.0(助教)", "集训合奏课2.0(助教)",
+                    "基础技能课2.0(助教)", "课堂课2.0(助教)", "单技课3.0(助教)", "合奏课3.0(助教)", "综合课3.0(助教)", "集训单技课3.0(助教)", "集训合奏课3.0(助教)",
+                    "基础技能课3.0(助教)", "课堂课3.0", "网络基础训练课1v3", "网络基础训练课1v4", "网络基础训练课1v5", "乐团网管课1v1"};
             String[] body = {"userId", "realName", "organName", "jobNature", "demissionStatus", "status", "vip1", "vip2", "vip3", "vip4", "vip5", "vip6", "vip7",
-                    "practiceSalary", "singleSalary2", "mixSalary2", "comprehensiveSalary2", "traningSigleSalary2", "traningMixSalary2", "highSalary2",
-                    "classroomSalary2", "singleSalary", "mixSalary", "comprehensiveSalary", "traningSigleSalary", "traningMixSalary", "highSalary",
-                    "classroomSalary", "highOnline3Salary", "highOnline4Salary", "highOnline5Salary", "musicNetwork1Salary"};
+                    "practiceSalary",
+                    "mainSingleSalary2", "mainMixSalary2", "mainComprehensiveSalary2", "mainTraningSigleSalary2", "mainTraningMixSalary2", "mainHighSalary2",
+                    "mainClassroomSalary2", "mainSingleSalary", "mainMixSalary", "mainComprehensiveSalary", "mainTraningSigleSalary", "mainTraningMixSalary", "mainHighSalary",
+                    "mainClassroomSalary",
+                    "assistantSingleSalary2", "assistantMixSalary2", "assistantComprehensiveSalary2", "assistantTraningSigleSalary2", "assistantTraningMixSalary2", "assistantHighSalary2",
+                    "assistantClassroomSalary2", "assistantSingleSalary", "assistantMixSalary", "assistantComprehensiveSalary", "assistantTraningSigleSalary", "assistantTraningMixSalary", "assistantHighSalary",
+                    "assistantClassroomSalary",
+                    "highOnline3Salary", "highOnline4Salary", "highOnline5Salary", "musicNetwork1Salary"};
             HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList);
             response.setContentType("application/octet-stream");
             response.setHeader("Content-Disposition", "attachment;filename=teacherDefaultSalary-" + DateUtil.getDate(new Date()) + ".xls");