Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'

* fix bug #20310

See merge request easycorp/zentaopms!2689

module/story/model.php

@@ -1315,11 +1315,11 @@ class storyModel extends model
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
             ->setDefault('status', $oldStory->status)
+            ->setDefault('reviewedDate', $date)
             ->setIF($this->post->result == 'revert', 'version', $this->post->preVersion)
             ->removeIF($this->post->result != 'reject', 'closedReason, duplicateStory, childStories')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'duplicate', 'duplicateStory')
             ->removeIF($this->post->result == 'reject' and $this->post->closedReason != 'subdivided', 'childStories')
-            ->add('reviewedDate', $date)
             ->add('reviewedBy', $oldStory->reviewedBy . ',' . $this->app->user->account)
             ->remove('result,preVersion,comment')
             ->get();

module/story/view/view.html.php

@@ -413,7 +413,7 @@
                 <?php endif;?>
                 <tr>
                   <th><?php echo $lang->story->reviewedDate;?></th>
-                  <td><?php if($story->reviewedBy) echo $story->reviewedDate;?></td>
+                  <td><?php if($story->reviewedBy) echo date('Y-m-d', strtotime($story->reviewedDate))?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->story->closedBy;?></th>