Merge remote-tracking branch 'origin/master'

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

@@ -28,6 +28,20 @@ public class TeacherDefaultSalaryDto {
 	
 	private BigDecimal practiceSalary = new BigDecimal(0);
 	
+	private BigDecimal singleSalary2 = new BigDecimal(0);
+	
+	private BigDecimal mixSalary2 = new BigDecimal(0);
+	
+	private BigDecimal comprehensiveSalary2 = new BigDecimal(0);
+	
+	private BigDecimal traningSigleSalary2 = new BigDecimal(0);
+	
+	private BigDecimal traningMixSalary2 = new BigDecimal(0);
+	
+	private BigDecimal highSalary2 = new BigDecimal(0);
+	
+	private BigDecimal classroomSalary2 = new BigDecimal(0);
+	
 	private BigDecimal singleSalary = new BigDecimal(0);
 	
 	private BigDecimal mixSalary = new BigDecimal(0);
@@ -233,4 +247,60 @@ public class TeacherDefaultSalaryDto {
 	public void setMusicNetwork1Salary(BigDecimal musicNetwork1Salary) {
 		this.musicNetwork1Salary = musicNetwork1Salary;
 	}
+
+	public BigDecimal getSingleSalary2() {
+		return singleSalary2;
+	}
+
+	public void setSingleSalary2(BigDecimal singleSalary2) {
+		this.singleSalary2 = singleSalary2;
+	}
+
+	public BigDecimal getMixSalary2() {
+		return mixSalary2;
+	}
+
+	public void setMixSalary2(BigDecimal mixSalary2) {
+		this.mixSalary2 = mixSalary2;
+	}
+
+	public BigDecimal getComprehensiveSalary2() {
+		return comprehensiveSalary2;
+	}
+
+	public void setComprehensiveSalary2(BigDecimal comprehensiveSalary2) {
+		this.comprehensiveSalary2 = comprehensiveSalary2;
+	}
+
+	public BigDecimal getTraningSigleSalary2() {
+		return traningSigleSalary2;
+	}
+
+	public void setTraningSigleSalary2(BigDecimal traningSigleSalary2) {
+		this.traningSigleSalary2 = traningSigleSalary2;
+	}
+
+	public BigDecimal getTraningMixSalary2() {
+		return traningMixSalary2;
+	}
+
+	public void setTraningMixSalary2(BigDecimal traningMixSalary2) {
+		this.traningMixSalary2 = traningMixSalary2;
+	}
+
+	public BigDecimal getHighSalary2() {
+		return highSalary2;
+	}
+
+	public void setHighSalary2(BigDecimal highSalary2) {
+		this.highSalary2 = highSalary2;
+	}
+
+	public BigDecimal getClassroomSalary2() {
+		return classroomSalary2;
+	}
+
+	public void setClassroomSalary2(BigDecimal classroomSalary2) {
+		this.classroomSalary2 = classroomSalary2;
+	}
 }

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

@@ -69,6 +69,13 @@
         <result column="vip4" property="vip4"/>
         <result column="vip5" property="vip5"/>
         <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"/>
@@ -1146,6 +1153,13 @@
 		max(case when gc.`name_` = '1V4' then gs.`offline_classes_salary_` else 0 end) vip4,
 		max(case when gc.`name_` = '1V5' then gs.`offline_classes_salary_` else 0 end) vip5,
 		max(pgs.main_teacher_salary_) practice,
+		MAX(case when mgs.course_schedule_type_ = 'SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) single2,
+		MAX(case when mgs.course_schedule_type_ = 'MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) mix2,
+		MAX(case when mgs.course_schedule_type_ = 'COMPREHENSIVE' then mgs.main_teacher_90min_salary_ ELSE 0 END) comprehensive2,
+		MAX(case when mgs.course_schedule_type_ = 'TRAINING_SINGLE' then mgs.main_teacher_90min_salary_ ELSE 0 END) training_single2,
+		MAX(case when mgs.course_schedule_type_ = 'TRAINING_MIX' then mgs.main_teacher_90min_salary_ ELSE 0 END) training_mix2,
+		MAX(case when mgs.course_schedule_type_ = 'HIGH' then mgs.main_teacher_90min_salary_ ELSE 0 END) high2,
+		MAX(case when mgs.course_schedule_type_ = 'CLASSROOM' then mgs.main_teacher_90min_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,

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

@@ -1996,10 +1996,12 @@ public class ExportController extends BaseController {
 		OutputStream outputStream = response.getOutputStream();
 		try {
 
-			String[] header = { "老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "网管课", "单技课", "合奏课", "综合课", "集训单技课", "集训合奏课",
-					"基础技能课", "课堂课", "线上基础技能课1v3", "线上基础技能课1v4", "线上基础技能课1v5", "乐团网管课1v1" };
+			String[] header = { "老师编号", "姓名", "分部", "工作类型", "在职状态", "老师状态", "1v1", "1v2", "1v3", "1v4", "1v5", "网管课", "单技课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",
-					"practiceSalary", "singleSalary", "mixSalary", "comprehensiveSalary", "traningSigleSalary", "traningMixSalary", "highSalary",
+					"practiceSalary", "singleSalary2", "mixSalary2", "comprehensiveSalary2", "traningSigleSalary2", "traningMixSalary2", "highSalary2",
+					"classroomSalary2", "singleSalary", "mixSalary", "comprehensiveSalary", "traningSigleSalary", "traningMixSalary", "highSalary",
 					"classroomSalary", "highOnline3Salary", "highOnline4Salary", "highOnline5Salary", "musicNetwork1Salary" };
 			HSSFWorkbook workbook = POIUtil.exportExcel(header, body, pageList);
 			response.setContentType("application/octet-stream");