|
@@ -2578,23 +2578,23 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
|
|
|
BigDecimal assignAmountField6 = i < filteredList.size() -1 ?user.getCustomField6().multiply(ratio):user.getCustomField6().subtract(accumulateField6);
|
|
BigDecimal assignAmountField6 = i < filteredList.size() -1 ?user.getCustomField6().multiply(ratio):user.getCustomField6().subtract(accumulateField6);
|
|
|
BigDecimal assignAmountField7 = i < filteredList.size() -1 ?user.getCustomField7().multiply(ratio):user.getCustomField7().subtract(accumulateField7);
|
|
BigDecimal assignAmountField7 = i < filteredList.size() -1 ?user.getCustomField7().multiply(ratio):user.getCustomField7().subtract(accumulateField7);
|
|
|
|
|
|
|
|
- assignAmount = assignAmount.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountSalary = assignAmountSalary.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountBonus = assignAmountBonus.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountAllowance = assignAmountAllowance.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountOld = assignAmountOld.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountMedical = assignAmountMedical.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountLoseJob = assignAmountLoseJob.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountInjury = assignAmountInjury.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountHouse = assignAmountHouse.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountOther = assignAmountOther.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField1 = assignAmountField1.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField2 = assignAmountField2.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField3 = assignAmountField3.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField4 = assignAmountField4.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField5 = assignAmountField5.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField6 = assignAmountField6.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField7 = assignAmountField7.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
+ assignAmount = assignAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountSalary = assignAmountSalary.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountBonus = assignAmountBonus.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountAllowance = assignAmountAllowance.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountOld = assignAmountOld.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountMedical = assignAmountMedical.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountLoseJob = assignAmountLoseJob.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountInjury = assignAmountInjury.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountHouse = assignAmountHouse.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountOther = assignAmountOther.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField1 = assignAmountField1.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField2 = assignAmountField2.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField3 = assignAmountField3.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField4 = assignAmountField4.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField5 = assignAmountField5.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField6 = assignAmountField6.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField7 = assignAmountField7.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
|
accumulate = accumulate.add(assignAmount);
|
|
accumulate = accumulate.add(assignAmount);
|
|
|
accumulateSalary = accumulateSalary.add(assignAmountSalary);
|
|
accumulateSalary = accumulateSalary.add(assignAmountSalary);
|
|
@@ -2853,23 +2853,23 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
|
|
|
BigDecimal assignAmountField6 = i < filteredList.size() -1 ?publicProjectField6.multiply(ratio):publicProjectField6.subtract(accumulateField6);
|
|
BigDecimal assignAmountField6 = i < filteredList.size() -1 ?publicProjectField6.multiply(ratio):publicProjectField6.subtract(accumulateField6);
|
|
|
BigDecimal assignAmountField7 = i < filteredList.size() -1 ?publicProjectField7.multiply(ratio):publicProjectField7.subtract(accumulateField7);
|
|
BigDecimal assignAmountField7 = i < filteredList.size() -1 ?publicProjectField7.multiply(ratio):publicProjectField7.subtract(accumulateField7);
|
|
|
|
|
|
|
|
- assignAmount = assignAmount.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountSalary = assignAmountSalary.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountBonus = assignAmountBonus.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountAllowance = assignAmountAllowance.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountOld = assignAmountOld.setScale(6,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountMedical = assignAmountMedical.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountLoseJob = assignAmountLoseJob.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountInjury = assignAmountInjury.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountHouse = assignAmountHouse.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountOther = assignAmountOther.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField1 = assignAmountField1.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField2 = assignAmountField2.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField3 = assignAmountField3.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField4 = assignAmountField4.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField5 = assignAmountField5.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField6 = assignAmountField6.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- assignAmountField7 = assignAmountField7.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
+ assignAmount = assignAmount.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountSalary = assignAmountSalary.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountBonus = assignAmountBonus.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountAllowance = assignAmountAllowance.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountOld = assignAmountOld.setScale(2,BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountMedical = assignAmountMedical.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountLoseJob = assignAmountLoseJob.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountInjury = assignAmountInjury.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountHouse = assignAmountHouse.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountOther = assignAmountOther.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField1 = assignAmountField1.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField2 = assignAmountField2.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField3 = assignAmountField3.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField4 = assignAmountField4.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField5 = assignAmountField5.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField6 = assignAmountField6.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ assignAmountField7 = assignAmountField7.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
|
accumulate = accumulate.add(assignAmount);
|
|
accumulate = accumulate.add(assignAmount);
|
|
|
accumulateSalary = accumulateSalary.add(assignAmountSalary);
|
|
accumulateSalary = accumulateSalary.add(assignAmountSalary);
|
|
@@ -2940,25 +2940,25 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
//整体四舍五入处理
|
|
//整体四舍五入处理
|
|
|
- totalMoneyCost = totalMoneyCost.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
+ totalMoneyCost = totalMoneyCost.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
pList.forEach(p->{
|
|
pList.forEach(p->{
|
|
|
- p.cost = p.cost.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.salary = p.salary.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.bonus = p.bonus.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.allowance = p.allowance.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.old = p.old.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.medical = p.medical.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.loseJob = p.loseJob.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.injury = p.injury.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.house = p.house.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.other = p.other.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field1 = p.field1.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field2 = p.field2.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field3 = p.field3.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field4 = p.field4.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field5 = p.field5.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field6 = p.field6.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
- p.field7 = p.field7.setScale(6, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
|
|
+ p.cost = p.cost.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.salary = p.salary.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.bonus = p.bonus.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.allowance = p.allowance.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.old = p.old.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.medical = p.medical.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.loseJob = p.loseJob.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.injury = p.injury.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.house = p.house.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.other = p.other.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field1 = p.field1.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field2 = p.field2.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field3 = p.field3.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field4 = p.field4.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field5 = p.field5.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field6 = p.field6.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
|
|
+ p.field7 = p.field7.setScale(2, BigDecimal.ROUND_HALF_UP);
|
|
|
});
|
|
});
|
|
|
resultMap.put("costList", pList);
|
|
resultMap.put("costList", pList);
|
|
|
resultMap.put("percentTotal", percentTotal);
|
|
resultMap.put("percentTotal", percentTotal);
|
yusm