feat:教师端课酬

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

@@ -17,7 +17,7 @@ public class TeacherIncomeQueryInfo extends QueryInfo {
 
     private CourseStatusEnum courseStatus;
 
-    private Boolean updated;
+    private Boolean updated = false;
 
     public Integer getTeacherId() {
         return teacherId;

mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

@@ -1600,7 +1600,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             if(updated){
                 List<TeacherSalaryDeductReasonDto> deductReasons = new ArrayList<>();
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
+                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.NOT_SETTLEMENT, courseScheduleTeacherSalary.getExpectSalary().abs()));
                 courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             }
             return;
@@ -1841,7 +1841,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //不结算课酬
             if(updated){
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
+                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.NOT_SETTLEMENT, courseScheduleTeacherSalary.getExpectSalary().abs()));
                 courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             }
             return;
@@ -1953,7 +1953,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             //不结算课酬
             if(updated){
                 courseScheduleTeacherSalary.setActualSalary(BigDecimal.ZERO);
-                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.SIGN_IN_TIME_ERR, courseScheduleTeacherSalary.getExpectSalary().abs()));
+                deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.NOT_SETTLEMENT, courseScheduleTeacherSalary.getExpectSalary().abs()));
                 courseScheduleTeacherSalary.setDeductReasons(deductReasons);
             }
             return;

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

@@ -3765,7 +3765,12 @@
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
             AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
             AND csts.user_id_ = #{teacherId}
-            AND cs.class_date_ BETWEEN #{startDay} AND #{endDay}
+            <if test="startDay!=null and startDay!=''">
+                AND cs.class_date_ &gt;= #{startDay}
+            </if>
+            <if test="endDay!=null and endDay!=''">
+                AND cs.class_date_ &lt;= #{endDay}
+            </if>
             <if test="courseStatus!=null">
                 AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>

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

@@ -1082,7 +1082,14 @@
     <select id="getTeacherSalaryOverview" resultType="com.ym.mec.biz.dal.dto.TeacherIncomeReviewDto">
 		SELECT
 			SUM(csts.actual_salary_) totalIncome,
-			SUM((CASE WHEN cs.class_date_ BETWEEN #{startDay} AND #{endDay} THEN csts.expect_salary_ + IF(s.subsidy_ IS NULL, 0, s.subsidy_) ELSE 0 END)) thisMonthExpectIncome
+			SUM((CASE WHEN 1=1
+					<if test="startClassDay!=null and startClassDay!=''">
+			    		AND cs.class_date_ &gt;= #{startDay}
+					</if>
+					<if test="endDay!=null and endDay!=''">
+						AND cs.class_date_ &lt;= #{endDay}
+					</if>
+			    THEN csts.expect_salary_ + IF(s.subsidy_ IS NULL, 0, s.subsidy_) ELSE 0 END)) thisMonthExpectIncome
 		FROM
 			course_schedule_teacher_salary csts
 			LEFT JOIN course_schedule cs ON csts.course_schedule_id_ = cs.id_