From 6100c6fd44770e84a2aab1e74dc62db6d8156345 Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Mon, 1 Apr 2024 10:21:40 +0800
Subject: [PATCH] update

---
 .../cost_project/CostApprovedProjectController.php          | 2 +-
 .../lists/cost_project/CostApprovedProjectLists.php         | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/controller/cost_project/CostApprovedProjectController.php b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
index 5c2a87d15..5419c351b 100644
--- a/app/adminapi/controller/cost_project/CostApprovedProjectController.php
+++ b/app/adminapi/controller/cost_project/CostApprovedProjectController.php
@@ -69,7 +69,7 @@
 				$where[] = ['contract_type', '=', $params['contract_type']];
 			}
 			$lists = CostApprovedProject::field('id,contract_num,contract_name,contract_type,business_nature,part_a,money,dept,create_date')
-				->where($where)
+				->where($where)->where('status', 2)
 				->page($page_no, $page_size)
 				->order('id desc')
 				->select()
diff --git a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php
index 3146275f6..1d6a08365 100644
--- a/app/adminapi/lists/cost_project/CostApprovedProjectLists.php
+++ b/app/adminapi/lists/cost_project/CostApprovedProjectLists.php
@@ -58,8 +58,9 @@
 		 */
 		public function lists(): array
 		{
+			$status = $this->request->get('status', 1);
 			return CostApprovedProject::where($this->searchWhere)
-				->where('status', 1)
+				->where('status', $status)
 				->limit($this->limitOffset, $this->limitLength)
 				->order(['id' => 'desc'])
 				->select()->each(function ($data) {
@@ -85,7 +86,8 @@
 		 */
 		public function count(): int
 		{
-			return CostApprovedProject::where($this->searchWhere)->count();
+			$status = $this->request->get('status', 1);
+			return CostApprovedProject::where($this->searchWhere)->where('status', $status)->count();
 		}
 		
 		public function setFileName(): string