提交

application/api/controller/Approve.php

@@ -31,6 +31,28 @@ class Approve extends Base
      * @Apidoc\Param("start_time", type="string", require=false, desc="申请开始时间")
      * @Apidoc\Param("end_time", type="string", require=false, desc="申请结束时间")
      * @Apidoc\Param("search", type="string", require=false, desc="搜索 姓名 事由 编号")
+     * @Apidoc\Returned("approve_id", type="integer", desc="审批ID")
+     * @Apidoc\Returned("status", type="integer", desc="审批状态:1=待审批,2=审批中,3=审批同意,4=审批驳回")
+     * @Apidoc\Returned("create_at", type="string", desc="创建时间")
+     * @Apidoc\Returned("order_no", type="string", desc="审批编号")
+     * @Apidoc\Returned("apply_date", type="string", desc="申请日期")
+     * @Apidoc\Returned("reason", type="string", desc="事由,文件名称")
+     * @Apidoc\Returned("type", type="integer", desc="类型")
+     * @Apidoc\Returned("desc", type="string", desc="缓急程度,具体内容,来文单位")
+     * @Apidoc\Returned("start_time", type="string", desc="开始时间")
+     * @Apidoc\Returned("end_time", type="string", desc="结束时间")
+     * @Apidoc\Returned("approve_one", type="object", desc="审批人信息 status=1",
+     *     @Apidoc\Returned("id", type="integer", desc="审批ID"),
+     *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
+     *     @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("approve_info_user", type="object", desc="申请人信息",
+     *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
+     *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      * )
      */
     public function get_list()

application/api/controller/Approveinfo.php

@@ -123,20 +123,20 @@ class Approveinfo extends Base
      * @Apidoc\Returned("reason", type="string", desc="事由")
      * @Apidoc\Returned("start_time", type="string", desc="开始时间")
      * @Apidoc\Returned("end_time", 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="姓名"),
-     * )
      * @Apidoc\Returned("approve_one", type="object", desc="审批人信息 status=2,4",
      *     @Apidoc\Returned("id", type="integer", desc="审批ID"),
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
      *     @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("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_list()
     {

application/common/service/ApproveInfoService.php

@@ -405,16 +405,16 @@ class ApproveInfoService
                 if (in_array($status, [CommonConstant::STATUS_2, CommonConstant::STATUS_4])) {
                     // 审批中或审批驳回 才关联 审批人信息
                     $list = $list->with([
-                        'peer_user' => function ($query) {
-                            $query->field('id,info_id,name');
-                        },
                         'approveOne' => function ($query) use ($status) {
                             $query->field('id,info_id,status,approve_user')
                                 ->where('status', $status)
                                 ->with(['user' => function ($query) {
                                     $query->field('userid,name');
                                 }]);
-                        }
+                        },
+                        'peer_user' => function ($query) {
+                            $query->field('id,info_id,name');
+                        },
                     ]);
                 } else {
                     $list = $list->with([