From a5f3dc926d62ef0d5a45b695162dce02e513c1ac Mon Sep 17 00:00:00 2001
From: fanzongzhe0036 <fan6088588>
Date: Thu, 10 Apr 2025 09:56:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=90=88=E5=B9=B6?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E9=87=91=E8=9D=B6=E4=BB=98=E6=AC=BE=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fin/biz/finpaymentrecord/FinPaymentrecordService.java     | 3 ---
 .../kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java   | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

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 0bad6db5ab..37d80a0749 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
@@ -52,8 +52,6 @@ import com.yxt.anrui.base.common.enums.DictCommonEnum;
 import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
 import com.yxt.anrui.fin.api.finpaymentapply.FinPaymentapply;
 import com.yxt.anrui.fin.api.finpaymentapplydetails.FinPaymentapplyDetails;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelow;
-import com.yxt.anrui.fin.api.finpaymentapplydetailsbeloweve.FinPaymentapplyDetailsBelowEve;
 import com.yxt.anrui.fin.api.finpaymentapplyeve.FinPaymentapplyEve;
 import com.yxt.anrui.fin.api.finpaymentapplyvehicle.FinPaymentapplyVehicleVo;
 import com.yxt.anrui.fin.api.finpaymentrecord.*;
@@ -73,7 +71,6 @@ import com.yxt.anrui.fin.biz.kingdee.voucher.VoucherService;
 import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
 import com.yxt.anrui.portal.api.flow.FlowableFeign;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
-import com.yxt.anrui.portal.api.sysmapping.SysMappingFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
index f7316c8d4d..9252e25082 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/appaybill/ApPayBillCastToKingDeeBillFields.java
@@ -47,8 +47,8 @@ public class ApPayBillCastToKingDeeBillFields {
             for (Map.Entry<String, String> entry : params.entrySet()) {
                 map_fEntityDetail_.put(entry.getKey(),entry.getValue());
             }
-            fPAYBILLENTRY_ =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
-            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_,Feature.OrderedField));
+           String fPAYBILLENTRY_NEW =KingDeeUtils.replaceTemplateParams(fPAYBILLENTRY_, map_fEntityDetail_);
+            list_fEntityDetail_.add(JSONObject.parseObject(fPAYBILLENTRY_NEW,Feature.OrderedField));
         }
 
         jsonFEntityModel_.put("FPAYBILLENTRY", JSONArray.parseArray(JSON.toJSONString(list_fEntityDetail_)));

From b0120fb56877af9756ebf3424869a78ae27b9fa6 Mon Sep 17 00:00:00 2001
From: ligaode <ligaode>
Date: Thu, 10 Apr 2025 09:58:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/finpaymentrecord/FinPaymentrecordService.java  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 0bad6db5ab..b1bb0f4629 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
@@ -1718,7 +1718,7 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
             }
             if (payPriceTotal.compareTo(exePayPriceTotal) == -1) {
                 //借方
-                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
+                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
                 voucherResultDetailDtoJF.setSubjectNo("1009.03");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@@ -1727,13 +1727,13 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setDebit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
                 //贷方
-                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
+                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
                 voucherResultDetailDtoDf.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDtoDf.setCredit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
             } else {
                 //借方
-                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
+                voucherResultDetailDtoJF.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
                 voucherResultDetailDtoJF.setSubjectNo("2111");
                 SysOrganizationVo deptVo = sysOrganizationFeign.fetchBySid(finPaymentrecord.getPurchaseSystemSid()).getData();
                 voucherResultDetailDtoJF.setDimensionDept(deptVo.getOrgCode());
@@ -1742,14 +1742,14 @@ public class FinPaymentrecordService extends MybatisBaseService<FinPaymentrecord
                 voucherResultDetailDtoJF.setDebit(exePayPriceTotal.add(bzj).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoJF);
                 //贷方1
-                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
+                voucherResultDetailDtoDf.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
                 voucherResultDetailDtoDf.setSubjectNo("1009.03");
                 voucherResultDetailDtoDf.setDimensionDept(deptVo.getOrgCode());
                 voucherResultDetailDtoDf.setBank(key);
                 voucherResultDetailDtoDf.setCredit(exePayPriceTotal.add(bzj).subtract(finPaymentrecord.getCost()).toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf);
                 //贷方2
-                voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + finPaymentapplyEve.getOpenDate());
+                voucherResultDetailDtoDf2.setSummary("还" + finPaymentrecord.getCostTitleValue() + DateUtil.formatDate(new Date()));
                 voucherResultDetailDtoDf2.setBankAccount(finPaymentrecord.getPayBankAccount());
                 voucherResultDetailDtoDf2.setCredit(finPaymentrecord.getCost().toString());
                 voucherResultDetailDtos.add(voucherResultDetailDtoDf2);