From 207f09a4af2e35c72c7197e9700439e30ba1b9ca Mon Sep 17 00:00:00 2001
From: kuaifan <aipaw@live.cn>
Date: Mon, 16 Dec 2024 15:55:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=AD=90=E4=BB=BB=E5=8A=A1=E4=B8=8D=E8=B7=9F?=
 =?UTF-8?q?=E9=9A=8F=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/Api/ProjectController.php     | 22 ++++++++++-
 app/Models/ProjectTask.php                    |  5 +++
 ...tasks_subtask_project_id_and_column_id.php | 38 +++++++++++++++++++
 .../js/pages/manage/components/TaskMove.vue   |  4 +-
 4 files changed, 64 insertions(+), 5 deletions(-)
 create mode 100644 database/migrations/2024_12_16_155707_update_project_tasks_subtask_project_id_and_column_id.php

diff --git a/app/Http/Controllers/Api/ProjectController.php b/app/Http/Controllers/Api/ProjectController.php
index a661b8540..1f9351d76 100755
--- a/app/Http/Controllers/Api/ProjectController.php
+++ b/app/Http/Controllers/Api/ProjectController.php
@@ -2399,6 +2399,7 @@ class ProjectController extends AbstractController
      */
     public function task__move()
     {
+        Base::checkClientVersion('0.41.94');
         User::auth();
         //
         $task_id = intval(Request::input('task_id'));
@@ -2436,9 +2437,26 @@ class ProjectController extends AbstractController
         //
         $task->moveTask($project_id, $column_id, $flow_item_id, $owner, $assist, $completeAt);
         //
-        $task = ProjectTask::userTask($task_id);
+        $data = [];
+        $mainTask = ProjectTask::userTask($task_id)?->toArray();
+        if ($mainTask) {
+            $mainTask['column_name'] = ProjectColumn::whereId($mainTask['column_id'])->value('name');
+            $mainTask['project_name'] = Project::whereId($mainTask['project_id'])->value('name');
+            $data[] = $mainTask;
+            //
+            $subTasks = ProjectTask::whereParentId($task_id)->get();
+            foreach ($subTasks as $subTask) {
+                $data[] = [
+                    'id' => $subTask->id,
+                    'project_id' => $subTask->project_id,
+                    'column_id' => $subTask->column_id,
+                    'column_name' => $mainTask['column_name'],
+                    'project_name' => $mainTask['project_name'],
+                ];
+            }
+        }
         //
-        return Base::retSuccess('移动成功', $task);
+        return Base::retSuccess('移动成功', $data);
     }
 
     /**
diff --git a/app/Models/ProjectTask.php b/app/Models/ProjectTask.php
index 17b517e7c..85927efb1 100644
--- a/app/Models/ProjectTask.php
+++ b/app/Models/ProjectTask.php
@@ -1833,6 +1833,11 @@ class ProjectTask extends AbstractModel
                     $taskUser->save();
                 }
             }
+            // 子任务
+            ProjectTask::whereParentId($this->id)->change([
+                'project_id' => $projectId,
+                'column_id' => $columnId,
+            ]);
             //
             if ($flowItemId) {
                 $flowItem = projectFlowItem::whereProjectId($projectId)->whereId($flowItemId)->first();
diff --git a/database/migrations/2024_12_16_155707_update_project_tasks_subtask_project_id_and_column_id.php b/database/migrations/2024_12_16_155707_update_project_tasks_subtask_project_id_and_column_id.php
new file mode 100644
index 000000000..6c7317aea
--- /dev/null
+++ b/database/migrations/2024_12_16_155707_update_project_tasks_subtask_project_id_and_column_id.php
@@ -0,0 +1,38 @@
+<?php
+
+use Carbon\Carbon;
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Support\Facades\DB;
+
+class UpdateProjectTasksSubtaskProjectIdAndColumnId extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $prefix = DB::getTablePrefix();
+        $now = Carbon::now();
+        DB::statement("
+            UPDATE {$prefix}project_tasks AS subtask
+            INNER JOIN {$prefix}project_tasks AS parent ON subtask.parent_id = parent.id
+            SET
+                subtask.project_id = parent.project_id,
+                subtask.column_id = parent.column_id,
+                subtask.updated_at = '{$now}'
+            WHERE subtask.parent_id > 0
+        ");
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        // No need for down operation as this is a data correction
+    }
+}
diff --git a/resources/assets/js/pages/manage/components/TaskMove.vue b/resources/assets/js/pages/manage/components/TaskMove.vue
index 5cda76453..ba4981a44 100644
--- a/resources/assets/js/pages/manage/components/TaskMove.vue
+++ b/resources/assets/js/pages/manage/components/TaskMove.vue
@@ -264,10 +264,8 @@ export default {
                     owner: this.updateData.owner_userids,
                     assist: this.updateData.assist_userids,
                 }
-            }).then(({data,msg}) => {
+            }).then(({data, msg}) => {
                 this.loadIng--;
-                data.column_name = "";
-                data.project_name = "";
                 this.$store.dispatch("saveTask", data);
                 $A.messageSuccess(msg);
                 this.close()