|
@@ -2157,10 +2157,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
result.put("salary", BigDecimal.ZERO);
|
|
|
|
|
|
List<LocalDateBigDecimalMapDto> monthIncomeMapList = courseScheduleTeacherSalaryDao.teacherIncomeStat(teacherId, year, month);
|
|
|
- if(CollectionUtils.isEmpty(monthIncomeMapList)){
|
|
|
- result.put("data", monthIncomeMapList);
|
|
|
- return result;
|
|
|
- }
|
|
|
|
|
|
if(Objects.isNull(month)){
|
|
|
Set<String> months = monthIncomeMapList.stream().map(e -> DateUtil.dateToString(e.getDate(), "yyyy-MM")).collect(Collectors.toSet());
|
|
@@ -2179,8 +2175,6 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
}else{
|
|
|
Set<String> dates = monthIncomeMapList.stream().map(e -> DateUtil.dateToString(e.getDate(), "yyyy-MM-dd")).collect(Collectors.toSet());
|
|
|
|
|
|
- LocalDate now = LocalDate.now();
|
|
|
-
|
|
|
LocalDate startDate = LocalDate.of(year, Objects.isNull(month)?1:month, 1);
|
|
|
Integer oldMonth = Objects.isNull(month)?new Integer(1):month;
|
|
|
while (oldMonth.equals(startDate.get(ChronoField.MONTH_OF_YEAR))){
|