修改bug#41556

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

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>

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>

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

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