diff --git a/module/execution/model.php b/module/execution/model.php
index 1a279265d3..ec7dd47e31 100755
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -4982,9 +4982,10 @@ class executionModel extends model
     }
 
     /**
+     * 根据状态创建和设置迭代用于更新迭代的状态。
      * Build execution object by status.
      *
-     * @param  string    $status
+     * @param  string $status
      * @access public
      * @return object
      */
@@ -4997,26 +4998,23 @@ class executionModel extends model
 
         if($status == 'wait')
         {
-            $execution->closedBy      = '';
-            $execution->canceledBy    = '';
+            $execution->closedBy   = '';
+            $execution->canceledBy = '';
         }
-
-        if($status == 'doing')
+        elseif($status == 'doing')
         {
-            $execution->realBegan     = helper::today();
-            $execution->closedBy      = '';
-            $execution->canceledBy    = '';
+            $execution->realBegan  = helper::today();
+            $execution->closedBy   = '';
+            $execution->canceledBy = '';
         }
-
-        if($status == 'suspended')
+        elseif($status == 'suspended')
         {
             $execution->suspendedDate = helper::now();
             $execution->closedBy      = '';
         }
-
-        if($status == 'closed')
+        elseif($status == 'closed')
         {
-            $execution->closedBy   = $this->app->user->account;
+            $execution->closedBy = $this->app->user->account;
         }
 
         return $execution;
diff --git a/module/execution/test/model/buildexecutionbystatus.php b/module/execution/test/model/buildexecutionbystatus.php
index 55078b29e5..835abe3846 100755
--- a/module/execution/test/model/buildexecutionbystatus.php
+++ b/module/execution/test/model/buildexecutionbystatus.php
@@ -6,21 +6,13 @@ zdTable('user')->gen(5);
 su('admin');
 
 /**
-
 title=测试executionModel->buildExecutionByStatus();
 cid=1
 pid=1
-
-测试传入未开始状态，返回对象的实际开始时间 >> 0
-测试传入进行中状态，返回对象的状态 >> doing
-测试传入已挂起状态，返回对象的状态 >> suspended
-测试传入已关闭状态，返回对象的由谁关闭 >> admin
-
 */
 
 $execution  = new executionTest();
-$waitObject = $execution->buildExecutionByStatusTest('wait');
-r($waitObject->realBegan)                              && p('')          && e('0');           // 测试传入未开始状态，返回对象的实际开始时间
-r($execution->buildExecutionByStatusTest('doing'))     && p('status')    && e("doing");       // 测试传入进行中状态，返回对象的状态
-r($execution->buildExecutionByStatusTest('suspended')) && p('status')    && e('suspended');   // 测试传入已挂起状态，返回对象的状态
-r($execution->buildExecutionByStatusTest('closed'))    && p('closedBy')  && e('admin');       // 测试传入已关闭状态，返回对象的由谁关闭
+r($execution->buildExecutionByStatusTest('wait'))      && p('status,closedBy,canceledBy') && e("wait,~~,~~");   // 测试传入未开始状态
+r($execution->buildExecutionByStatusTest('doing'))     && p('status,closedBy,canceledBy') && e("doing,~~,~~");  // 测试传入进行中状态
+r($execution->buildExecutionByStatusTest('suspended')) && p('status,closedBy')            && e('suspended,~~'); // 测试传入已挂起状态
+r($execution->buildExecutionByStatusTest('closed'))    && p('status,closedBy')            && e('closed,admin'); // 测试传入已关闭状态