完善

Deepseath
1 parent f3c6b1a8
Showing 2 changed files with 30 additions and 13 deletions
src/Api/User.php
src/Hris.php
@@ -11,7 +11,7 @@ class User
 {
     /**
      * 基类服务对象
-     * @var Object
+     * @var \deepseath\hris\Hris
      */
     protected $service = null;
  
@@ -25,6 +25,15 @@ class User
      * @desc 查询 HRIS 中的员工基础信息
      * @param array $params
      * @return array
+     * <pre>
+     *  list
+     *   employeeId
+     *   nameZH
+     *   nameEN
+     *   email
+     *   wxUserId
+     *   positionId
+     * </pre>
      */
     public function baseList(array $params) : array
     {
@@ -127,12 +136,20 @@ class User
     }
  
     /**
+     * 在职状态：在职
+     */
+    const STATUS_ON = '1';
+    /**
+     * 在职状态：离职
+     */
+    const STATUS_OFFLINE = '3';
+    /**
      * 在职状态描述映射关系
      * @var array
      */
     const MAP_STATUS = [
-        '1' => '在职',
-        '3' => '离职'
+        self::STATUS_ON => '在职',
+        self::STATUS_OFFLINE => '离职'
     ];
  
     /**
@@ -229,14 +246,14 @@ class User
         '99' => ['Bachelor', '本科'],
         '103' => ['Senior High', '高中'],
         '105' => ['Junior High', '初中'],
-        '107' => ['Diploma', '大学毕业'],
-        '109' => ['Associate Degree', ''],
-        '111' => ['Advanced Diploma', ''],
-        '113' => ['Higher Diploma', ''],
-        '115' => ['Juris Doctor', ''],
-        '117' => ['Certificate', ''],
-        '119' => ['Secondary ', ''],
-        '121' => ['F.5', ''],
+        '107' => ['Diploma', '大专'],
+        '109' => ['Associate Degree', '大学肆业'],
+        '111' => ['Advanced Diploma', '高级文凭'],
+        '113' => ['Higher Diploma', '高级文凭'],
+        '115' => ['Juris Doctor', '法学博士'],
+        '117' => ['Certificate', '证书'],
+        '119' => ['Secondary ', '中专'],
+        '121' => ['F.5', 'F.5'],
     ];
  
     /**
@@ -96,7 +96,7 @@ class Hris
             $this->_debug = $options['debug'];
         }
  
-        $this->_origin= $options['originToken'];
+        $this->_originToken= $options['originToken'];
         $this->_http = \Yurun\Util\HttpRequest::newSession();
     }
  
@@ -134,7 +134,7 @@ class Hris
         $newTokenInfo = $response->json(true);
  
         if (empty($newTokenInfo) || !isset($newTokenInfo['code'])) {
-            throw new \Exception('request hris token error', 9001);
+            throw new \Exception('request hris token error' . var_export($newTokenInfo, true) . '|' . $url . var_export($params, true), 9001);
         }
         if ($newTokenInfo['code'] != 200) {
             throw new \Exception('HRIS TOKEN GET ERROR:' . $newTokenInfo['msg'] . ':' . $newTokenInfo['code']);