From 28006c9c4f04b479c366c176e03c796e1f94c365 Mon Sep 17 00:00:00 2001 From: sunguangming Date: Fri, 12 Sep 2025 00:44:30 +0000 Subject: [PATCH] * [task#149113,done,0.2h] finish task. --- db/update22.0.sql | 1 + db/zentao.sql | 1 - module/upgrade/model.php | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/db/update22.0.sql b/db/update22.0.sql index 3b751ad60b..74703ce65f 100644 --- a/db/update22.0.sql +++ b/db/update22.0.sql @@ -45,6 +45,7 @@ CREATE TABLE IF NOT EXISTS `zt_projectdeliverable` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; CREATE INDEX `project` ON `zt_projectdeliverable` (`project`); +CREATE UNIQUE INDEX `project_deliverable_doc` ON `zt_projectdeliverable` (`project`, `deliverable`, `doc`); ALTER TABLE `zt_approvalflowobject` ADD `relatedBy` varchar(30) NOT NULL DEFAULT '' AFTER `objectID`; ALTER TABLE `zt_approvalflowobject` ADD `relatedDate` datetime NULL AFTER `relatedBy`; diff --git a/db/zentao.sql b/db/zentao.sql index 4bbfead4b3..395ce1c37f 100755 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -14337,7 +14337,6 @@ CREATE TABLE IF NOT EXISTS `zt_review` ( `deliverable` mediumint(8) unsigned NOT NULL DEFAULT '0', `object` mediumint(8) NOT NULL DEFAULT '0', `template` mediumint(8) NOT NULL DEFAULT '0', - `doc` varchar(255) NOT NULL DEFAULT '', `docVersion` varchar(255) NOT NULL DEFAULT '', `version` varchar(255) NOT NULL DEFAULT '', `status` char(30) NOT NULL DEFAULT '', diff --git a/module/upgrade/model.php b/module/upgrade/model.php index 999a272079..25b94f2855 100644 --- a/module/upgrade/model.php +++ b/module/upgrade/model.php @@ -12075,5 +12075,7 @@ class upgradeModel extends model $this->dao->update(TABLE_APPROVALOBJECT)->set('objectType')->eq('deliverable')->set('objectID')->eq($deliverableID)->where('objectType')->eq('review')->andWhere('objectID')->eq($review->id)->exec(); $this->dao->update(TABLE_APPROVAL)->set('objectType')->eq('deliverable')->set('objectID')->eq($deliverableID)->where('objectType')->eq('review')->andWhere('objectID')->eq($review->id)->exec(); } + + $this->dao->exec('ALTER TABLE ' . TABLE_REVIEW . ' DROP `doc`'); } }