push

yd-csf-api/src/main/java/com/yd/csf/api/service/impl/ApiSalaryServiceImpl.java

@@ -643,8 +643,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
             summaryRow.put("MPF(HK)", nullToZero(salary.getMpfAmount()));
             summaryRow.put("MPF(HK)", nullToZero(salary.getMpfAmount()));
             summaryRow.put("其他调整(HKD)", nullToZero(salary.getOtherAmount()));
             summaryRow.put("其他调整(HKD)", nullToZero(salary.getOtherAmount()));
             summaryRow.put("实发金额(HKD)", nullToZero(salary.getPaidAmount()));
             summaryRow.put("实发金额(HKD)", nullToZero(salary.getPaidAmount()));
-            summaryRow.put("扣款合计", BigDecimal.ZERO); // 暂无扣款合计字段
-            summaryRow.put("其他调整(HKD)", nullToZero(salary.getOtherAmount())); // 第二个
+            summaryRow.put("扣款合计", nullToZero(salary.getGrossAmount()).subtract(nullToZero(salary.getPaidAmount())));//扣款合计 = 应发-实发
             summaryRow.put("备注", salary.getRemark() != null ? salary.getRemark() : "");
             summaryRow.put("备注", salary.getRemark() != null ? salary.getRemark() : "");
             List<SalaryRemittance> rems = remittanceMap.getOrDefault(salary.getSalaryBizId(), Collections.emptyList());
             List<SalaryRemittance> rems = remittanceMap.getOrDefault(salary.getSalaryBizId(), Collections.emptyList());
             summaryRow.put("打款账户数", rems.size());
             summaryRow.put("打款账户数", rems.size());
@@ -663,7 +662,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
                 detailRow.put("姓名", salary.getBrokerName());
                 detailRow.put("姓名", salary.getBrokerName());
                 detailRow.put("内部编号", internalNumber);
                 detailRow.put("内部编号", internalNumber);
                 detailRow.put("薪资月份", formatMonth(salary.getMonth()));
                 detailRow.put("薪资月份", formatMonth(salary.getMonth()));
-                detailRow.put("收款银行", rem.getBank() != null ? rem.getBank() : "");
+                detailRow.put("收款银行", rem.getBankName());
                 detailRow.put("账户尾号", rem.getAccountEndNo() != null ? rem.getAccountEndNo() : "");
                 detailRow.put("账户尾号", rem.getAccountEndNo() != null ? rem.getAccountEndNo() : "");
                 detailRow.put("币种", rem.getCurrency() != null ? rem.getCurrency() : "");
                 detailRow.put("币种", rem.getCurrency() != null ? rem.getCurrency() : "");
                 detailRow.put("发放金额", nullToZero(rem.getAmount()));
                 detailRow.put("发放金额", nullToZero(rem.getAmount()));
@@ -682,7 +681,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
         sheet1.setFieldNames(Arrays.asList(
         sheet1.setFieldNames(Arrays.asList(
                 "发放编号", "所属团队", "姓名", "内部编号", "薪资月份",
                 "发放编号", "所属团队", "姓名", "内部编号", "薪资月份",
                 "应发金额(HKD)", "MPF(HK)", "其他调整(HKD)", "实发金额(HKD)",
                 "应发金额(HKD)", "MPF(HK)", "其他调整(HKD)", "实发金额(HKD)",
-                "扣款合计", "其他调整(HKD)", "备注", "打款账户数", "发放状态",
+                "扣款合计", "备注", "打款账户数", "发放状态",
                 "备注", "制作人", "制作时间"
                 "备注", "制作人", "制作时间"
         ));
         ));
         sheet1.setDataList(summaryList);
         sheet1.setDataList(summaryList);