feat:教师端课酬

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

@@ -26,6 +26,16 @@ public class TeacherIncomeReviewDto {
     @ApiModelProperty(value = "其他课酬")
     private BigDecimal otherIncome = new BigDecimal("0");
 
+    private int complaintsDaysRang = 1;
+
+    public int getComplaintsDaysRang() {
+        return complaintsDaysRang;
+    }
+
+    public void setComplaintsDaysRang(int complaintsDaysRang) {
+        this.complaintsDaysRang = complaintsDaysRang;
+    }
+
     public BigDecimal getTotalIncome() {
         return totalIncome;
     }

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

@@ -1698,7 +1698,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 gpsDeductAmount = teacherSalary.abs();
             }
 
-            if(BigDecimal.ZERO.compareTo(gpsDeductAmount)<=0){
+            if(BigDecimal.ZERO.compareTo(gpsDeductAmount)<0){
                 deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.GPS_ERR, gpsDeductAmount));
             }
 
@@ -1801,7 +1801,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             gpsDeductAmount = expectSalary.abs();
         }
 
-        if(BigDecimal.ZERO.compareTo(gpsDeductAmount)<=0){
+        if(BigDecimal.ZERO.compareTo(gpsDeductAmount)<0){
             deductReasons.add(new TeacherSalaryDeductReasonDto(DeductReasonEnum.GPS_ERR, gpsDeductAmount));
         }
 
@@ -2072,6 +2072,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
                 dataList.add(teacherIncomeInfo);
             }
         }
+        dataList.sort(Comparator.comparing(TeacherIncomeDto::getId).reversed());
         pageInfo.setRows(dataList);
         return pageInfo;
     }