diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java index 6073de0a..c72f020f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/common/PayIncomeContractCommon.java @@ -8,27 +8,27 @@ import java.util.List; public class PayIncomeContractCommon { /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS1 = 1; /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS2 = 2; /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS3 = 3; /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS4 = 4; /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS5 = 5; /** - * 合同状态(1:草稿,2:待审核,3:已通过,4:未通过,5:已存档,6:已作废) + * 合同状态(1:草稿(审核中),2:待审核,3:已通过(双方盖章),4:未通过,5:已存档,6:已作废) */ public final static Integer STATUS6 = 6; /** diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml index ba78c187..29cca89f 100644 --- a/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml +++ b/jero-boot-incoming-payment/src/main/java/com/jero/contract/mapper/xml/PayIncomeContractMapper.xml @@ -76,6 +76,9 @@ AND aa.contractName LIKE CONCAT('%',CONCAT(#{payIncomeContract.contractName},'%')) + + AND aa.signedCompanyTemporaryName LIKE CONCAT('%',CONCAT(#{payIncomeContract.signedCompanyTemporaryName},'%')) + AND DATE_FORMAT(aa.createTime,'%Y-%m-%d') >= #{startTime} 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 198631a2..b4d9ff95 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 @@ -49,6 +49,10 @@ AND contract_name LIKE CONCAT('%',CONCAT(#{paySpendingContract.contractName},'%')) + + AND signed_company_temporary_name LIKE CONCAT('%',CONCAT(#{paySpendingContract.signedCompanyTemporaryName},'%')) + + AND DATE_FORMAT(create_time,'%Y-%m-%d') >= #{startTime} @@ -130,4 +134,4 @@ ORDER BY chargeStatus desc,create_time desc - \ No newline at end of file +