Merge branch 'sprint/unittest_liumengyi' into 'master'

* Add getprojectteamparams.

See merge request easycorp/zentaopms!3301

test/class/block.class.php

@@ -254,7 +254,27 @@ class blockTest
 
         if(dao::isError()) return dao::getError();
 
-        return $objects;
+
+        $objects = json_decode($objects);
+        $return = '';
+        foreach($objects as $type => $params)
+        {
+            $return .= "$type:{";
+            foreach($params as $param => $paramValue)
+            {
+                if(is_object($paramValue))
+                {
+                    foreach($paramValue as $key => $value) $return .= "$key=>$value,";
+                }
+                else
+                {
+                    $return .= "$param:$paramValue,";
+                }
+            }
+            $return  = trim($return, ',');
+            $return .= '};';
+        }
+        return $return;
     }
 
     /**

test/model/block/getprojectteamparams.php

@@ -10,10 +10,10 @@ title=测试 blockModel->getProjectTeamParams();
 cid=1
 pid=1
 
-
+测试获取项目团队 >> type:{name:类型,all=>所有,doing=>进行中,wait=>未开始,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input};
 
 */
 
 $block = new blockTest();
 
-r($block->getProjectTeamParamsTest()) && p() && e();
+r($block->getProjectTeamParamsTest()) && p() && e('type:{name:类型,all=>所有,doing=>进行中,wait=>未开始,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input};'); // 测试获取项目团队