From 1b28afede512e5c05eb1d9ccf017b52fb584313a Mon Sep 17 00:00:00 2001 From: c1769 Date: Fri, 7 Jul 2023 11:46:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=98=E8=B4=A7=E8=B4=A8=E6=8A=BC=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=20=E6=9C=80=E5=90=8E=E4=B8=80=E6=AD=A5=E5=AE=8C?= =?UTF-8?q?=E7=BB=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jlw/flow/contractsproducts/dao/ContractsProductsDao.java | 2 +- .../contractsproducts/service/ContractsProductsService.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/dao/ContractsProductsDao.java b/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/dao/ContractsProductsDao.java index 704b84e..4ec4e1f 100644 --- a/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/dao/ContractsProductsDao.java +++ b/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/dao/ContractsProductsDao.java @@ -20,7 +20,7 @@ public interface ContractsProductsDao extends BaseMapper { List getList(ContractsProducts queryParam); - BigDecimal getHadPickupAmount(Long contractId); + BigDecimal getHadPickupAmount(Long contractId, Long protocolId); BigDecimal getPickupAmountByIds(List ids); diff --git a/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/service/ContractsProductsService.java b/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/service/ContractsProductsService.java index 31a2ad2..e1ec46a 100644 --- a/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/service/ContractsProductsService.java +++ b/web/src/main/java/com/ibeetl/jlw/flow/contractsproducts/service/ContractsProductsService.java @@ -34,7 +34,7 @@ public class ContractsProductsService extends CoreBaseService } public BigDecimal getHadPickupAmount(Long contractId, Long protocolId) { - final BigDecimal hadPickupAmount = contractsProductsDao.getHadPickupAmount(contractId); + final BigDecimal hadPickupAmount = contractsProductsDao.getHadPickupAmount(contractId, protocolId); return hadPickupAmount == null ? BigDecimal.ZERO : hadPickupAmount; }