From 17d94a5ecddd673552dfcd5359d8d72c12a6fa77 Mon Sep 17 00:00:00 2001 From: weiz <736250432@qq.com> Date: Tue, 19 Mar 2024 11:54:22 +0800 Subject: [PATCH] update --- app/adminapi/logic/task/TaskTypeLogic.php | 7 ++++++- app/common/model/task/TaskType.php | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/adminapi/logic/task/TaskTypeLogic.php b/app/adminapi/logic/task/TaskTypeLogic.php index 7a22d587f..ed6d2d885 100644 --- a/app/adminapi/logic/task/TaskTypeLogic.php +++ b/app/adminapi/logic/task/TaskTypeLogic.php @@ -15,6 +15,7 @@ namespace app\adminapi\logic\task; +use app\common\model\cost_project\CostProject; use app\common\model\task\TaskType; use app\common\logic\BaseLogic; use app\common\model\TaskDetail; @@ -119,6 +120,10 @@ class TaskTypeLogic extends BaseLogic */ public static function detail($params): array { - return TaskType::findOrEmpty($params['id'])->toArray(); + $data = TaskType::findOrEmpty($params['id']); + $project = CostProject::field('project_name')->where('id',$data['cost_project_id'])->findOrEmpty(); + $data['project_name'] = $project['project_name']; + $data['superior_sort_text'] = $data->superior_sort_text; + return $data->toArray(); } } \ No newline at end of file diff --git a/app/common/model/task/TaskType.php b/app/common/model/task/TaskType.php index cde89dfa1..2e9c4fef3 100644 --- a/app/common/model/task/TaskType.php +++ b/app/common/model/task/TaskType.php @@ -16,6 +16,7 @@ namespace app\common\model\task; use app\common\model\BaseModel; +use app\common\model\dict\DictData; use think\model\concern\SoftDelete; @@ -29,6 +30,9 @@ class TaskType extends BaseModel use SoftDelete; protected $name = 'task_type'; protected $deleteTime = 'delete_time'; - - + + public function getSuperiorSortTextAttr($value,$data){ + $dict = DictData::where('type_value','superior_category')->column('name','value'); + return !empty($data['superior_sort']) ? $dict[$data['superior_sort']] : ''; + } } \ No newline at end of file