Joburgess пре 4 година
родитељ
комит
f1449100f9

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

@@ -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))){

+ 0 - 1
mec-biz/src/main/resources/config/mybatis/CourseScheduleTeacherSalaryMapper.xml

@@ -1096,7 +1096,6 @@
 			AND (cs.is_lock_=0 OR cs.is_lock_ IS NULL)
 			AND (cs.new_course_id_ IS NULL OR cs.new_course_id_=cs.id_)
 			AND csts.user_id_ = #{teacherId}
-			AND cs.class_date_ BETWEEN #{startDay} AND #{endDay}
 			<if test="courseStatus!=null">
 				AND cs.status_ = #{courseStatus, typeHandler=com.ym.mec.common.dal.CustomEnumTypeHandler}
 			</if>