From 39f35a181f50135979c603777457a57e5236befc Mon Sep 17 00:00:00 2001 From: dimengzhe Date: Thu, 10 Aug 2023 10:41:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FinSelectedReceivablesPaymentDetailsQuery.java | 5 ++++- .../FinSelectedReceivablesDetailedService.java | 8 ++++++++ .../collectionConfirm/ReceivablesPaymentDetailsQuery.java | 3 +-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java index e4fe5b8eef..72f6bd355e 100644 --- a/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java +++ b/anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsQuery.java @@ -4,6 +4,7 @@ import com.yxt.common.core.query.Query; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.ArrayList; import java.util.List; /** @@ -34,6 +35,8 @@ public class FinSelectedReceivablesPaymentDetailsQuery implements Query { private String name; @ApiModelProperty("应收款项sid") - private List sids; + private List sids = new ArrayList<>(); + + private List sidList = new ArrayList<>(); } diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java index c4af687432..3e04c10a7d 100644 --- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java +++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java @@ -507,6 +507,14 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService sidsList = pagerQuery.getParams().getSidList(); + if (sidsList != null) { + for (String sid : sidsList) { + if (StringUtils.isNotBlank(sid)) { + qw.ne("fd.sid", sid); + } + } + } if(StringUtils.isNotBlank(params.getContractNo())){ qw.like("fd.contractNo",params.getContractNo()); } diff --git a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java index b9e5fd0614..5e4261ef73 100644 --- a/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java +++ b/anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/finance/collectionConfirm/ReceivablesPaymentDetailsQuery.java @@ -18,8 +18,7 @@ public class ReceivablesPaymentDetailsQuery implements Query { private String name; @ApiModelProperty("明细sid") - @JsonProperty("sidList") - private List sids; + private List sidList; @ApiModelProperty("分公司sid") private String useOrgSid;