From 37514f79c3eb12ed003f7f15990f2ff4b9a65f36 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Thu, 21 Apr 2022 02:08:47 +0000
Subject: [PATCH] * Fix bug #21370 for update.

---
 module/tree/lang/en.php    |  4 ++--
 module/tree/lang/zh-cn.php |  4 ++--
 module/upgrade/model.php   | 34 +++++++++++++++++++++++++++++++++-
 3 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php
index 04f5afe740..9fb6632a2e 100644
--- a/module/tree/lang/en.php
+++ b/module/tree/lang/en.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = 'Manage Task Module';
 $lang->tree->manage             = 'Manage Module';
 $lang->tree->fix                = 'Fix Module';
 $lang->tree->manageProduct      = "Manage {$lang->productCommon} Modules";
-$lang->tree->manageExecution    = "Manage {$lang->executionCommon} Modules";
+$lang->tree->manageExecution    = "Manage {$lang->execution->common} Modules";
 $lang->tree->manageLine         = "Manage {$lang->productCommon} Line";
 $lang->tree->manageBug          = 'Manage Bug';
 $lang->tree->manageCase         = 'Manage Case';
@@ -32,7 +32,7 @@ $lang->tree->manageLineChild    = "Manage {$lang->productCommon} Line";
 $lang->tree->manageBugChild     = 'Manage Child Modules of Bugs';
 $lang->tree->manageCaseChild    = 'Manage Child Cases';
 $lang->tree->manageCaselibChild = 'Manage Child Libraries';
-$lang->tree->manageTaskChild    = "Manage Child {$lang->executionCommon} Modules";
+$lang->tree->manageTaskChild    = "Manage Child {$lang->execution->common} Modules";
 $lang->tree->syncFromProduct    = "Copy from Other {$lang->productCommon}s";
 $lang->tree->dragAndSort        = "Drag to order";
 $lang->tree->sort               = "Order";
diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php
index c2b90998d9..5d6c89c0f1 100644
--- a/module/tree/lang/zh-cn.php
+++ b/module/tree/lang/zh-cn.php
@@ -18,7 +18,7 @@ $lang->tree->browseTask         = '任务模块维护';
 $lang->tree->manage             = '维护模块';
 $lang->tree->fix                = '修正数据';
 $lang->tree->manageProduct      = "维护{$lang->productCommon}视图模块";
-$lang->tree->manageExecution    = "维护{$lang->executionCommon}视图模块";
+$lang->tree->manageExecution    = "维护{$lang->execution->common}视图模块";
 $lang->tree->manageLine         = "维护{$lang->productCommon}线";
 $lang->tree->manageBug          = '维护测试视图模块';
 $lang->tree->manageCase         = '维护用例视图模块';
@@ -32,7 +32,7 @@ $lang->tree->manageLineChild    = "维护{$lang->productCommon}线";
 $lang->tree->manageBugChild     = '维护Bug子模块';
 $lang->tree->manageCaseChild    = '维护用例子模块';
 $lang->tree->manageCaselibChild = '维护用例库子模块';
-$lang->tree->manageTaskChild    = "维护{$lang->executionCommon}子模块";
+$lang->tree->manageTaskChild    = "维护{$lang->execution->common}子模块";
 $lang->tree->syncFromProduct    = '复制模块';
 $lang->tree->dragAndSort        = "拖放排序";
 $lang->tree->sort               = "排序";
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index bbfee0a1ef..68ffad56fe 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -495,7 +495,8 @@ class upgradeModel extends model
 
                 $this->updateGroup4Lite();
                 break;
-            case '16.5':
+            case '16_5':
+                $this->updateProjectStatus();
                 $this->updateStoryReviewer();
                 break;
         }
@@ -6181,4 +6182,35 @@ class upgradeModel extends model
             $this->dao->insert(TABLE_STORYREVIEW)->data($data)->exec();
         }
     }
+
+    /**  
+     * Update the project status.
+     *
+     * @access public
+     * @return void
+     */    
+    public function updateProjectStatus()
+    {
+        $projects = $this->dao->select('*')->from(TABLE_PROJECT) 
+            ->where('deleted')->eq('0')
+            ->andWhere('status')->eq('doing')
+            ->andWhere('type')->eq('project')
+            ->andWhere('realBegan')->eq('0000-00-00')
+            ->fetchAll('id');
+
+        if(empty($projects)) return; 
+
+        $projectIDList = array_keys($projects);
+
+        $executions = $this->dao->select('id,project,min(realBegan) as minBegan')->from(TABLE_EXECUTION)
+            ->where('status')->eq('doing')
+            ->andWhere('deleted')->eq('0')
+            ->andWhere('project')->in($projectIDList)
+            ->groupBy('project')
+            ->fetchAll();
+
+        if(empty($executions)) return;
+
+        foreach ($executions as $execution) $this->dao->update(TABLE_PROJECT)->set('realBegan')->eq($execution->minBegan)->where('id')->eq($execution->project)->exec();
+    }
 }