From 751b88ecb07610bfc8ceae9446085f905022d1e5 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@chandao.com>
Date: Fri, 9 May 2025 16:45:11 +0800
Subject: [PATCH] * [bug#62377,done,0.5h,0h] Finish task and design related
 docs support version management.

---
 db/update21.6.1.sql     | 2 ++
 module/design/model.php | 4 ++--
 module/task/model.php   | 2 +-
 module/task/tao.php     | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/db/update21.6.1.sql b/db/update21.6.1.sql
index bf0eb8cb69..3a54aa7ac6 100644
--- a/db/update21.6.1.sql
+++ b/db/update21.6.1.sql
@@ -1,4 +1,6 @@
 ALTER TABLE `zt_task`   ADD COLUMN `docs` text NULL AFTER `fromIssue`;
+ALTER TABLE `zt_task`   ADD COLUMN `docVersions` text NULL AFTER `docs`;
 ALTER TABLE `zt_storyspec`  ADD COLUMN `docs` text NULL AFTER `files`;
 ALTER TABLE `zt_storyspec`  ADD COLUMN `docVersions` text NULL AFTER `docs`;
 ALTER TABLE `zt_design` ADD COLUMN `docs` text NULL AFTER `storyVersion`;
+ALTER TABLE `zt_design` ADD COLUMN `docVersions` text NULL AFTER `docs`;
diff --git a/module/design/model.php b/module/design/model.php
index 958c0e2496..628d9ed78c 100755
--- a/module/design/model.php
+++ b/module/design/model.php
@@ -23,7 +23,7 @@ class designModel extends model
     public function create(object $design): bool|int
     {
         $design = $this->loadModel('file')->processImgURL($design, 'desc', (string)$this->post->uid);
-        $this->dao->insert(TABLE_DESIGN)->data($design)
+        $this->dao->insert(TABLE_DESIGN)->data($design, 'docVersions')
             ->autoCheck()
             ->batchCheck($this->config->design->create->requiredFields, 'notempty')
             ->exec();
@@ -97,7 +97,7 @@ class designModel extends model
         if(!$oldDesign) return false;
 
         $design = $this->loadModel('file')->processImgURL($design, 'desc', (string)$this->post->uid);
-        $this->dao->update(TABLE_DESIGN)->data($design, 'deleteFiles,renameFiles,files')->autoCheck()->batchCheck($this->config->design->edit->requiredFields, 'notempty')->where('id')->eq($designID)->exec();
+        $this->dao->update(TABLE_DESIGN)->data($design, 'deleteFiles,renameFiles,files,docs,oldDocs,docVersions')->autoCheck()->batchCheck($this->config->design->edit->requiredFields, 'notempty')->where('id')->eq($designID)->exec();
 
         if(dao::isError()) return false;
 
diff --git a/module/task/model.php b/module/task/model.php
index 8edd071a5a..cab61faf1e 100755
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -973,7 +973,7 @@ class taskModel extends model
 
         /* Insert task data. */
         if(empty($task->assignedTo)) unset($task->assignedDate);
-        $this->dao->insert(TABLE_TASK)->data($task)
+        $this->dao->insert(TABLE_TASK)->data($task, 'docVersions')
             ->checkIF($task->estimate != '', 'estimate', 'float')
             ->autoCheck()
             ->batchCheck($requiredFields, 'notempty')
diff --git a/module/task/tao.php b/module/task/tao.php
index 0021fb7e16..d3fb94ff4d 100644
--- a/module/task/tao.php
+++ b/module/task/tao.php
@@ -448,7 +448,7 @@ class taskTao extends taskModel
             $task->lastEditedDate = helper::now();
         }
 
-        $this->dao->update(TABLE_TASK)->data($task, 'deleteFiles,renameFiles,files')
+        $this->dao->update(TABLE_TASK)->data($task, 'deleteFiles,renameFiles,files,docVersions,oldDocs,docs')
             ->autoCheck()
             ->batchCheckIF($task->status != 'cancel', $requiredFields, 'notempty')
             ->checkIF(!helper::isZeroDate($task->deadline), 'deadline', 'ge', $task->estStarted)