From 25cb0a0c43d4ce29c4da3fce9d17e388e3b5937f Mon Sep 17 00:00:00 2001
From: weiz <736250432@qq.com>
Date: Thu, 25 Jan 2024 09:56:34 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/build/BuildReportDetailLists.php | 12 ++++++++++--
 app/adminapi/lists/build/BuildReportLists.php       |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/build/BuildReportDetailLists.php b/app/adminapi/lists/build/BuildReportDetailLists.php
index a7c1b8962..405f49f73 100644
--- a/app/adminapi/lists/build/BuildReportDetailLists.php
+++ b/app/adminapi/lists/build/BuildReportDetailLists.php
@@ -58,13 +58,17 @@ class BuildReportDetailLists extends BaseAdminDataLists implements ListsSearchIn
      */
     public function lists(): array
     {
-	    $params = $this->request->get(['project_id']);
+	    $params = $this->request->get(['project_id','plan_id']);
 	    $where = [];
 	    if(isset($params['project_id']) && $params['project_id'] != 0){
 		    $plan_ids = BuildPlan::where('project_id',$params['project_id'])->column('id');
 			$report_ids = BuildReport::where('plan_id','in',$plan_ids)->column('id');
 		    $where[] = ['report_id','in',$report_ids];
 	    }
+	    if(isset($params['plan_id']) && $params['plan_id'] != 0){
+		    $report_ids = BuildReport::where('plan_id',$params['plan_id'])->column('id');
+		    $where[] = ['report_id','in',$report_ids];
+	    }
         return BuildReportDetail::where($this->searchWhere)->where($where)
             ->field(['id', 'report_id', 'person_id', 'work_num', 'remark'])
             ->limit($this->limitOffset, $this->limitLength)
@@ -99,13 +103,17 @@ class BuildReportDetailLists extends BaseAdminDataLists implements ListsSearchIn
      */
     public function count(): int
     {
-	    $params = $this->request->get(['project_id']);
+	    $params = $this->request->get(['project_id','plan_id']);
 	    $where = [];
 	    if(isset($params['project_id']) && $params['project_id'] != 0){
 		    $plan_ids = BuildPlan::where('project_id',$params['project_id'])->column('id');
 		    $report_ids = BuildReport::where('plan_id','in',$plan_ids)->column('id');
 		    $where[] = ['report_id','in',$report_ids];
 	    }
+	    if(isset($params['plan_id']) && $params['plan_id'] != 0){
+		    $report_ids = BuildReport::where('plan_id',$params['plan_id'])->column('id');
+		    $where[] = ['report_id','in',$report_ids];
+	    }
         return BuildReportDetail::where($this->searchWhere)->where($where)->count();
     }
 
diff --git a/app/adminapi/lists/build/BuildReportLists.php b/app/adminapi/lists/build/BuildReportLists.php
index c0088485a..28c4f10d0 100644
--- a/app/adminapi/lists/build/BuildReportLists.php
+++ b/app/adminapi/lists/build/BuildReportLists.php
@@ -44,7 +44,9 @@ class BuildReportLists extends BaseAdminDataLists implements ListsSearchInterfac
      */
     public function setSearch(): array
     {
-        return [];
+        return [
+			'=' => ['plan_id']
+        ];
     }