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; }