Merge remote-tracking branch 'origin/teacher_income' into teacher_income

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

@@ -26,14 +26,24 @@ public class TeacherIncomeReviewDto {
     @ApiModelProperty(value = "其他课酬")
     private BigDecimal otherIncome = new BigDecimal("0");
 
-    private int complaintsDaysRang = 1;
+    private int complaintsDaysRange = 1;
 
-    public int getComplaintsDaysRang() {
-        return complaintsDaysRang;
+    private Double attendanceRange;
+
+    public Double getAttendanceRange() {
+        return attendanceRange;
+    }
+
+    public void setAttendanceRange(Double attendanceRange) {
+        this.attendanceRange = attendanceRange;
+    }
+
+    public int getComplaintsDaysRange() {
+        return complaintsDaysRange;
     }
 
-    public void setComplaintsDaysRang(int complaintsDaysRang) {
-        this.complaintsDaysRang = complaintsDaysRang;
+    public void setComplaintsDaysRange(int complaintsDaysRange) {
+        this.complaintsDaysRange = complaintsDaysRange;
     }
 
     public BigDecimal getTotalIncome() {

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

@@ -2040,6 +2040,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             teacherSalaryOverview.setDayaIncome(monthActualIncome);
         }
 
+        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="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}