diff --git a/app/adminapi/logic/task/TaskAllocationLogic.php b/app/adminapi/logic/task/TaskAllocationLogic.php index 273b87ea7..61691a190 100644 --- a/app/adminapi/logic/task/TaskAllocationLogic.php +++ b/app/adminapi/logic/task/TaskAllocationLogic.php @@ -145,6 +145,8 @@ class TaskAllocationLogic extends BaseLogic $data['task_detail'] = TaskDetail::where('task_allocation_id', $data['id'])->select()->each(function ($item){ $taskTypeInfo = TaskType::findOrEmpty($item['task_type_id'])->toArray(); $item['task_name'] = $taskTypeInfo['name']; + $item['professional_type_text'] = $item->professional_type_text; + $item['task_type_id_text'] = $item->task_type_id_text; })->toArray(); return $data; } diff --git a/app/common/model/TaskDetail.php b/app/common/model/TaskDetail.php index 26445ddbe..0fdca89d4 100644 --- a/app/common/model/TaskDetail.php +++ b/app/common/model/TaskDetail.php @@ -16,6 +16,7 @@ namespace app\common\model; use app\common\model\BaseModel; +use app\common\model\dict\DictData; use app\common\model\task\TaskType; use think\model\concern\SoftDelete; @@ -40,4 +41,15 @@ class TaskDetail extends BaseModel { return $this->hasOne(TaskType::class, 'id', 'task_allocation_id'); } + + public function getProfessionalTypeTextAttr($value,$data){ + $dict = DictData::where('type_value','major_type')->column('name','value'); + return !empty($data['professional_type']) ? $dict[$data['professional_type']] : ''; + } + + //task_type + public function getTaskTypeIdTextAttr($value,$data){ + $dict = DictData::where('type_value','task_type')->column('name','value'); + return !empty($data['task_type_id']) ? $dict[$data['task_type_id']] : ''; + } } \ No newline at end of file