update

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

@@ -40,12 +40,23 @@ public class TeacherCloseDto {
     @ApiModelProperty(value = "实际结算薪水")
     private BigDecimal actualSalary;
 
+    @ApiModelProperty(value = "预计结算薪水")
+    private BigDecimal expectSalary;
+
     @ApiModelProperty(value = "实际结算时间")
     private Date settlementTime;
 
     @ApiModelProperty(value = "补贴")
     private BigDecimal subsidy;
 
+    public BigDecimal getExpectSalary() {
+        return expectSalary;
+    }
+
+    public void setExpectSalary(BigDecimal expectSalary) {
+        this.expectSalary = expectSalary;
+    }
+
     public Integer getCourseScheduleId() {
         return courseScheduleId;
     }

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

@@ -307,6 +307,7 @@
         <result property="signInStatus" column="sign_in_status_"/>
         <result property="signOutStatus" column="sign_out_status_"/>
         <result property="actualSalary" column="actual_salary_"/>
+        <result property="expectSalary" column="expect_salary_"/>
         <result property="subsidy" column="subsidy_"/>
         <result property="settlementTime" column="settlement_time_"/>
         <result property="courseScheduleId" column="course_schedule_id_"/>
@@ -316,7 +317,7 @@
         csts.teacher_role_,ta.current_class_times_,cg.total_class_times_,
         IF(ta.sign_in_status_ IS NULL,3,ta.sign_in_status_) sign_in_status_,
         IF(ta.sign_out_status_ IS NULL,3,ta.sign_out_status_) sign_out_status_,
-        csts.actual_salary_,csts.settlement_time_,csts.subsidy_
+        csts.actual_salary_,csts.settlement_time_,csts.subsidy_,csts.expect_salary_
         FROM course_schedule cs
         LEFT JOIN course_schedule_teacher_salary csts ON cs.id_ = csts.course_schedule_id_
         LEFT JOIN teacher_attendance ta ON cs.id_ = ta.course_schedule_id_ AND ta.teacher_id_ = csts.user_id_