付款管理-明细导出字段增加

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwpayment/entity/HwPaymentDetailExportOut.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.hwpayment.entity;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.jeecgframework.poi.excel.annotation.Excel;
 
@@ -16,22 +17,33 @@ public class HwPaymentDetailExportOut implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @Excel(name = "姓名", width = 15)
-    private String userName; //姓名
+    private String userName;
 
     @Excel(name = "身份证号", width = 20)
-    public String idcardNumber;//身份证号
+    public String idcardNumber;
 
     @Excel(name = "手机号", width = 15)
     private String phone;
 
+    /**
+     * 他行开户行（他行时必填）
+     */
+    @Excel(name = "银行名称", width = 15)
+    private java.lang.String eacbnk;
+    /**
+     * 他行开户地址（他行时必填）
+     */
+    @Excel(name = "开户地", width = 15)
+    private java.lang.String rcveaa;
+
     @Excel(name = "银行卡号", width = 20)
-    private String cardNumber;//银行卡号
+    private String cardNumber;
 
 
     @Excel(name = "付款金额", width = 15)
-    private Double payment; //金额
+    private Double payment;
 
-    private Integer id;//序号
+    private Integer id;
 
 
 }

happy-boot-module-flexjob/src/main/java/org/jeecg/modules/hwpayment/service/impl/HwPaymentDetailServiceImpl.java

@@ -204,7 +204,7 @@ public class HwPaymentDetailServiceImpl extends ServiceImpl<HwPaymentDetailMappe
 
             for (int i = 0; i < hwPaymentDetailList.size(); i++) {
                 String requirementId = hwPaymentDetailList.get(i).getRequirementId();   //需求编号
-                if(StringUtils.isBlank(requirementId) || !requirementId.equals(hwPaymentDetailList.get(0).getRequirementId())){
+                if (StringUtils.isBlank(requirementId) || !requirementId.equals(hwPaymentDetailList.get(0).getRequirementId())) {
                     map1.put("reason", "您导入的付款单需在同一需求");
                     resultlist.add(map1);
                     return resultlist;
@@ -269,7 +269,7 @@ public class HwPaymentDetailServiceImpl extends ServiceImpl<HwPaymentDetailMappe
                     continue;
                 } else {
                     hwRequirement = hwRequirementService.getByRequiredCode(requirementId);
-                    List<HwOrder> hwOrderList = hwOrderService.findHwOrderListByIdcardAndRequireId(String.valueOf(hwRequirement.getId()),idcardNumber);
+                    List<HwOrder> hwOrderList = hwOrderService.findHwOrderListByIdcardAndRequireId(String.valueOf(hwRequirement.getId()), idcardNumber);
                     if (hwOrderList.size() > 0) {
                         hwPaymentDetailList.get(j).setOrderId(hwOrderList.get(0).getOrderNumber());
                         if (hwOrderList.get(0).getStatus() != 2) {
@@ -680,6 +680,8 @@ public class HwPaymentDetailServiceImpl extends ServiceImpl<HwPaymentDetailMappe
                     hwPaymentDetailDto.setPhone(jsonObjectDetail.getString("phone"));
                     hwPaymentDetailDto.setCardNumber(jsonObjectDetail.getString("cardNumber"));
                     hwPaymentDetailDto.setPayment(jsonObjectDetail.getDouble("netPayment"));
+                    hwPaymentDetailDto.setEacbnk(jsonObjectDetail.getString("eacbnk"));
+                    hwPaymentDetailDto.setRcveaa(jsonObjectDetail.getString("rcveaa"));
                     list.add(hwPaymentDetailDto);
                 }
                 log.info("付款申请详情列表数组==={}", list);