소스 검색

feat:教师端课酬

Joburgess 4 년 전
부모
커밋
f8d70fb6ce
1개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 2 1
      mec-biz/src/main/java/com/ym/mec/biz/service/impl/CourseScheduleTeacherSalaryServiceImpl.java

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

@@ -2182,7 +2182,8 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
             LocalDate now = LocalDate.now();
 
             LocalDate startDate = LocalDate.of(year, Objects.isNull(month)?1:month, 1);
-            while (year.equals(startDate.get(ChronoField.MONTH_OF_YEAR))){
+            Integer oldMonth = Objects.isNull(month)?new Integer(1):month;
+            while (oldMonth.equals(startDate.get(ChronoField.MONTH_OF_YEAR))){
                 String dateStr = DateUtil.dateFormatter.format(startDate);
                 if(!dates.contains(dateStr)){
                     monthIncomeMapList.add(new LocalDateBigDecimalMapDto(Date.from(startDate.atStartOfDay(DateUtil.zoneId).toInstant()), dateStr, BigDecimal.ZERO));