From 5154e3813718e7482930e3a09fe6411bd0c8df61 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Mon, 26 Feb 2024 17:33:27 +0800
Subject: [PATCH] update

---
 app/adminapi/lists/task/TaskAllocationLists.php |  2 +-
 app/adminapi/logic/task/TaskAllocationLogic.php |  3 +--
 app/common/model/task/TaskAllocation.php        | 11 ++++++++++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/app/adminapi/lists/task/TaskAllocationLists.php b/app/adminapi/lists/task/TaskAllocationLists.php
index e5483d0b7..c6672455d 100644
--- a/app/adminapi/lists/task/TaskAllocationLists.php
+++ b/app/adminapi/lists/task/TaskAllocationLists.php
@@ -55,7 +55,7 @@ class TaskAllocationLists extends BaseAdminDataLists implements ListsSearchInter
      */
     public function lists(): array
     {
-        return TaskAllocation::where($this->searchWhere)
+        return TaskAllocation::where($this->searchWhere)->with(['taskTypeInfo', 'projectInfo'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
             ->select()
diff --git a/app/adminapi/logic/task/TaskAllocationLogic.php b/app/adminapi/logic/task/TaskAllocationLogic.php
index e234f317c..2a4ce9775 100644
--- a/app/adminapi/logic/task/TaskAllocationLogic.php
+++ b/app/adminapi/logic/task/TaskAllocationLogic.php
@@ -94,7 +94,6 @@ class TaskAllocationLogic extends BaseLogic
         Db::startTrans();
         try {
             TaskAllocation::where('id', $params['id'])->update([
-                    'num' => generate_sn(self::class, 'num'),
                     'task_type_id' => $taskType['id'], // 任务类别id
                     'cost_project_id' => $taskType['cost_project_id'], // 项目id
                     'apptime' => $params['apptime'],
@@ -132,6 +131,6 @@ class TaskAllocationLogic extends BaseLogic
      */
     public static function detail($params): array
     {
-        return TaskAllocation::findOrEmpty($params['id'])->toArray();
+        return TaskAllocation::findOrEmpty($params['id'])->with(['taskTypeInfo', 'projectInfo'])->toArray();
     }
 }
\ No newline at end of file
diff --git a/app/common/model/task/TaskAllocation.php b/app/common/model/task/TaskAllocation.php
index 0a165e470..2da40baaf 100644
--- a/app/common/model/task/TaskAllocation.php
+++ b/app/common/model/task/TaskAllocation.php
@@ -16,6 +16,7 @@ namespace app\common\model\task;
 
 
 use app\common\model\BaseModel;
+use app\common\model\cost_project\CostProject;
 use think\model\concern\SoftDelete;
 
 
@@ -30,5 +31,13 @@ class TaskAllocation extends BaseModel
     protected $name = 'task_allocation';
     protected $deleteTime = 'delete_time';
 
-    
+    public function taskTypeInfo()
+    {
+      return $this->hasOne(TaskType::class, 'id', 'task_type_id');
+    }
+
+    public function projectInfo()
+    {
+        return $this->hasOne(CostProject::class, 'id', 'cost_project_id');
+    }
 }
\ No newline at end of file