Merge branch 'app_zry' into 'master'

* Fix api for review story.

See merge request easycorp/zentaopms!2857

api/v1/entries/storyreview.php

@@ -36,7 +36,7 @@ class storyReviewEntry extends Entry
 
         $story = $this->loadModel('story')->getByID($storyID);
 
-        $this->send(200, $story);
+        $this->send(200, $this->format($story, 'openedBy:user,openedDate:time,assignedTo:user,assignedDate:time,reviewedBy:user,reviewedDate:time,lastEditedBy:user,lastEditedDate:time,closedBy:user,closedDate:time,deleted:bool,mailto:userList'));
     }
 }
 

module/project/lang/zh-cn.php

@@ -186,7 +186,8 @@ $lang->project->createExecution        = "该项目下没有{$lang->executionCom
 $lang->project->unlinkExecutionMember  = "该用户参与了%s%s%s个{$lang->execution->common}，是否同时将其移除？（该用户所产生的数据不会受影响。）";
 $lang->project->unlinkExecutionMembers = "移除的团队成员还参与了项目下的执行，是否同步从执行团队中移除？";
 
-$lang->project->tenThousand = '万';
+$lang->project->tenThousand    = '万';
+$lang->project->hundredMillion = '亿';
 
 $lang->project->unitList['CNY'] = '人民币';
 $lang->project->unitList['USD'] = '美元';

module/project/model.php

@@ -1668,7 +1668,22 @@ class projectModel extends model
 
             if($id == 'budget')
             {
-                $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2);
+                if($project->budget < 10000)
+                {
+                    $budget = round((float)$project->budget, 2);
+                    $unit   = '';
+                }
+                elseif($project->budget < 100000000 and $project->budget >= 10000)
+                {
+                    $budget = round((float)$project->budget/10000, 2);
+                    $unit   = $this->lang->project->tenThousand;
+                }
+                else
+                {
+                    $budget = round((float)$project->budget/100000000, 2);
+                    $unit   = $this->lang->project->hundredMillion;
+                }
+                $projectBudget = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')) ? $budget . $unit : round((float)$project->budget, 2);
                 $budgetTitle   = $project->budget != 0 ? zget($this->lang->project->currencySymbol, $project->budgetUnit) . ' ' . $projectBudget : $this->lang->project->future;
 
                 $title = "title='$budgetTitle'";