老师默认课酬导出

mec-application/src/main/resources/exportColumnMapper.ini

@@ -183,8 +183,8 @@ headColumns = ["序号", "业务分部", "学生编号", "学生姓名", "交易
 fieldColumns = ["id", "userOrganName", "userId", "user.username", "transNo", "orderNo", "paymentChannel", "merNos", "orderAmount" , "expectAmount", "actualAmount", "balancePaymentAmount", "routeMerNo", "routeAmount", "routeBalance",  "couponRemitFee","musicGroupCourseFee", "vipCourseFee",  "liveCourseFee", "practiceCourseFee", "theoryCourseFee", "degreeFee", "repairFee", "maintenanceFee", "cloudTeacherFee", "leaseFee", "musicalFee", "teachingFee", "visitFee", "rechargeFee", "otherFee", "platformFee", "payTime", "musicGroupId", "groupType.desc","typeDesc","feeMusicGroupId","feeMusicGroupName", "sporadicType", "subjectName", "organName", "schoolName", "cooperationOrganName", "eduTeacher", "memo"]
 
 [老师默认课酬导出]
-headColumns = ["老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "1v6", "1v7","小组课", "声部课(主教)", "合奏课(主教)", "综合课(主教)", "集训声部课(主教)", "集训合奏课(主教)","基础技能课(主教)","课堂课(主教)", "声部课(助教)", "合奏课(助教)", "综合课(助教)", "集训声部课(助教)", "集训合奏课(助教)","基础技能课(助教)", "课堂课(助教)", "线上基础技能课1v1", "线上基础技能课1v2", "线上基础技能课1v3", "线上基础技能课1v4", "线上基础技能课1v5", "乐团网管课1v1", "乐团网管课1v2", "乐团网管课1v3", "乐团网管课1v4", "乐团网管课1v5"]
-fieldColumns = ["userId", "realName", "organName", "jobNature", "demissionStatus", "status", "vip1", "vip2", "vip3", "vip4", "vip5", "vip6", "vip7", "practiceSalary", "mainSingleSalary", "mainMixSalary", "mainComprehensiveSalary", "mainTraningSigleSalary", "mainTraningMixSalary", "mainHighSalary", "mainClassroomSalary","assistantSingleSalary", "assistantMixSalary", "assistantComprehensiveSalary", "assistantTraningSigleSalary", "assistantTraningMixSalary", "assistantHighSalary","assistantClassroomSalary", "highOnline1Salary", "highOnline2Salary", "highOnline3Salary", "highOnline4Salary", "highOnline5Salary", "musicNetwork1Salary", "musicNetwork2Salary", "musicNetwork3Salary", "musicNetwork4Salary", "musicNetwork5Salary"]
+headColumns = ["老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "1v6", "1v7","小组课", "网管课", "声部课(主教)", "合奏课(主教)", "综合课(主教)", "集训声部课(主教)", "集训合奏课(主教)","基础技能课(主教)","课堂课(主教)", "声部课(助教)", "合奏课(助教)", "综合课(助教)", "集训声部课(助教)", "集训合奏课(助教)","基础技能课(助教)", "课堂课(助教)", "线上基础技能课1v1", "线上基础技能课1v2", "线上基础技能课1v3", "线上基础技能课1v4", "线上基础技能课1v5", "乐团网管课1v1", "乐团网管课1v2", "乐团网管课1v3", "乐团网管课1v4", "乐团网管课1v5"]
+fieldColumns = ["userId", "realName", "organName", "jobNature", "demissionStatus", "status", "vip1", "vip2", "vip3", "vip4", "vip5", "vip6", "vip7", "theorySalary", "practiceSalary", "mainSingleSalary", "mainMixSalary", "mainComprehensiveSalary", "mainTraningSigleSalary", "mainTraningMixSalary", "mainHighSalary", "mainClassroomSalary","assistantSingleSalary", "assistantMixSalary", "assistantComprehensiveSalary", "assistantTraningSigleSalary", "assistantTraningMixSalary", "assistantHighSalary","assistantClassroomSalary", "highOnline1Salary", "highOnline2Salary", "highOnline3Salary", "highOnline4Salary", "highOnline5Salary", "musicNetwork1Salary", "musicNetwork2Salary", "musicNetwork3Salary", "musicNetwork4Salary", "musicNetwork5Salary"]
 
 [报名中缴费中乐团缴费情况导出]
 headColumns = ["分部","乐团名称","乐团状态","审核通过时间","报名总数","团购数","缴费总数","回款总金额"]

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

@@ -32,6 +32,8 @@ public class TeacherDefaultSalaryDto {
 	
 	private BigDecimal practiceSalary = new BigDecimal(0);
 
+	private BigDecimal theorySalary = new BigDecimal(0);
+
 	
 	private BigDecimal mainSingleSalary2 = new BigDecimal(0);
 	
@@ -111,6 +113,14 @@ public class TeacherDefaultSalaryDto {
 
 	private BigDecimal musicNetwork5Salary = new BigDecimal(0);
 
+	public BigDecimal getTheorySalary() {
+		return theorySalary;
+	}
+
+	public void setTheorySalary(BigDecimal theorySalary) {
+		this.theorySalary = theorySalary;
+	}
+
 	public BigDecimal getHighOnline1Salary() {
 		return highOnline1Salary;
 	}

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

@@ -78,6 +78,7 @@
         <result column="vip5" property="vip5"/>
         <result column="vip6" property="vip6"/>
         <result column="vip7" property="vip7"/>
+        <result column="theorySalary" property="theorySalary"/>
         <result column="practice" property="practiceSalary"/>
 
         <result column="main_single" property="mainSingleSalary"/>
@@ -1359,6 +1360,7 @@
 		max(case when gc.`name_` = '1V5' then gs.`offline_classes_salary_` else 0 end) vip5,
 		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(case when gc.`music_theory_` then gs.`offline_classes_salary_` else 0 end) theorySalary,
 		max(pgs.main_teacher_salary_) practice,
         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,