Merge branch ztflow-xieqiyu-feature/doctemplate#xieqiyu of zentao/zentaopms (#9504)

2025-06-13 14:56:33 +08:00
parent 7a8c571076 c5d6609bb9
commit a4334f2a8a
3 changed files with 33 additions and 27 deletions
@@ -4111,11 +4111,13 @@ class docModel extends model
        $moduleGroup  = $this->dao->select('root,short,id')->from(TABLE_MODULE)->where('deleted')->eq('0')->andWhere('root')->in(array($rndScopeMaps['project'], $orScopeMaps['product']))->fetchGroup('root', 'short');
        foreach($templateList as $id => $template)
        {
-            $templateVision   = $template->vision;
-            $templateType     = $template->templateType;
-            $templateScopeID  = $templateVision == 'or' ? zget($orScopeMaps, 'product', 0) : zget($rndScopeMaps, 'project', 0);
-            $template->lib    = $templateScopeID;
-            $template->module = $moduleGroup[$templateScopeID][$templateType]->id;
+            $templateVision         = $template->vision;
+            $templateType           = $template->templateType;
+            $templateScopeID        = $templateVision == 'or' ? zget($orScopeMaps, 'product', 0) : zget($rndScopeMaps, 'project', 0);
+            $template->lib          = $templateScopeID;
+            $template->module       = $moduleGroup[$templateScopeID][$templateType]->id;
+            $template->assignedDate = helper::isZeroDate($template->assignedDate) ? null : $template->assignedDate;
+            $template->approvedDate = helper::isZeroDate($template->approvedDate) ? null : $template->approvedDate;
            $this->dao->update(TABLE_DOC)->data($template)->where('id')->eq($id)->exec();
            if(dao::isError()) return false;
        }
@@ -4600,15 +4602,19 @@ class docModel extends model
            /* 复制模板及模板内容。*/
            /* Copy template and content. */
            unset($template->id);
-            $templateVision   = $template->vision == 'rnd' ? 'or' : 'rnd';
-            $template->vision = $templateVision;
+            $templateVision         = $template->vision == 'rnd' ? 'or' : 'rnd';
+            $template->vision       = $templateVision;
+            $template->assignedDate = helper::isZeroDate($template->assignedDate) ? null : $template->assignedDate;
+            $template->approvedDate = helper::isZeroDate($template->approvedDate) ? null : $template->approvedDate;
            $this->dao->insert(TABLE_DOC)->data($template)->exec();
            $newTemplateID = $this->dao->lastInsertID();

            foreach($oldContentList[$oldTemplateID] as $content)
            {
                unset($content->id);
-                $content->doc = $newTemplateID;
+                $content->doc        = $newTemplateID;
+                $content->addedDate  = helper::isZeroDate($content->addedDate) ? null : $content->addedDate;
+                $content->editedDate = helper::isZeroDate($content->editedDate) ? null : $content->editedDate;
                $this->dao->insert(TABLE_DOCCONTENT)->data($content)->exec();
            }

@@ -10,15 +10,15 @@ cid=1
 - 更新模板1的字段值
 - 属性lib @1
 - 属性module @1
- - 属性templateType @softwareProductPlan
+ - 属性templateType @PP
 - 更新模板1的字段值
 - 属性lib @1
 - 属性module @2
- - 属性templateType @hardwareProductPlan
+ - 属性templateType @QAP
 - 更新模板1的字段值
 - 属性lib @1
 - 属性module @3
- - 属性templateType @qualityAssurancePlan
+ - 属性templateType @CMP
 - 更新模板4的字段值
 - 属性lib @1
 - 属性module @4
@@ -30,19 +30,19 @@ cid=1
 - 更新模板6的字段值
 - 属性lib @2
 - 属性module @5
- - 属性templateType @projectUserRequirementsSpecifi
+ - 属性templateType @ITP
 - 更新模板7的字段值
 - 属性lib @2
 - 属性module @6
- - 属性templateType @projectSoftwareRequirementsSpe
+ - 属性templateType @ERS
 - 更新模板8的字段值
 - 属性lib @2
 - 属性module @7
- - 属性templateType @projectSummaryDesignSpecificat
+ - 属性templateType @URS
 - 更新模板9的字段值
 - 属性lib @2
 - 属性module @8
- - 属性templateType @projectDetailedDesignSpecifica
+ - 属性templateType @SRS
 - 更新模板10的字段值
 - 属性lib @2
 - 属性module @9
@@ -58,13 +58,13 @@ zenData('user')->gen(5);
 su('admin');

 $docTester = new docTest();
-r($docTester->upgradeTemplateLibAndModuleTest(1))  && p('lib,module,templateType') && e('1,1,softwareProductPlan');            // 更新模板1的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(2))  && p('lib,module,templateType') && e('1,2,hardwareProductPlan');            // 更新模板1的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(3))  && p('lib,module,templateType') && e('1,3,qualityAssurancePlan');           // 更新模板1的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(4))  && p('lib,module,templateType') && e('1,4,custom1');                        // 更新模板4的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(5))  && p('lib,module,templateType') && e('1,4,custom1');                        // 更新模板5的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(6))  && p('lib,module,templateType') && e('2,5,projectUserRequirementsSpecifi'); // 更新模板6的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(7))  && p('lib,module,templateType') && e('2,6,projectSoftwareRequirementsSpe'); // 更新模板7的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(8))  && p('lib,module,templateType') && e('2,7,projectSummaryDesignSpecificat'); // 更新模板8的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(9))  && p('lib,module,templateType') && e('2,8,projectDetailedDesignSpecifica'); // 更新模板9的字段值
-r($docTester->upgradeTemplateLibAndModuleTest(10)) && p('lib,module,templateType') && e('2,9,custom2');                        // 更新模板10的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(1))  && p('lib,module,templateType') && e('1,1,PP');      // 更新模板1的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(2))  && p('lib,module,templateType') && e('1,2,QAP');     // 更新模板1的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(3))  && p('lib,module,templateType') && e('1,3,CMP');     // 更新模板1的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(4))  && p('lib,module,templateType') && e('1,4,custom1'); // 更新模板4的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(5))  && p('lib,module,templateType') && e('1,4,custom1'); // 更新模板5的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(6))  && p('lib,module,templateType') && e('2,5,ITP');     // 更新模板6的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(7))  && p('lib,module,templateType') && e('2,6,ERS');     // 更新模板7的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(8))  && p('lib,module,templateType') && e('2,7,URS');     // 更新模板8的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(9))  && p('lib,module,templateType') && e('2,8,SRS');     // 更新模板9的字段值
+r($docTester->upgradeTemplateLibAndModuleTest(10)) && p('lib,module,templateType') && e('2,9,custom2'); // 更新模板10的字段值
@@ -28,6 +28,6 @@ fields:
  - field: version
    range: 1
  - field: templateType
-    range: "softwareProductPlan,hardwareProductPlan,qualityAssurancePlan,custom1{2},projectUserRequirementsSpecification,projectSoftwareRequirementsSpecification,projectSummaryDesignSpecification,projectDetailedDesignSpecification,custom2,executionQualityAssurancePlan,executionTestPlan,executionSoftwareRequirementsSpecification,custom3{2},personalWorkPlan,personalWorkSummaryReport,personalValueAnalysisReport,custom4{2}"
+    range: "PP,QAP,CMP,custom1{2},ITP,ERS,URS,SRS,custom2,HLDS,DDS,DBDS,custom3{2},ADS,Code,ITTC,custom4{2}"
  - field: addedDate
-    range: "2025-04-10 00:00:01,2025-04-11 00:00:01,2025-04-12 00:00:01,2025-04-13 00:00:01,2025-04-14 00:00:01,2025-04-15 00:00:01,2025-04-16 00:00:01,2025-04-17 00:00:01,2025-04-18 00:00:01,2025-04-19 00:00:01"
+    range: "`2025-04-10 00:00:01`,`2025-04-11 00:00:01`,`2025-04-12 00:00:01`,`2025-04-13 00:00:01`,`2025-04-14 00:00:01`,`2025-04-15 00:00:01`,`2025-04-16 00:00:01`,`2025-04-17 00:00:01`,`2025-04-18 00:00:01`,`2025-04-19 00:00:01`"