|
@@ -560,6 +560,7 @@ public class BizFinancialSalaryController extends BaseController {
|
|
|
} else {
|
|
|
return;
|
|
|
}
|
|
|
+
|
|
|
ExcelWriter writer = cn.hutool.poi.excel.ExcelUtil.getWriter(true);
|
|
|
writer.merge(0, 0, 0, 12, "工资单", true);
|
|
|
writer.merge(1, 1, 0, 3, company.getName(), false);
|
|
@@ -611,7 +612,7 @@ public class BizFinancialSalaryController extends BaseController {
|
|
|
writer.writeCellValue(7, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getUnemploymentBenefit().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
writer.writeCellValue(8, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getSeriousIllnessInsurance().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
writer.writeCellValue(9, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getHousingFund().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
- writer.writeCellValue(10, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getCurrentIndividualIncomeTax().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
+ writer.writeCellValue(10, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getIndividualIncomeTaxConfirm().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
writer.writeCellValue(11, row + 3, BigDecimal.valueOf(financialSalaryDetail.getDetails().stream().mapToDouble(v -> v.getOtherCut().doubleValue()).sum()).setScale(2, RoundingMode.HALF_UP));
|
|
|
|
|
|
writer.writeCellValue(12, row + 3, "");
|