feat:教师端课酬

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

@@ -28,6 +28,16 @@ public class TeacherIncomeReviewDto {
 
     private int complaintsDaysRange = 1;
 
+    private Double attendanceRange;
+
+    public Double getAttendanceRange() {
+        return attendanceRange;
+    }
+
+    public void setAttendanceRange(Double attendanceRange) {
+        this.attendanceRange = attendanceRange;
+    }
+
     public int getComplaintsDaysRange() {
         return complaintsDaysRange;
     }

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

@@ -2039,6 +2039,12 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
         }else{
             teacherSalaryOverview.setDayaIncome(monthActualIncome);
         }
+        SysConfig attendanceRangeConfig = sysConfigService.findByParamName(SysConfigService.ATTENDANCE_RANGE_VIP);
+        double attendanceRange = 0;
+        if(Objects.nonNull(sysConfig)){
+            attendanceRange = Double.valueOf(sysConfig.getParanValue());
+        }
+        teacherSalaryOverview.setAttendanceRange(attendanceRange);
 
         return teacherSalaryOverview;
     }

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

@@ -3777,8 +3777,11 @@
             <if test="teacherId!=null">
                 AND csts.user_id_ = #{teacherId}
             </if>
-            <if test="startDay!=null and startDay!='' and endDay!=null and endDay!=''">
-                AND cs.class_date_ BETWEEN #{startDay} AND #{endDay}
+            <if test="startDay!=null and startDay!=''">
+                AND cs.class_date_ &gt;= #{startDay}
+            </if>
+            <if test="and 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}