diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java index 04225069..5a07d442 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/controller/PaySpendingContractController.java @@ -21,6 +21,7 @@ import com.jero.common.system.base.controller.JeroController; import com.jero.common.system.vo.LoginUser; import com.jero.common.util.DateUtils; import com.jero.common.util.oConvertUtils; +import com.jero.contract.common.PayIncomeContractCommon; import com.jero.contract.entity.*; import com.jero.contract.service.IPaySpendingContractAuditService; import com.jero.contract.service.IPaySpendingContractInstallmentService; @@ -317,14 +318,14 @@ public class PaySpendingContractController extends JeroController pageList = paySpendingContractService.queryList(paySpendingContract.getPrincipalId(), paySpendingContract.getContractNum(), - paySpendingContract.getContractName(),startTime,endTime); + List pageList = paySpendingContractService.queryList(paySpendingContract,startTime,endTime,chargeStatus); List exportList = null; // 过滤选中数据 diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java index 0eadf172..c01bfe8f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/PaySpendingContractMapper.java @@ -36,8 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum, - @Param("contractName") String contractName,@Param("startTime") String startTime, - @Param("endTime") String endTime); + List queryList(@Param("paySpendingContract") PaySpendingContract paySpendingContract + ,@Param("startTime") String startTime, @Param("endTime") String endTime,@Param("chargeStatus") String chargeStatus); } diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml index ae85f392..42c7841e 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PaySpendingContractMapper.xml @@ -58,10 +58,10 @@ AND principal_id = #{paySpendingContract.principalId} - AND aa.status = #{paySpendingContract.status} + AND psc.status = #{paySpendingContract.status} - AND aa.chargeStatus = #{chargeStatus} + AND psc.chargeStatus = #{chargeStatus} ORDER BY chargeStatus desc,create_time desc @@ -105,11 +105,11 @@ ) AS chargeStatus FROM pay_spending_contract psc - - AND contract_num LIKE CONCAT('%',CONCAT(#{contractNum},'%')) + + AND contract_num LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractNum},'%')) - - AND contract_name LIKE CONCAT('%',CONCAT(#{contractName},'%')) + + AND contract_name LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractName},'%')) AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime} @@ -117,8 +117,14 @@ AND DATE_FORMAT(create_time,'%Y-%m-%d') <= #{endTime} - - AND principal_id = #{principalId} + + AND principal_id = #{paySpendingContract.principalId} + + + AND psc.status = #{paySpendingContract.status} + + + AND psc.chargeStatus = #{chargeStatus} ORDER BY chargeStatus desc,create_time desc diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java index 3789b2a3..e862f9a3 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/IPaySpendingContractService.java @@ -82,7 +82,7 @@ public interface IPaySpendingContractService extends IService queryList(String contractNum,String contractName,String startTime,String endTime); + List queryList(PaySpendingContract paySpendingContract,String startTime,String endTime,String chargeStatus); /** * @Description 审核 * @Author lqt diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java index b574b947..65b4e018 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/service/impl/PaySpendingContractServiceImpl.java @@ -549,6 +549,7 @@ public class PaySpendingContractServiceImpl extends ServiceImpl listPaySpendingContractInstallment = p.getListInstallment(); if(!CollectionUtils.isEmpty(listPaySpendingContractInstallment)){ @@ -568,8 +569,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) { - return paySpendingContractMapper.queryList(principalId, contractNum, contractName, startTime, endTime); + public List queryList(PaySpendingContract paySpendingContract,String startTime,String endTime,String chargeStatus) { + return paySpendingContractMapper.queryList( paySpendingContract, startTime, endTime, chargeStatus); } @Override