Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/dal/page/ExportTeacherSalaryQueryInfo.java

@@ -1,15 +1,16 @@
 package com.ym.mec.biz.dal.page;
 
-import com.ym.mec.common.page.QueryInfo;
-
-import javax.xml.crypto.Data;
 import java.util.Date;
 
+import com.ym.mec.common.page.QueryInfo;
+
 public class ExportTeacherSalaryQueryInfo extends QueryInfo {
 
     private Boolean isExport = false;
 
     private Date date;
+    
+    private String courseTypeList;
 
     public Date getDate() {
         return date;
@@ -26,4 +27,12 @@ public class ExportTeacherSalaryQueryInfo extends QueryInfo {
     public void setIsExport(Boolean export) {
         isExport = export;
     }
+
+	public String getCourseTypeList() {
+		return courseTypeList;
+	}
+
+	public void setCourseTypeList(String courseTypeList) {
+		this.courseTypeList = courseTypeList;
+	}
 }

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

@@ -632,7 +632,7 @@
 		<result property="offlineClassesUnitPrice" column="offline_classes_unit_price_"/>
  	</resultMap>
     <select id="exportMusicTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,mgo.name_ courseScheduleOrganName,mg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,ts.user_id_ teacherId,mgo.name_ courseScheduleOrganName,mg.name_ groupName,
 		ct.name_ changeType,u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,
@@ -661,10 +661,13 @@
 		LEFT JOIN organization mgo ON mgo.id_ = mg.organ_id_
 		LEFT JOIN charge_type ct ON ct.id_ = mg.charge_type_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'MUSIC' AND ts.settlement_time_ IS NOT NULL
+		<if test="courseTypeList != null">
+			and cs.type_ in (#{courseTypeList})
+		</if>
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="exportVipTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,vgo.name_ courseScheduleOrganName,vg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,ts.user_id_ teacherId,vgo.name_ courseScheduleOrganName,vg.name_ groupName,
 		u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,
@@ -695,6 +698,9 @@
 		LEFT JOIN organization vgo ON vgo.id_ = vg.organ_id_
 		WHERE vg.organ_id_ != 41 AND cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1
 		AND cs.group_type_ = 'VIP' AND ts.settlement_time_ IS NOT NULL
+		<if test="courseTypeList != null">
+			and cs.type_ in (#{courseTypeList})
+		</if>
 		GROUP BY ts.id_,ta.id_
 	</select>
 	<select id="querySettlementScheduleId" resultType="java.lang.Long">
@@ -702,7 +708,7 @@
 		WHERE csts.settlement_time_ IS NULL AND FIND_IN_SET(csts.course_schedule_id_,#{courseScheduleIds})
 	</select>
 	<select id="exportPracticeTeacherSalary" resultMap="ExportTeacherSalaryDtoMap">
-		SELECT cs.`id_` courseScheduleId,u.id_ teacherId,pgo.name_ courseScheduleOrganName,pg.name_ groupName,
+		SELECT cs.`id_` courseScheduleId,ts.user_id_ teacherId,pgo.name_ courseScheduleOrganName,pg.name_ groupName,
 		u.real_name_ teacherName,o.name_ teacherOrganName,cs.music_group_id_ group_id_,
 		CASE WHEN cs.teach_mode_ = 'OFFLINE' THEN '线下' WHEN cs.teach_mode_ = 'ONLINE' THEN '线上' END teach_mode_,
 		CASE WHEN t.job_nature_ = 'PART_TIME' THEN '兼职' WHEN t.job_nature_ = 'FULL_TIME' THEN '全职' ELSE '零时工' END jobType,
@@ -729,6 +735,9 @@
 		LEFT JOIN practice_group pg ON (pg.id_ = ts.music_group_id_ AND ts.group_type_ = 'PRACTICE')
 		LEFT JOIN organization pgo ON pgo.id_ = pg.organ_id_
 		WHERE cs.class_date_ BETWEEN #{firstDayOfMonth} AND #{lastDayOfMonth} AND cs.`del_flag_` != 1 AND cs.group_type_ = 'PRACTICE' AND ts.settlement_time_ IS NOT NULL
+		<if test="courseTypeList != null">
+			and cs.type_ in (#{courseTypeList})
+		</if>
 		GROUP BY ts.id_,ta.id_
 	</select>