From e239b4d3cce7c075ad36c50f2ae37a5b7252296a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <18222067976@163.com>
Date: Wed, 27 Oct 2021 18:32:50 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug#41556?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jero/contract/mapper/PaySpendingContractMapper.java   | 2 +-
 .../com/jero/contract/mapper/xml/PayIncomeContractMapper.xml  | 3 +++
 .../jero/contract/mapper/xml/PaySpendingContractMapper.xml    | 3 +++
 .../jero/contract/service/IPaySpendingContractService.java    | 2 +-
 .../contract/service/impl/PaySpendingContractServiceImpl.java | 4 ++--
 5 files changed, 10 insertions(+), 4 deletions(-)

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 d5d2244c..c2f06047 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,7 +36,7 @@ public interface PaySpendingContractMapper extends BaseMapper<PaySpendingContrac
      * @Return
      * @Exception
      */
-    List<PaySpendingContract> queryList(@Param("contractNum") String contractNum,
+    List<PaySpendingContract> queryList(@Param("principalId") String principalId, @Param("contractNum") String contractNum,
                                         @Param("contractName") String contractName,@Param("startTime") String startTime,
                                         @Param("endTime") String endTime);
 
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 2e9272cb..521bdff2 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
@@ -295,6 +295,9 @@
             <if test="projectName != null and projectName != ''">
                 AND aa.associatedProject LIKE CONCAT('%',CONCAT(#{projectName},'%'))
             </if>
+            <if test="payIncomeContract.principalId != null and payIncomeContract.principalId != ''">
+                AND aa.principalId = #{payIncomeContract.principalId}
+            </if>
         </where>
         ORDER BY aa.chargeStatus desc,aa.statusOrder desc, aa.createTime desc
     </select>
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 a8085638..e6e3c365 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
@@ -109,6 +109,9 @@
             <if test="endTime != null and endTime != ''">
                 AND DATE_FORMAT(create_time,'%Y-%m-%d') &lt;= #{endTime}
             </if>
+            <if test="principalId != null and principalId != ''">
+                AND principal_id = #{principalId}
+            </if>
         </where>
         ORDER BY chargeStatus desc,create_time desc
     </select>
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 dec52bb5..3c1acc02 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
@@ -79,5 +79,5 @@ public interface IPaySpendingContractService extends IService<PaySpendingContrac
      * @Return
      * @Exception
      */
-    List<PaySpendingContract> queryList(String contractNum,String contractName,String startTime,String endTime);
+    List<PaySpendingContract> queryList(String principalId, String contractNum,String contractName,String startTime,String endTime);
 }
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 c421eff5..9b99b4c8 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
@@ -520,8 +520,8 @@ public class PaySpendingContractServiceImpl extends ServiceImpl<PaySpendingContr
     }
 
     @Override
-    public List<PaySpendingContract> queryList(String contractNum, String contractName, String startTime, String endTime) {
-        return paySpendingContractMapper.queryList( contractNum,  contractName,  startTime,  endTime);
+    public List<PaySpendingContract> queryList(String principalId,String contractNum, String contractName, String startTime, String endTime) {
+        return paySpendingContractMapper.queryList(principalId, contractNum,  contractName,  startTime,  endTime);
     }