From 9475b5c7c9989f1a749bcc5e600eee6a09c5fa34 Mon Sep 17 00:00:00 2001
From: weiz <weiz@lihai.com>
Date: Mon, 15 Jan 2024 15:06:39 +0800
Subject: [PATCH] update

---
 .../FinancePaymentReceiptDifferenceController.php      | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/adminapi/controller/finance/FinancePaymentReceiptDifferenceController.php b/app/adminapi/controller/finance/FinancePaymentReceiptDifferenceController.php
index c386d7498..ccc4df449 100644
--- a/app/adminapi/controller/finance/FinancePaymentReceiptDifferenceController.php
+++ b/app/adminapi/controller/finance/FinancePaymentReceiptDifferenceController.php
@@ -16,7 +16,7 @@
 		//采购付款与收票差异
 		public function procure(): \think\response\Json
 		{
-			$params = $this->request->get(['page_no','page_size','contract_code','project_id']);
+			$params = $this->request->get(['page_no','page_size','contract_no','project_id']);
 			$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
 			$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
 			$where = [];
@@ -58,10 +58,16 @@
 		//分包付款与收票差异
 		public function subcontract(): \think\response\Json
 		{
-			$params = $this->request->get(['page_no','page_size','contract_code','project_id']);
+			$params = $this->request->get(['page_no','page_size','contract_no','project_id']);
 			$pageNo = empty($params['page_no']) ? 1 : $params['page_no'];
 			$pageSize = empty($params['page_size']) ? 15 : $params['page_size'];
 			$where = [];
+			if(isset($params['project_id']) && $params['project_id']){
+				$where[] = ['project_id','=',$params['project_id']];
+			}
+			if(isset($params['contract_no']) && $params['contract_no']){
+				$where[] = ['contract_no','like','%'.$params['contract_no'].'%'];
+			}
 			$data = SubcontractingContract::field('id,supplier_id,project_id,contract_no,signing_date,contract_amount')->where($where)->page($pageNo,$pageSize)
 				->order(['id' => 'desc'])
 				->select()->each(function($item){