Merge branch feature/workflowgroup of zentao/zentaopms (#11440)

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`;

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 '',

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`');
     }
 }