|
@@ -931,25 +931,25 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
|
|
|
}
|
|
|
}
|
|
|
membRowData.add(workingTime+"");
|
|
|
- membRowData.add(salary.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(old.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(medical.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(injury.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(house.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(salary.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(bonus.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(allowance.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(old.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(medical.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(loseJob.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(injury.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(house.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
//自定义字段
|
|
|
if (cusColList.size() > 0) {
|
|
|
- membRowData.add(field1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field1.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
if (cusColList.size() > 1) {
|
|
|
- membRowData.add(field2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field2.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
if (cusColList.size() > 2) {
|
|
|
- membRowData.add(field3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field3.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
- membRowData.add(cost.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(cost.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
allList.add(membRowData);
|
|
|
}
|
|
|
}
|
|
@@ -1009,25 +1009,25 @@ public class FinanceServiceImpl extends ServiceImpl<FinanceMapper, Finance> impl
|
|
|
}
|
|
|
}
|
|
|
membRowData.add(workingTime+"");
|
|
|
- membRowData.add(salary.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(bonus.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(allowance.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(old.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(medical.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(loseJob.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(injury.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
- membRowData.add(house.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(salary.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(bonus.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(allowance.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(old.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(medical.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(loseJob.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(injury.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(house.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
//自定义字段
|
|
|
if (cusColList.size() > 0) {
|
|
|
- membRowData.add(field1.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field1.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
if (cusColList.size() > 1) {
|
|
|
- membRowData.add(field2.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field2.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
if (cusColList.size() > 2) {
|
|
|
- membRowData.add(field3.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(field3.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
}
|
|
|
- membRowData.add(cost.setScale(2, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
+ membRowData.add(cost.setScale(3, BigDecimal.ROUND_HALF_UP).toPlainString());
|
|
|
allList.add(membRowData);
|
|
|
}
|
|
|
}
|