diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java index 8bcd1c2a7..64d0b6578 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java @@ -1486,19 +1486,19 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe for (FsdReportJSONParam childrenParam : childrenParamList) { Map valueMap = countFsdReportDTO(lssjMap, childrenParam, totalSalaryAcctEmployeeList, totalAcctResultPOList, itemIds, sumItemIds, ylaogrItemId, yliaogrItemId, gjjgrItemId); String avgEmpNums = (NumberUtils.isCreatable(Utils.null2String(valueMap.get("empNum"))) ? new BigDecimal(Utils.null2String(valueMap.get("empNum"))) : new BigDecimal("0")) - .divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP).toString(); + .divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP).toString(); String value = Utils.null2String(valueMap.get("value")); childrenParam.setThisYearAveEmpNums(avgEmpNums); childrenParam.setThisYearValue(value); sumEmpNums = sumEmpNums.add(SalaryEntityUtil.string2BigDecimalDefault0(Utils.null2String(valueMap.get("empNum")))); sumValue = sumValue.add(SalaryEntityUtil.string2BigDecimalDefault0(value)); } - rangeParam.setThisYearAveEmpNums(sumEmpNums.divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP).toString()); + rangeParam.setThisYearAveEmpNums(sumEmpNums.divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP).toString()); rangeParam.setThisYearValue(sumValue.toString()); } else { Map valueMap = countFsdReportDTO(lssjMap, rangeParam, totalSalaryAcctEmployeeList, totalAcctResultPOList, itemIds, sumItemIds, ylaogrItemId, yliaogrItemId, gjjgrItemId); String avgEmpNums = (NumberUtils.isCreatable(Utils.null2String(valueMap.get("empNum"))) ? new BigDecimal(Utils.null2String(valueMap.get("empNum"))) : new BigDecimal("0")) - .divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP).toString(); + .divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP).toString(); rangeParam.setThisYearAveEmpNums(avgEmpNums); rangeParam.setThisYearValue(Utils.null2String(valueMap.get("value"))); } @@ -1543,7 +1543,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe for (FsdReportJSONParam childrenParam : childrenParamList) { Map valueMap = countFsdReportDTO(lssjMap, childrenParam, totalSalaryAcctEmployeeList, totalAcctResultPOList, itemIds, sumItemIds, ylaogrItemId, yliaogrItemId, gjjgrItemId); BigDecimal avgEmpNumsVal = (NumberUtils.isCreatable(Utils.null2String(valueMap.get("empNum"))) ? new BigDecimal(Utils.null2String(valueMap.get("empNum"))) : new BigDecimal("0")) - .divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP); childrenParam.setLastYearAveEmpNums(avgEmpNumsVal.toString()); childrenParam.setLastYearValue(Utils.null2String(valueMap.get("value"))); // 获取今年平均人数和金额 @@ -1556,7 +1556,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe sumLastYearEmpNums = sumLastYearEmpNums.add(SalaryEntityUtil.string2BigDecimalDefault0(Utils.null2String(valueMap.get("empNum")))); sumLastYearValue = sumLastYearValue.add(SalaryEntityUtil.string2BigDecimalDefault0(Utils.null2String(valueMap.get("value")))); } - BigDecimal lastYearAveEmpNums = sumLastYearEmpNums.divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP); + BigDecimal lastYearAveEmpNums = sumLastYearEmpNums.divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP); rangeParam.setLastYearAveEmpNums(lastYearAveEmpNums.toString()); rangeParam.setLastYearValue(sumLastYearValue.toString()); // 获取今年平均人数和金额 @@ -1569,7 +1569,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe } else { Map valueMap = countFsdReportDTO(lssjMap, rangeParam, totalSalaryAcctEmployeeList, totalAcctResultPOList, itemIds, sumItemIds, ylaogrItemId, yliaogrItemId, gjjgrItemId); BigDecimal avgEmpNumsVal = (NumberUtils.isCreatable(Utils.null2String(valueMap.get("empNum"))) ? new BigDecimal(Utils.null2String(valueMap.get("empNum"))) : new BigDecimal("0")) - .divide(new BigDecimal(monthValue), 2, RoundingMode.HALF_UP); + .divide(new BigDecimal(monthValue), 0, RoundingMode.HALF_UP); rangeParam.setLastYearAveEmpNums(avgEmpNumsVal.toString()); rangeParam.setLastYearValue(Utils.null2String(valueMap.get("value")));