提交

application/api/controller/Approveinfo.php

@@ -174,11 +174,6 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("document_text", type="array", desc="附件列表"),
      *     @Apidoc\Returned("images_text", type="array", desc="图片列表"),
      * )
-     * @Apidoc\Returned("peer_user", type="array", desc="同行人员列表 module=5",
-     *     @Apidoc\Returned("id", type="integer", desc="同行人员ID"),
-     *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
-     *     @Apidoc\Returned("name", type="string", desc="姓名"),
-     * )
      * @Apidoc\Returned("approve_info", type="object", desc="审批信息",
      *     @Apidoc\Returned("id", type="integer", desc="审批ID"),
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
@@ -191,7 +186,8 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("time_text", type="string", desc="审批时长文本"),
      *     @Apidoc\Returned("user", type="object", desc="审批人信息",
      *          @Apidoc\Returned("userid", type="string", desc="用户userid"),
-     *          @Apidoc\Returned("name", type="string", desc="姓名"),
+     *          @Apidoc\Returned("name", type="string", desc="用户姓名"),
+     *          @Apidoc\Returned("avatar", type="string", desc="头像地址"),
      *      ),
      * )
      * @Apidoc\Returned("approve_copy", type="object", desc="抄送信息",
@@ -201,13 +197,26 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("approve_user", type="string", desc="审批人userid"),
      *     @Apidoc\Returned("user", type="object", desc="抄送人信息",
      *          @Apidoc\Returned("userid", type="string", desc="用户userid"),
-     *          @Apidoc\Returned("name", type="string", desc="姓名"),
+     *          @Apidoc\Returned("name", type="string", desc="用户姓名"),
+     *          @Apidoc\Returned("avatar", type="string", desc="头像地址"),
      *      ),
      * )
+     * @Apidoc\Returned("approve_info_user", type="object", desc="申请人信息",
+     *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
+     *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
+     *     @Apidoc\Returned("avatar", type="string", desc="头像地址"),
+     *     @Apidoc\Returned("create_at", type="string", desc="日期"),
+     * )
      * @Apidoc\Returned("department_data", type="array", desc="所在部门列表",
      *     @Apidoc\Returned("dept_id", type="string", desc="部门ID"),
      *     @Apidoc\Returned("name", type="string", desc="部门名称"),
      * )
+     * @Apidoc\Returned("peer_user", type="array", desc="同行人员列表 module=5",
+     *     @Apidoc\Returned("id", type="integer", desc="同行人员ID"),
+     *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
+     *     @Apidoc\Returned("name", type="string", desc="姓名"),
+     * )
+     *
      */
     public function get_detail()
     {
@@ -247,7 +256,7 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
      *     @Apidoc\Returned("is_who", type="integer", desc="是否外部人员:0=否,1=是"),
      *     @Apidoc\Returned("user_id", type="string", desc="用户userid"),
-     *     @Apidoc\Returned("name", type="string", desc="姓名"),
+     *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      *     @Apidoc\Returned("desc", type="string", desc="备注"),
      * )
      **/

application/common/constant/CommonConstant.php

@@ -132,18 +132,6 @@ class CommonConstant
         ];
     }
 
-    // 是否特殊:0=通用,1=特殊
-    const IS_SPECIAL_0 = '0';
-    const IS_SPECIAL_1 = '1';
-
-    public static function get_is_special_list()
-    {
-        return [
-            self::IS_SPECIAL_0 => '通用',
-            self::IS_SPECIAL_1 => '特殊',
-        ];
-    }
-
     // 审核状态:1=待审批,2=审批中,3=审批同意,4=审批驳回,5=审批撤销
     const STATUS_1 = 1;
     const STATUS_2 = 2;

application/common/service/ApproveInfoService.php

@@ -330,7 +330,7 @@ class ApproveInfoService
      * 详情/信息
      *
      * @param integer $id 申请ID
-     * @param mixed $user 用户信息 有数据=审批申请详情,没有数据=审批详情
+     * @param mixed $user 用户信息 有数据=我的申请详情/信息,没有数据=审批详情
      * @param string $type 类型:detail=详情,info=信息
      **/
     public static function get_detail($id, $user, $type)
@@ -345,24 +345,32 @@ class ApproveInfoService
                 'approve' => function ($query) {
                     $query->field('is_deleted,create_at', true)
                         ->with(['user' => function ($query) {
-                            $query->field('userid,avatar,name');
+                            $query->field('userid,name,avatar');
                         }]);
                 },
                 'approveCopy' => function ($query) {
                     $query->field('is_deleted,create_at', true)
                         ->with(['user' => function ($query) {
-                            $query->field('userid,avatar,name');
+                            $query->field('userid,name,avatar');
                         }]);
                 }
             ]);
             $info = $info->find($id);
             if ($info) {
-                if (!$user) {
-                    // 审批申请人信息
-                    $approve_info_user = User::field('userid,name')->where('userid', $info['user_id'])->find();
-                    $info['approve_info_user'] = $approve_info_user;
+                // 审批申请人信息
+                if ($user) {
+                    $approve_info_user = [
+                        'userid' => $user['userid'],
+                        'name' => $user['name'],
+                        'avatar' => $user['avatar'],
+                        'create_at'=>$info['create_at'],
+                    ];
+                } else {
+                    $approve_info_user = User::field('userid,name,avatar')->where('userid', $info['user_id'])->find();
+                    $approve_info_user['create_at'] = $info['create_at'];
                 }
                 $department_data = Department::field('dept_id,name')->where('dept_id', 'in', $info['department'])->select();
+                $info['approve_info_user'] = $approve_info_user;
                 $info['department_data'] = $department_data;
             }
         } else {