From d4e5f4ce9f00ebe86fa721f6b41d350577f75f45 Mon Sep 17 00:00:00 2001
From: wangyuting <wangyuting@chandao.com>
Date: Tue, 29 Jul 2025 14:33:34 +0800
Subject: [PATCH] * [task#147124,done,0.5h,0h] Optimize code.

---
 module/upgrade/model.php | 98 +++++++++++++++++++---------------------
 1 file changed, 46 insertions(+), 52 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index cbf34094d0..0c40e5a516 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -11264,67 +11264,61 @@ class upgradeModel extends model
             $deliverable->createdBy     = 'system';
             $deliverable->createdDate   = helper::now();
             $deliverable->template      = '[]';
+
+            $deliverableStage = new stdClass();
+            $deliverableStage->stage    = 'project';
+            $deliverableStage->required = '0';
             foreach(array_filter($this->lang->design->typeList) as $key => $value)
             {
                 if(empty($key) || !in_array($module->projectModel, array('waterfall', 'ipd'))) continue;
-
-                /* 重名的交付物名称后面加数字。 */
-                if(!empty($nameFilter[$value]))
-                {
-                    $deliverable->name = $value . $nameFilter[$value];
-                    $nameFilter[$value] ++;
-                }
-                else
-                {
-                    $deliverable->name = $value;
-                    $nameFilter[$value] = 1;
-                }
-                $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec();
-                $deliverableID = $this->dao->lastInsertID();
-
-                $deliverableStage = new stdClass();
-                $deliverableStage->deliverable = $deliverableID;
-                $deliverableStage->stage       = 'project';
-                $deliverableStage->required    = '0';
-                $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec();
-
-                /* 将历史设计的设计类型替换为交付物ID。 */
-                if(!empty($projectWorkflowGroup[$module->workflowGroup]))
-                {
-                    $this->dao->update(TABLE_DESIGN)->set('type')->eq($deliverableID)->where('type')->eq($key)->andWhere('project')->in(array_keys($projectWorkflowGroup[$module->workflowGroup]))->exec();
-                }
+                $this->addDeliverable($module, $key, $value, $deliverable, $projectWorkflowGroup, $nameFilter);
             }
 
             foreach(array_filter($this->lang->design->plusTypeList) as $key => $value)
             {
                 if(empty($key) || $module->projectModel != 'waterfallplus') continue;
-
-                /* 重名的交付物名称后面加数字。 */
-                if(!empty($nameFilter[$value]))
-                {
-                    $deliverable->name = $value . $nameFilter[$value];
-                    $nameFilter[$value] ++;
-                }
-                else
-                {
-                    $deliverable->name = $value;
-                    $nameFilter[$value] = 1;
-                }
-                $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec();
-                $deliverableID = $this->dao->lastInsertID();
-
-                $deliverableStage = new stdClass();
-                $deliverableStage->deliverable = $deliverableID;
-                $deliverableStage->stage       = 'project';
-                $deliverableStage->required    = '0';
-                $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec();
-
-                /* 将历史设计的设计类型替换为交付物ID。 */
-                if(!empty($projectWorkflowGroup[$module->workflowGroup]))
-                {
-                    $this->dao->update(TABLE_DESIGN)->set('type')->eq($deliverableID)->where('type')->eq($key)->andWhere('project')->in(array_keys($projectWorkflowGroup[$module->workflowGroup]))->exec();
-                }
+                $this->addDeliverable($module, (string)$key, (string)$value, $deliverable, !empty($projectWorkflowGroup) ? $projectWorkflowGroup : array(), $nameFilter);
             }
         }
     }
+
+    /**
+     * 创建交付物。
+     * Add deliverable.
+     *
+     * @param  object $module
+     * @param  string $designType
+     * @param  string $name
+     * @param  object $deliverable
+     * @param  object $deliverableStage
+     * @param  array  $projectWorkflowGroup
+     * @param  array  $nameFilter
+     * @access public
+     * @return void
+     */
+    public function addDeliverable(object $module, string $designType, string $name, object $deliverable, object $deliverableStage, array $projectWorkflowGroup, array &$nameFilter)
+    {
+        /* 重名的交付物名称后面加数字。 */
+        if(!empty($nameFilter[$name]))
+        {
+            $deliverable->name = $name . $nameFilter[$name];
+            $nameFilter[$name] ++;
+        }
+        else
+        {
+            $deliverable->name = $name;
+            $nameFilter[$name] = 1;
+        }
+        $this->dao->insert(TABLE_DELIVERABLE)->data($deliverable)->exec();
+        $deliverableID = $this->dao->lastInsertID();
+
+        $deliverableStage->deliverable = $deliverableID;
+        $this->dao->insert(TABLE_DELIVERABLESTAGE)->data($deliverableStage)->exec();
+
+        /* 将历史设计的设计类型替换为交付物ID。 */
+        if(!empty($projectWorkflowGroup[$module->workflowGroup]))
+        {
+            $this->dao->update(TABLE_DESIGN)->set('type')->eq($deliverableID)->where('type')->eq($designType)->andWhere('project')->in(array_keys($projectWorkflowGroup[$module->workflowGroup]))->exec();
+        }
+    }
 }