|
@@ -658,7 +658,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
if(cutSalaryUnit.equals("1")){
|
|
|
return new BigDecimal(cutSalary);
|
|
|
}else {
|
|
|
- return teacherSalary.multiply(new BigDecimal(cutSalary).divide(new BigDecimal(100)));
|
|
|
+ return teacherSalary.multiply(new BigDecimal(cutSalary).divide(new BigDecimal(100))).setScale(BigDecimal.ROUND_CEILING, BigDecimal.ROUND_HALF_UP);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -791,6 +791,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
String c1 = sysTenantConfigService.getTenantConfigValue(SysConfigService.OFFLINE_SIGN_IN_GPS_ERROR_CUT_SALARY_UNIT, tenantId);
|
|
|
BigDecimal signInGpsCutAmount = getCutAmount(c, c1, teacherSalary);
|
|
|
if(signInGpsCutAmount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ deductCost = deductCost.add(signInGpsCutAmount);
|
|
|
deductReasons.add("签到经纬度异常扣除" + signInGpsCutAmount);
|
|
|
}
|
|
|
}
|
|
@@ -799,6 +800,7 @@ public class CourseScheduleTeacherSalaryServiceImpl extends BaseServiceImpl<Long
|
|
|
String c1 = sysTenantConfigService.getTenantConfigValue(SysConfigService.OFFLINE_SIGN_OUT_GPS_ERROR_CUT_SALARY_UNIT, tenantId);
|
|
|
BigDecimal signOutGpsCutAmount = getCutAmount(c, c1, teacherSalary);
|
|
|
if(signOutGpsCutAmount.compareTo(BigDecimal.ZERO) > 0){
|
|
|
+ deductCost = deductCost.add(signOutGpsCutAmount);
|
|
|
deductReasons.add("签退经纬度异常扣除" + signOutGpsCutAmount);
|
|
|
}
|
|
|
}
|