提交

application/api/controller/Approveinfo.php

@@ -613,7 +613,7 @@ class Approveinfo extends Base
      * @Apidoc\Method("POST")
      * @Apidoc\Param("id", type="integer",require=true, desc="申请ID")
      * @Apidoc\Returned("url", type="string", desc="/upload/pdf/20240113/20240113202401131733211705138401.pdf")
-     * @Apidoc\Returned("fullurl", type="string", desc="http://www.dingding.com/upload/pdf/20240113/20240113202401131733211705138401.pdf")
+     * @Apidoc\Returned("fullurl", type="string", desc="https://www.dingding.com/upload/pdf/20240113/20240113202401131733211705138401.pdf")
      **/
     public function download(){
         $id = input('id') ?: 0;

application/api/controller/Base.php

@@ -281,7 +281,7 @@ class Base extends Controller
                     $this->error($validate->getError());
                 }
             }
-            if (in_array($action_name, ['get_detail', 'get_info', 'urging', 'cancel'])) {
+            if (in_array($action_name, ['get_detail', 'get_info', 'urging', 'cancel','download'])) {
                 $rule = [
                     'id|申请参数' => 'require|gt:0',
                 ];

application/api/controller/Upload.php

@@ -25,7 +25,7 @@ class Upload extends Base
     }
 
     /**
-     * @Apidoc\Title("上传文件接口（上传到本地（导入模板需要））")
+     * @Apidoc\Title("上传文件接口（上传到本地）")
      * @Apidoc\Desc("上传文件Desc")
      * @Apidoc\Tag("上传文件Tag")
      * @Apidoc\Method("POST")

application/approve/controller/Goods.php

@@ -262,6 +262,7 @@ class Goods extends Controller
     public function remove()
     {
         $this->applyCsrfToken();
+        // TODO 删除商品,检验申请数据
         $this->_delete($this->table);
     }
 

application/common/service/DingtalkService.php

@@ -24,88 +24,6 @@ class DingtalkService
     }
 
     /**
-     * 获取部门列表
-     *
-     * @param string $dept_id 父部门ID
-     * @return mixed
-     */
-    public static function department_listsub($dept_id)
-    {
-        $accessToken = Sample::accessToken()['accessToken'];
-        $c = self::get_obj();
-        $req = new \OapiV2DepartmentListsubRequest;
-        $req->setDeptId($dept_id);
-        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/department/listsub");
-        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
-            $result = $resp->result;
-            return $result;
-        }
-        except($resp->errcode . ' ' . $resp->errmsg);
-    }
-
-    /**
-     * 获取部门详情
-     *
-     * @param string $dept_id 部门ID
-     * @return mixed
-     */
-    public static function department_get($dept_id)
-    {
-        $accessToken = Sample::accessToken()['accessToken'];
-        $c = self::get_obj();
-        $req = new \OapiV2DepartmentListsubRequest;
-        $req->setDeptId($dept_id);
-        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/department/get");
-        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
-            $result = $resp->result;
-            return $result;
-        }
-        except($resp->errcode . ' ' . $resp->errmsg);
-    }
-
-    /**
-     * 获取部门用户详情
-     *
-     * @param string $dept_id 部门ID
-     * @return mixed
-     */
-    public static function user_list($dept_id)
-    {
-        $accessToken = Sample::accessToken()['accessToken'];
-        $c = self::get_obj();
-        $req = new \OapiV2UserListRequest;
-        $req->setDeptId($dept_id);
-        $req->setCursor("0");
-        $req->setSize("100");
-        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/user/list");
-        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
-            $result = $resp->result;
-            return $result;
-        }
-        except($resp->errcode . ' ' . $resp->errmsg);
-    }
-
-    /**
-     * 查询用户详情
-     *
-     * @param string $userid 用户的userId
-     * @return mixed
-     */
-    public static function user_get($userid)
-    {
-        $accessToken = Sample::accessToken()['accessToken'];
-        $c = self::get_obj();
-        $req = new \OapiV2UserGetRequest;
-        $req->setUserid($userid);
-        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/user/get");
-        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
-            $result = $resp->result;
-            return $result;
-        }
-        except($resp->errcode . ' ' . $resp->errmsg);
-    }
-
-    /**
      * 通过免登码获取用户信息
      *
      * @param string $code 免登授权码
@@ -127,6 +45,7 @@ class DingtalkService
 
     /**
      * 设置企业内部应用H5微应用鉴权
+     *
      * @param string $url 应用URL，例如：https://your-domain.com/path/to/your/app.html
      * @return mixed
      **/
@@ -149,6 +68,8 @@ class DingtalkService
 
     /**
      * 更新员工和部门
+     *
+     * @return bool
      * [{"dept_id":438337214,"name":"BOSS","parent_id":1},{"dept_id":438145402,"name":"项目管理中心","parent_id":1},{"dept_id":501674219,"name":"技术部","parent_id":438145402},{"dept_id":500773946,"name":"项目一组","parent_id":501674219},{"dept_id":501193520,"name":"项目二组","parent_id":501674219},{"dept_id":731200005,"name":"Ui测试组","parent_id":501674219},{"dept_id":501415496,"name":"销售部","parent_id":438145402},{"dept_id":859178110,"name":"运营部","parent_id":438145402},{"dept_id":724339668,"name":"职能支持中心","parent_id":1},{"dept_id":438218445,"name":"人力资源部","parent_id":724339668},{"dept_id":702458745,"name":"财务部","parent_id":724339668}]
      **/
     public static function renew()
@@ -275,4 +196,87 @@ class DingtalkService
         return $tree;
     }
 
+
+    /**
+     * 获取部门列表
+     *
+     * @param string $dept_id 父部门ID
+     * @return mixed
+     */
+    public static function department_listsub($dept_id)
+    {
+        $accessToken = Sample::accessToken()['accessToken'];
+        $c = self::get_obj();
+        $req = new \OapiV2DepartmentListsubRequest;
+        $req->setDeptId($dept_id);
+        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/department/listsub");
+        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
+            $result = $resp->result;
+            return $result;
+        }
+        except($resp->errcode . ' ' . $resp->errmsg);
+    }
+
+    /**
+     * 获取部门详情
+     *
+     * @param string $dept_id 部门ID
+     * @return mixed
+     */
+    public static function department_get($dept_id)
+    {
+        $accessToken = Sample::accessToken()['accessToken'];
+        $c = self::get_obj();
+        $req = new \OapiV2DepartmentListsubRequest;
+        $req->setDeptId($dept_id);
+        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/department/get");
+        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
+            $result = $resp->result;
+            return $result;
+        }
+        except($resp->errcode . ' ' . $resp->errmsg);
+    }
+
+    /**
+     * 获取部门用户详情
+     *
+     * @param string $dept_id 部门ID
+     * @return mixed
+     */
+    public static function user_list($dept_id)
+    {
+        $accessToken = Sample::accessToken()['accessToken'];
+        $c = self::get_obj();
+        $req = new \OapiV2UserListRequest;
+        $req->setDeptId($dept_id);
+        $req->setCursor("0");
+        $req->setSize("100");
+        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/user/list");
+        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
+            $result = $resp->result;
+            return $result;
+        }
+        except($resp->errcode . ' ' . $resp->errmsg);
+    }
+
+    /**
+     * 查询用户详情
+     *
+     * @param string $userid 用户的userId
+     * @return mixed
+     */
+    public static function user_get($userid)
+    {
+        $accessToken = Sample::accessToken()['accessToken'];
+        $c = self::get_obj();
+        $req = new \OapiV2UserGetRequest;
+        $req->setUserid($userid);
+        $resp = $c->execute($req, $accessToken, "https://oapi.dingtalk.com/topapi/v2/user/get");
+        if ($resp->errcode == 0 && $resp->errmsg == 'ok') {
+            $result = $resp->result;
+            return $result;
+        }
+        except($resp->errcode . ' ' . $resp->errmsg);
+    }
+
 }