|
@@ -2685,16 +2685,16 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
|
|
|
|
// 完成积分值(最终完成积分值 = 完成积分值 * (1+审核管理费比例))
|
|
// 完成积分值(最终完成积分值 = 完成积分值 * (1+审核管理费比例))
|
|
int actualScore = BigDecimal.valueOf(ysh).multiply(
|
|
int actualScore = BigDecimal.valueOf(ysh).multiply(
|
|
- wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
|
|
|
|
|
|
+ wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), 2, RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
|
|
).intValue();
|
|
).intValue();
|
|
|
|
|
|
// payScore(payScore = 完成积分值 * (1+审核管理费比例))
|
|
// payScore(payScore = 完成积分值 * (1+审核管理费比例))
|
|
int actualPayScore = BigDecimal.valueOf(payScore).multiply(
|
|
int actualPayScore = BigDecimal.valueOf(payScore).multiply(
|
|
- wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
|
|
|
|
|
|
+ wmScorePackage.getAuditManagementFeeRates().divide(new BigDecimal("100.00"), 2, RoundingMode.HALF_EVEN).add(BigDecimal.ONE)
|
|
).intValue();
|
|
).intValue();
|
|
|
|
|
|
BigDecimal payRate = new BigDecimal(actualPayScore).multiply(BigDecimal.valueOf(100))
|
|
BigDecimal payRate = new BigDecimal(actualPayScore).multiply(BigDecimal.valueOf(100))
|
|
- .divide(new BigDecimal(wmScorePackage.getScore()), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ .divide(new BigDecimal(wmScorePackage.getScore()), 2, RoundingMode.HALF_UP);
|
|
if (payRate.compareTo(new BigDecimal("100")) >= 0) {
|
|
if (payRate.compareTo(new BigDecimal("100")) >= 0) {
|
|
wmScorePackage.setPayRate(100 + ".00");
|
|
wmScorePackage.setPayRate(100 + ".00");
|
|
} else {
|
|
} else {
|
|
@@ -2702,7 +2702,7 @@ public class WmScorePackageServiceImpl extends ServiceImpl<WmScorePackageMapper,
|
|
}
|
|
}
|
|
|
|
|
|
BigDecimal fin = new BigDecimal(actualScore).multiply(BigDecimal.valueOf(100))
|
|
BigDecimal fin = new BigDecimal(actualScore).multiply(BigDecimal.valueOf(100))
|
|
- .divide(new BigDecimal(wmScorePackage.getScore()), 2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
+ .divide(new BigDecimal(wmScorePackage.getScore()), 2, RoundingMode.HALF_UP);
|
|
if (fin.compareTo(new BigDecimal("100")) > 0) {
|
|
if (fin.compareTo(new BigDecimal("100")) > 0) {
|
|
wmScorePackage.setFinishRate(100 + ".00");
|
|
wmScorePackage.setFinishRate(100 + ".00");
|
|
if ("0".equals(wmScorePackage.getPackageFinishStatus())) {
|
|
if ("0".equals(wmScorePackage.getPackageFinishStatus())) {
|