From 3340a383f1f376337b1f7fb9ab8fc17ad9b106be Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 25 Nov 2021 15:03:43 +0800
Subject: [PATCH] *Finish task #45151.

---
 module/execution/lang/zh-cn.php     |  6 +++---
 module/execution/view/view.html.php | 28 +++++++++++++++++++++-------
 2 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 10fc000951..6213a08bf4 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -28,11 +28,11 @@ $lang->execution->closedBy         = '由谁关闭';
 $lang->execution->closedDate       = '关闭日期';
 $lang->execution->canceledBy       = '由谁取消';
 $lang->execution->canceledDate     = '取消日期';
-$lang->execution->begin            = '开始日期';
-$lang->execution->end              = '截止日期';
+$lang->execution->begin            = '计划开始';
+$lang->execution->end              = '计划完成';
 $lang->execution->dateRange        = '起始日期';
 $lang->execution->realBegan        = '实际开始';
-$lang->execution->realEnd          = '实际结束';
+$lang->execution->realEnd          = '实际完成';
 $lang->execution->to               = '至';
 $lang->execution->days             = '可用工作日';
 $lang->execution->day              = '天';
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index d9ff7abf36..8a22dd6221 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -238,24 +238,38 @@
                     <tr>
                       <th><?php echo $lang->execution->begin;?></th>
                       <td><?php echo $execution->begin;?></td>
-                      <th><?php echo $lang->execution->totalEstimate;?></th>
-                      <td><?php echo (float)$execution->totalEstimate . $lang->execution->workHour;?></td>
+                      <th><?php echo $lang->execution->realBegan;?></th>
+                      <?php if ($execution->realBegan == 0000-00-00): ?>
+                      <td><?php echo '';?></td>
+                      <?php else :;?>
+                      <td><?php echo $execution->realBegan;?></td>
+                      <?php endif;?>
                     </tr>
                     <tr>
                       <th><?php echo $lang->execution->end;?></th>
                       <td><?php echo $execution->end;?></td>
-                      <th><?php echo $lang->execution->totalConsumed;?></th>
-                      <td><?php echo (float)$execution->totalConsumed . $lang->execution->workHour;?></td>
+                      <th><?php echo $lang->execution->realEnd;?></th>
+                      <?php if ($execution->realEnd == 0000-00-00): ?>
+                      <td><?php echo '';?></td>
+                      <?php else :;?>
+                      <td><?php echo $execution->realEnd;?></td>
+                      <?php endif;?>
                     </tr>
                     <tr>
+                      <th><?php echo $lang->execution->totalEstimate;?></th>
+                      <td><?php echo (float)$execution->totalEstimate . $lang->execution->workHour;?></td>                     
                       <th><?php echo $lang->execution->totalDays;?></th>
                       <td><?php echo $execution->days;?></td>
-                      <th><?php echo $lang->execution->totalLeft;?></th>
-                      <td><?php echo (float)$execution->totalLeft . $lang->execution->workHour;?></td>
                     </tr>
                     <tr>
+                      <th><?php echo $lang->execution->totalConsumed;?></th>
+                      <td><?php echo (float)$execution->totalConsumed . $lang->execution->workHour;?></td>
                       <th><?php echo $lang->execution->totalHours;?></th>
-                      <td><?php echo (float)$execution->totalHours . $lang->execution->workHour;?></td>
+                      <td><?php echo (float)$execution->totalHours . $lang->execution->workHour;?></td>                     
+                    </tr>
+                    <tr>
+                      <th><?php echo $lang->execution->totalLeft;?></th>
+                      <td><?php echo (float)$execution->totalLeft . $lang->execution->workHour;?></td>                    
                     </tr>
                   </tbody>
                 </table>