Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

test/model/trainplan/getbyid.php

@@ -0,0 +1,23 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/init.php';
+/**
+[case]
+title=测试 trainplanModel::getById();
+cid=1
+pid=1
+[group]
+  1. 获取到的project是21,lecturer是hufangzhou  >> `21,hufangzhou`
+[esac]
+*/
+$trainplan = $tester->loadModel('trainplan');
+
+$app->dbh->query("truncate zt_trainplan");
+zdImport(TABLE_TRAINPLAN, "zendata/trainplan.yaml", 10);
+
+$randTrainPlan = $tester->dao->select('*,rand() as rand')->from(TABLE_TRAINPLAN)->orderBy('rand')->fetch();
+if(!$randTrainPlan) exit("Prepair data error.");
+unset($randTrainPlan->rand);
+
+/* Step 1.*/
+run($trainplan->getById($randTrainPlan->id)) and expect('project,lecturer');

test/zendata/trainplan.yaml

@@ -0,0 +1,48 @@
+title: 'table zt_trainplan '
+desc: ""
+author: automated export
+version: "1.0"
+fields:
+    - field: id
+      range: 1-10
+    - field: project
+      range: 21
+    - field: name
+      range: 1-10
+      format: "培训计划_%d"
+    - field: begin
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: end
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: place
+      range: 1-10
+      format: "地点_%d"
+    - field: trainee
+      range: admin,jia,yiyi
+    - field: lecturer
+      range: hufangzhou
+    - field: type
+      range: outside,inside
+    - field: status
+      range: wait
+    - field: summary
+      range: ' '
+    - field: createdBy
+      range: admin
+    - field: createdDate
+      range: "(-1M)-(+1w):60"
+      prefix: DateTime
+      type: timestamp
+      format: "YY/MM/DD hh:mm:ss"
+    - field: editedBy
+      range: ' '
+    - field: editedDate
+      range: ' '
+    - field: deleted
+      range: 0