|
|
@@ -315,7 +315,7 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
Double reduceTime = 0d;
|
|
|
for (CourseListVo courseListVo : substituteList) {
|
|
|
Set<LocalDate> deleteDates = deleteMap.get(courseListVo.getClassId());
|
|
|
- if(deleteDates.contains(courseListVo.getScheduleDate())){
|
|
|
+ if(deleteDates !=null && deleteDates.contains(courseListVo.getScheduleDate())){
|
|
|
continue;
|
|
|
}
|
|
|
reduceTime += weightSetMap.get(courseListVo.getShortName());
|
|
|
@@ -393,8 +393,9 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
|
}
|
|
|
//计算出总的超出课时并计算超课时费
|
|
|
BigDecimal allCcksTime = BigDecimal.ZERO;
|
|
|
- if(allClassTime > ccksTime.multiply(BigDecimal.valueOf(weekTimeRangeVos.size())).doubleValue()){//如果总的课时超出规定课时
|
|
|
- allCcksTime = BigDecimal.valueOf(allClassTime).subtract(ccksTime.multiply(BigDecimal.valueOf(weekTimeRangeVos.size())));
|
|
|
+ BigDecimal ccksTime2 = ccksTime.multiply(BigDecimal.valueOf(weekTimeRangeVos.size()));
|
|
|
+ if(allClassTime > ccksTime2.doubleValue()){//如果总的课时超出规定课时
|
|
|
+ allCcksTime = BigDecimal.valueOf(allClassTime).subtract(ccksTime2);
|
|
|
}
|
|
|
beyondClassTimeAmount = allCcksTime.multiply(ccksCost).doubleValue();
|
|
|
if(!"FB1601".equals(teacher.getEmployType())){
|
