From c648cb667fafa659aed3a580b9522daab3838d64 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Mon, 18 Mar 2024 13:48:18 +0800 Subject: [PATCH] update --- .../lists/project_process_management/ApplyWithSealLists.php | 6 +++++- .../logic/project_process_management/ApplyWithSealLogic.php | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php index bf786e830..731277cae 100644 --- a/app/adminapi/lists/project_process_management/ApplyWithSealLists.php +++ b/app/adminapi/lists/project_process_management/ApplyWithSealLists.php @@ -17,6 +17,7 @@ namespace app\adminapi\lists\project_process_management; use app\adminapi\lists\BaseAdminDataLists; use app\common\lists\ListsExcelInterface; +use app\common\model\cost_project\CostApprovedProject; use app\common\model\project_process_management\ApplyWithSeal; use app\common\lists\ListsSearchInterface; @@ -59,7 +60,10 @@ class ApplyWithSealLists extends BaseAdminDataLists implements ListsSearchInterf return ApplyWithSeal::with(['projectInfo', 'dept'])->where($this->searchWhere) ->limit($this->limitOffset, $this->limitLength) ->order(['id' => 'desc']) - ->select() + ->select()->each(function($data){ + $contract = CostApprovedProject::field('project_director')->where('id',$data['projectInfo']['contract_id'])->findOrEmpty(); + $data['project_director'] = $contract['project_director']; + }) ->toArray(); } diff --git a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php index 180975507..6d1fca2f7 100644 --- a/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php +++ b/app/adminapi/logic/project_process_management/ApplyWithSealLogic.php @@ -15,6 +15,7 @@ namespace app\adminapi\logic\project_process_management; +use app\common\model\cost_project\CostApprovedProject; use app\common\model\project_process_management\ApplyWithSeal; use app\common\logic\BaseLogic; use think\facade\Db; @@ -144,6 +145,8 @@ class ApplyWithSealLogic extends BaseLogic public static function detail($params): array { $data = ApplyWithSeal::with(['projectInfo'])->findOrEmpty($params['id'])->toArray(); + $contract = CostApprovedProject::field('project_director')->where('id',$data['projectInfo']['contract_id'])->findOrEmpty(); + $data['project_director'] = $contract['project_director']; return $data; } } \ No newline at end of file