zhanglinxin il y a 1 an
Parent
commit
ef37c9e254

+ 12 - 3
application/api/controller/Approveinfo.php

@@ -92,7 +92,7 @@ class Approveinfo extends Base
      *     @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("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"),
@@ -147,7 +147,6 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("id", type="integer", desc="审批ID"),
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
      *     @Apidoc\Returned("status", type="integer", desc="审批状态:1=待审批,2=审批中,3=审批通过,4=审批拒绝"),
-     *     @Apidoc\Returned("create_at", type="string", desc="创建时间"),
      *     @Apidoc\Returned("approve_flow", type="integer", desc="流程批次"),
      *     @Apidoc\Returned("approve_user", type="string", desc="审批人userid"),
      *     @Apidoc\Returned("approve_time", type="string", desc="审批时间"),
@@ -159,7 +158,17 @@ class Approveinfo extends Base
      *          @Apidoc\Returned("name", type="string", desc="姓名"),
      *      ),
      * )
-     * @Apidoc\Returned("department", type="array", desc="所在部门列表",
+     * @Apidoc\Returned("approve_copy", type="object", desc="抄送信息",
+     *     @Apidoc\Returned("id", type="integer", desc="抄送ID"),
+     *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
+     *     @Apidoc\Returned("approve_flow", type="integer", desc="流程批次"),
+     *     @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("department_data", type="array", desc="所在部门列表",
      *     @Apidoc\Returned("dept_id", type="string", desc="部门ID"),
      *     @Apidoc\Returned("name", type="string", desc="部门名称"),
      * )

+ 0 - 3
application/api/controller/Common.php

@@ -4,10 +4,7 @@ namespace app\api\controller;
 
 use app\common\constant\CommonConstant;
 use app\common\constant\EvectionConstant;
-use app\common\service\ApproveService;
 use hg\apidoc\annotation as Apidoc;
-use think\Db;
-use think\Exception;
 
 /**
  * @Apidoc\Title("公用")