From b46d0121ee469f38fb808297a05f0278d270381d Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Tue, 8 Apr 2025 15:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=87=BA=E7=BA=B3=E4=BB=A3?=
 =?UTF-8?q?=E4=BB=98=E6=AC=BE=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java    | 2 ++
 .../anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml | 3 ++-
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java     | 4 ----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
index 21e7942b41..54a064529c 100644
--- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
+++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
@@ -97,4 +97,6 @@ public class FinPaymentrecordVo implements Vo {
     private String payWayValue;
     @ApiModelProperty("批量处理编码")
     private String batchNumber;
+    @ApiModelProperty("推送财务数据类型（0付款单,1凭证）")
+    private Integer finDataType;
 }
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
index 84654ae1a9..ae1814d6ed 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordMapper.xml
@@ -28,7 +28,8 @@
                fp.busRemarks,
                fp.payWayKey,
                fp.payWayValue,
-                fp.batchNumber
+                fp.batchNumber,
+               fp.finDataType
         FROM fin_paymentrecord fp
         LEFT JOIN anrui_portal.sys_organization so ON fp.createOrgSid = so.sid
         <where>
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
index dcffb53338..216378768f 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentrecord/FinPaymentrecordService.java
@@ -1025,10 +1025,6 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
         return rb.success();
     }
 
-    private Voucher pushPaymentVoucherReturnVoucher(String busSid, String sid) {
-
-        return null;
-    }
 
     public ApPayBill buildBatchApPayBill(List<ApPayBill> list) {
         ApPayBill apPayBill = new ApPayBill();