|
@@ -861,6 +861,7 @@
|
|
|
<result property="statType" column="group_type_"/>
|
|
|
<result property="month" column="month_"/>
|
|
|
<result property="courseTimes" column="course_times_"/>
|
|
|
+ <result property="confirmStatus" column="confirm_status_" typeHandler="com.ym.mec.common.dal.CustomEnumTypeHandler"/>
|
|
|
<result property="totalActualSalary" column="total_actual_salary_"/>
|
|
|
<result property="totalReduceSalary" column="total_reduce_salary_"/>
|
|
|
</resultMap>
|
|
@@ -885,7 +886,7 @@
|
|
|
SELECT
|
|
|
DATE_FORMAT( cs.class_date_, '%Y-%m' ) month_,
|
|
|
SUM(actual_salary_) total_actual_salary_,
|
|
|
- SUM(reduce_salary) total_reduce_salary_
|
|
|
+ SUM(reduce_salary) total_reduce_salary_,MAX(csts.confirm_status_) confirm_status_
|
|
|
FROM
|
|
|
course_schedule_teacher_salary csts
|
|
|
LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_
|