From c6524f2f51a1cb8e3caf72764c92478a20b9f1d1 Mon Sep 17 00:00:00 2001 From: ligaode Date: Mon, 20 Jan 2025 15:31:59 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinPaymentapplyDetailsBelowEveQuery.java | 1 + .../api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java | 2 ++ .../fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java | 2 ++ .../FinPaymentapplyDetailsBelowEveService.java | 3 +-- 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java index 680e4af7ef..37741e6ebc 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveQuery.java @@ -69,6 +69,7 @@ public class FinPaymentapplyDetailsBelowEveQuery implements Query { private String remarks; @ApiModelProperty("支付状态") private String state; + private String useOrgSid; private String orgPath; private String userSid; diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java index fc85aa650f..8bf2d1f0fb 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDetailsVo.java @@ -53,6 +53,8 @@ public class FinPaymentapplyEveDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid @ApiModelProperty("平仓款名称") diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java index ea708944e6..acced7a426 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentapplyeve/FinPaymentapplyEveDto.java @@ -53,6 +53,8 @@ public class FinPaymentapplyEveDto implements Dto { private String sid; // sid + @ApiModelProperty("备注") + private String remarks; @ApiModelProperty("付款申请sid") private String applySid; // 付款申请sid @ApiModelProperty("平仓款名称") diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java index 4cf454e3dd..583e34d187 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finpaymentapplydetailsbeloweve/FinPaymentapplyDetailsBelowEveService.java @@ -152,8 +152,7 @@ public class FinPaymentapplyDetailsBelowEveService extends MybatisBaseService chooseEve(PagerQuery pq) { FinPaymentapplyDetailsBelowEveQuery query = pq.getParams(); QueryWrapper qw = new QueryWrapper<>(); - String useOrgSid = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData(); - qw.eq("fe.useOrgSid", useOrgSid); + qw.eq("fe.useOrgSid", query.getUseOrgSid()); if (StringUtils.isNotBlank(query.getPayCompany())) { qw.like("fe.payCompany", query.getPayCompany()); }