push

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

@@ -337,6 +337,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
             remittance1.setSalaryBizId(salary.getSalaryBizId());
             remittance1.setSalaryBizId(salary.getSalaryBizId());
             remittance1.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
             remittance1.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
             remittance1.setBank(dto.getBank1());
             remittance1.setBank(dto.getBank1());
+            remittance1.setBankName(dto.getBank1Name());
             remittance1.setAccountEndNo(dto.getAccountEndNo1());
             remittance1.setAccountEndNo(dto.getAccountEndNo1());
             remittance1.setCurrency(dto.getCurrency1());
             remittance1.setCurrency(dto.getCurrency1());
             remittance1.setAmount(dto.getAmount1());
             remittance1.setAmount(dto.getAmount1());
@@ -347,6 +348,7 @@ public class ApiSalaryServiceImpl implements ApiSalaryService {
             remittance2.setSalaryBizId(salary.getSalaryBizId());
             remittance2.setSalaryBizId(salary.getSalaryBizId());
             remittance2.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
             remittance2.setSalaryRemittanceBizId(RandomStringGenerator.generateBizId16(CommonEnum.UID_TYPE_SALARY_REMITTANCE.getCode()));
             remittance2.setBank(dto.getBank2());
             remittance2.setBank(dto.getBank2());
+            remittance2.setBankName(dto.getBank2Name());
             remittance2.setAccountEndNo(dto.getAccountEndNo2());
             remittance2.setAccountEndNo(dto.getAccountEndNo2());
             remittance2.setCurrency(dto.getCurrency2());
             remittance2.setCurrency(dto.getCurrency2());
             remittance2.setAmount(dto.getAmount2());
             remittance2.setAmount(dto.getAmount2());

yd-csf-feign/src/main/java/com/yd/csf/feign/dto/salary/ApiSalaryBatchAddDTO.java

@@ -49,11 +49,16 @@ public class ApiSalaryBatchAddDTO {
 
 
     //========以下是薪资汇款明细字段，两个汇款明细对象
     //========以下是薪资汇款明细字段，两个汇款明细对象
     /**
     /**
-     * 收款银行1
+     * 收款银行1ID
      */
      */
     private String bank1;
     private String bank1;
 
 
     /**
     /**
+     * 收款银行1名称
+     */
+    private String bank1Name;
+
+    /**
      * 账户尾号1
      * 账户尾号1
      */
      */
     private String accountEndNo1;
     private String accountEndNo1;
@@ -79,11 +84,16 @@ public class ApiSalaryBatchAddDTO {
     private String remark1;
     private String remark1;
 
 
     /**
     /**
-     * 收款银行1
+     * 收款银行2ID
      */
      */
     private String bank2;
     private String bank2;
 
 
     /**
     /**
+     * 收款银行2名称
+     */
+    private String bank2Name;
+
+    /**
      * 账户尾号1
      * 账户尾号1
      */
      */
     private String accountEndNo2;
     private String accountEndNo2;