|
@@ -382,7 +382,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
List<CourseScheduleComplaints> courseStudentComplaints = complaintsGroupByCourse.get(courseScheduleTeacherSalary.getCourseScheduleId());
|
|
|
|
|
|
//如果存在投诉记录,需要扣除相应费用
|
|
|
- if (Objects.nonNull(courseStudentComplaints)) {
|
|
|
+ /*if (Objects.nonNull(courseStudentComplaints)) {
|
|
|
//获取审批中的投诉
|
|
|
List<CourseScheduleComplaints> auditIng = courseStudentComplaints.stream().filter(courseScheduleComplaint -> courseScheduleComplaint.getStatus() == AuditStatusEnum.ING).collect(Collectors.toList());
|
|
|
if (!CollectionUtils.isEmpty(auditIng)) {
|
|
@@ -390,12 +390,12 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
return;
|
|
|
}
|
|
|
//计算教师责任总占比
|
|
|
-// double teacherLiabilityRatioSum = courseStudentComplaints.stream().mapToDouble(courseScheduleComplaint -> Objects.isNull(courseScheduleComplaint.getTeacherLiabilityRatio()) ? 0 : courseScheduleComplaint.getTeacherLiabilityRatio()).sum();
|
|
|
-// teacherLiabilityAllratio = new BigDecimal(teacherLiabilityRatioSum).divide(percent,CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN);
|
|
|
+ double teacherLiabilityRatioSum = courseStudentComplaints.stream().mapToDouble(courseScheduleComplaint -> Objects.isNull(courseScheduleComplaint.getTeacherLiabilityRatio()) ? 0 : courseScheduleComplaint.getTeacherLiabilityRatio()).sum();
|
|
|
+ teacherLiabilityAllratio = new BigDecimal(teacherLiabilityRatioSum).divide(percent,CommonConstants.DECIMAL_PLACE,BigDecimal.ROUND_DOWN);
|
|
|
} else {
|
|
|
//如果没有投诉,则教师和学生的责任占比为0
|
|
|
-// teacherLiabilityAllratio = new BigDecimal(0);
|
|
|
- }
|
|
|
+ teacherLiabilityAllratio = new BigDecimal(0);
|
|
|
+ }*/
|
|
|
|
|
|
//教师应扣除费用
|
|
|
/*BigDecimal deductPrice = avgSalary.multiply(teacherLiabilityAllratio);
|