提交

application/api/controller/Approveflow.php

@@ -4,8 +4,6 @@ namespace app\api\controller;
 
 use app\common\service\ApproveFlowService;
 use hg\apidoc\annotation as Apidoc;
-use think\Db;
-use think\Exception;
 
 /**
  * @Apidoc\Title("审批流程")
@@ -26,6 +24,7 @@ class Approveflow extends Base
      * @Apidoc\Desc("获取审批流程")
      * @Apidoc\Method("POST")
      * @Apidoc\Param("module", type="integer", require=true, desc="模块类型:1=申购申请,2=呈批申请,3=入库申请,4=领用申请,5=出差申请,6=请假申请,7=用车申请,8=维修申请,9=合同呈批,10=收文批阅,11=学校文件")
+     * @Apidoc\Param("flow_item", type="integer", require=false, desc="审批流项:module=5出差类型,module=6请假周期")
      * @Apidoc\Returned("approve_user", type="array", desc="审批人列表",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
      *     @Apidoc\Returned("avatar", type="string", desc="头像"),
@@ -41,7 +40,8 @@ class Approveflow extends Base
     public function get_data()
     {
         $module = input('module');
-        $data = ApproveFlowService::get_data($module, $this->user);
+        $flow_item = input('flow_item');
+        $data = ApproveFlowService::get_data($module, $flow_item,$this->user);
         $this->success('获取审批流程', $data);
     }
 

application/api/controller/Base.php

@@ -243,7 +243,8 @@ class Base extends Controller
     protected function checking($modulename, $controllername, $action_name)
     {
         $params = $this->request->post();
-        if (in_array($action_name, ['get_data', 'create', 'edit'])) {
+
+        if (in_array($action_name, ['create', 'edit'])) {
             $get_module_list = CommonConstant::get_module_list();
             $rule = [
                 'module|模块类型' => 'require|in:' . implode(',', array_keys($get_module_list)),
@@ -275,6 +276,21 @@ class Base extends Controller
                 }
             }
         }
+        if ($controllername == 'approveflow') {
+            if ($action_name == 'get_data') {
+                $get_module_list = CommonConstant::get_module_list();
+                $rule = [
+                    'module|模块类型' => 'require|in:' . implode(',', array_keys($get_module_list)),
+                ];
+                $message = [
+                    'module.in' => '请选择正确的模块类型',
+                ];
+                $validate = new Validate($rule, $message);
+                if (!$validate->check($params)) {
+                    $this->error($validate->getError());
+                }
+            }
+        }
         if ($controllername == 'approveinfo') {
             if (in_array($action_name, ['get_detail', 'get_info', 'urging', 'cancel'])) {
                 $rule = [

application/api/controller/Common.php

@@ -27,15 +27,15 @@ class Common extends Base
      * 类型列表
      *
      * @Apidoc\Method("POST")
-     * @Apidoc\Returned("module_list", type="string", desc="模块列表")
-     * @Apidoc\Returned("degree_list", type="string", desc="缓急程度列表")
-     * @Apidoc\Returned("pay_type_list", type="string", desc="采购支付方式列表")
-     * @Apidoc\Returned("data1", type="string", desc="采购类型")
-     * @Apidoc\Returned("data2", type="string", desc="呈批类型")
-     * @Apidoc\Returned("data5", type="string", desc="出差类型")
-     * @Apidoc\Returned("data6", type="string", desc="请假类型")
-     * @Apidoc\Returned("data8", type="string", desc="维修类型")
-     * @Apidoc\Returned("data9", type="string", desc="合同类型")
+     * @Apidoc\Returned("module_list", type="array", desc="模块列表")
+     * @Apidoc\Returned("degree_list", type="array", desc="缓急程度列表")
+     * @Apidoc\Returned("pay_type_list", type="array", desc="采购支付方式列表")
+     * @Apidoc\Returned("data1", type="array", desc="采购类型列表")
+     * @Apidoc\Returned("data2", type="array", desc="呈批类型列表")
+     * @Apidoc\Returned("data5", type="array", desc="出差类型列表")
+     * @Apidoc\Returned("data6", type="array", desc="请假类型列表")
+     * @Apidoc\Returned("data8", type="array", desc="维修类型列表")
+     * @Apidoc\Returned("data9", type="array", desc="合同类型列表")
      */
     public function get_type_list()
     {

application/common/constant/CommonConstant.php

@@ -120,7 +120,7 @@ class CommonConstant
         ];
     }
 
-    // 流程类型:1=审批人,2=抄送人
+    // 审批流类型:1=审批人,2=抄送人
     const TYPE_1 = '1';
     const TYPE_2 = '2';
 

application/common/service/ApproveFlowService.php

@@ -16,9 +16,10 @@ class ApproveFlowService
      * 获取流程
      *
      * @param integer $module 模块类型
+     * @param integer $flow_item 审批流项
      * @param mixed $user 用户信息
      **/
-    public static function get_data($module, $user)
+    public static function get_data($module,$flow_item,$user)
     {
         $userid = $user['userid'];
         $field = 'id,user_ids';