zouxuan před 5 roky
rodič
revize
9a8f80345b

+ 11 - 0
mec-biz/src/main/java/com/ym/mec/biz/dal/dto/CourseTeacherSalaryStatisticsDto.java

@@ -1,6 +1,7 @@
 package com.ym.mec.biz.dal.dto;
 
 import com.ym.mec.biz.dal.enums.GroupType;
+import com.ym.mec.biz.dal.enums.TeacherSalaryConfirmStatus;
 
 import java.math.BigDecimal;
 
@@ -22,6 +23,16 @@ public class CourseTeacherSalaryStatisticsDto {
 
     private BigDecimal totalReduceSalary;
 
+    private TeacherSalaryConfirmStatus confirmStatus;
+
+    public TeacherSalaryConfirmStatus getConfirmStatus() {
+        return confirmStatus;
+    }
+
+    public void setConfirmStatus(TeacherSalaryConfirmStatus confirmStatus) {
+        this.confirmStatus = confirmStatus;
+    }
+
     public String getStatType() {
         return statType;
     }

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

@@ -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_