|
@@ -426,10 +426,6 @@ public class ClassTimeStatisticsServiceImpl extends MPJBaseServiceImpl<ClassTime
|
|
ccksCost = BigDecimal.valueOf(costSetMap.get("cost10"));
|
|
ccksCost = BigDecimal.valueOf(costSetMap.get("cost10"));
|
|
}
|
|
}
|
|
//计算出总的超出课时并计算超课时费
|
|
//计算出总的超出课时并计算超课时费
|
|
- BigDecimal ccksTime2 = ccksTime.multiply(BigDecimal.valueOf(weekTimeRangeVos.size()));
|
|
|
|
- if(allClassTime > ccksTime2.doubleValue()){//如果总的课时超出规定课时
|
|
|
|
- allCcksTime = BigDecimal.valueOf(allClassTime).subtract(ccksTime2).doubleValue();
|
|
|
|
- }
|
|
|
|
beyondClassTimeAmount = BigDecimal.valueOf(allCcksTime).multiply(ccksCost).doubleValue();
|
|
beyondClassTimeAmount = BigDecimal.valueOf(allCcksTime).multiply(ccksCost).doubleValue();
|
|
if(!"FB1601".equals(teacher.getEmployType())){
|
|
if(!"FB1601".equals(teacher.getEmployType())){
|
|
record.setBeyondClassTimeAmount(beyondClassTimeAmount);
|
|
record.setBeyondClassTimeAmount(beyondClassTimeAmount);
|