From 3aed7928867080962a3fdabcff5fe092f9939aac Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Thu, 14 Mar 2024 10:42:12 +0800 Subject: [PATCH] update --- .../CostConsultationReportController.php | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/app/adminapi/controller/CostConsultationReportController.php b/app/adminapi/controller/CostConsultationReportController.php index 8a81798f1..ce1b9ee82 100644 --- a/app/adminapi/controller/CostConsultationReportController.php +++ b/app/adminapi/controller/CostConsultationReportController.php @@ -30,7 +30,7 @@ class CostConsultationReportController extends BaseAdminController $query->where('contract_name', 'like', '%' . $contract_name . '%'); } if ($contract_num) { - $query->where('contract_num', '=', $contract_num); + $query->where('contract_num', 'like', '%'.$contract_num.'%'); } if ($part_a) { $query->where('part_a', 'like', '%' . $part_a . '%'); @@ -54,17 +54,13 @@ class CostConsultationReportController extends BaseAdminController $page_size = $this->request->param('page_size', 15); $params = $this->request->param(); $project_name = $params['project_name'] ?? ''; - $project_num = $params['project_num'] ?? ''; $contract_name = $params['contract_name'] ?? ''; $aunit = $params['aunit'] ?? ''; - $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $project_num, $contract_name, $aunit) { + $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $contract_name, $aunit) { if ($contract_name) { $query->where('c.contract_name', 'like', '%' . $contract_name . '%'); } - if ($project_num) { - $query->where('p.project_num', '=', $project_num); - } if ($project_name) { $query->where('p.project_name', 'like', '%' . $project_name . '%'); } @@ -90,16 +86,12 @@ class CostConsultationReportController extends BaseAdminController $page_size = $this->request->param('page_size', 15); $params = $this->request->param(); $project_name = $params['project_name'] ?? ''; - $project_num = $params['project_num'] ?? ''; $contract_name = $params['contract_name'] ?? ''; - $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $project_num, $contract_name) { + $query = Db::name('cost_project')->alias('p')->leftJoin('cost_approved_project c', 'p.contract_id=c.id')->where(function ($query) use ($project_name, $contract_name) { if ($contract_name) { $query->where('c.contract_name', 'like', '%' . $contract_name . '%'); } - if ($project_num) { - $query->where('p.project_num', '=', $project_num); - } if ($project_name) { $query->where('p.project_name', 'like', '%' . $project_name . '%'); }