diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java index b892d17..ef7626b 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/domain/bo/PsContractInfoQueryBo.java @@ -97,5 +97,9 @@ public class PsContractInfoQueryBo { */ private String isProxy; + /** + * 1全部回款 0未全部回款 + */ + private Integer allReturn; } diff --git a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java index d7ac96c..0e57c66 100644 --- a/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java +++ b/pusong-modules/pusong-business/src/main/java/com/pusong/business/service/impl/PsContractInfoServiceImpl.java @@ -409,6 +409,13 @@ public class PsContractInfoServiceImpl implements IPsContractInfoService { log.info("托管服务"); } QueryWrapper lqw = buildQueryWrapper(bo); + String sql = "IFNULL((select sum(money) from ps_contract_pay where pay_status = 1 and business_type = 1 and contract_code = info.contract_code),0) - IFNULL((select sum(money) from ps_contract_pay where pay_status = 1 and business_type = 2 and contract_code = info.contract_code),0)"; + if (bo.getAllReturn() == 1){ + lqw.apply("info.contract_amount <= " + sql); + } else if (bo.getAllReturn() == 0) { + lqw.apply("info.contract_amount > " + sql); + } + Page result = baseMapper.selectPageContractList(pageQuery.build(), lqw); if(CollectionUtils.isEmpty(result.getRecords())){ return TableDataInfo.build(result);