feat:教师端课酬

mec-biz/src/main/java/com/ym/mec/biz/dal/dao/CourseScheduleDao.java

@@ -1297,7 +1297,8 @@ public interface CourseScheduleDao extends BaseDAO<Long, CourseSchedule> {
     List<CourseSchedule> getTeacherCourseWithClassDate(@Param("teacherId") Integer teacherId,
                                                        @Param("startDay") String startDay,
                                                        @Param("endDay") String endDay,
-                                                       @Param("courseStatus") CourseStatusEnum courseStatus);
+                                                       @Param("courseStatus") CourseStatusEnum courseStatus,
+                                                       @Param("teachIncomeType") String teachIncomeType);
 
     /**
      * @describe 查询教师课程

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

@@ -2063,7 +2063,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             teacherSalaryOverview.setThisMonthExpectIncome(BigDecimal.ZERO);
         }
 
-        List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), CourseStatusEnum.OVER);
+        List<CourseSchedule> teacherCourses = courseScheduleDao.getTeacherCourseWithClassDate(queryInfo.getTeacherId(), queryInfo.getStartDay(), queryInfo.getEndDay(), CourseStatusEnum.OVER, queryInfo.getTeachIncomeType());
         if(CollectionUtils.isEmpty(teacherCourses)){
             return teacherSalaryOverview;
         }

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

@@ -3760,6 +3760,7 @@
         FROM
             course_schedule cs
             LEFT JOIN course_schedule_teacher_salary csts ON csts.course_schedule_id_ = cs.id_
+            LEFT JOIN school s ON cs.schoole_id_=s.id_
         WHERE
             ( cs.del_flag_ IS NULL OR cs.del_flag_ = 0 )
             AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
@@ -3774,6 +3775,9 @@
             <if test="courseStatus!=null">
                 AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
+            <if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
+                AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
+            </if>
     </select>
 
     <sql id="queryTeacherCourseCondition">
@@ -3795,7 +3799,7 @@
                 AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
             </if>
             <if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
-                AND s.subsidy_ IS NOT NULL AND s.subsidy_>0
+                AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
             </if>
         </where>
     </sql>

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

@@ -1090,7 +1090,7 @@
 						AND cs.class_date_ <= #{endDay}
 					</if>
 			    	<if test="teachIncomeType!=null and teachIncomeType=='SUBSIDY'">
-						AND AND s.subsidy_ IS NOT NULL AND s.subsidy_>0
+						AND IF(csts.settlement_time_ IS NULL, s.subsidy_ IS NOT NULL AND s.subsidy_>0, csts.subsidy_ IS NOT NULL AND csts.subsidy_>0)
 					</if>
 			    THEN csts.expect_salary_ + IF(s.subsidy_ IS NULL, 0, s.subsidy_) ELSE 0 END)) thisMonthExpectIncome
 		FROM