wupengfei 2 anni fa
parent
commit
8839228a75

+ 1 - 1
application/api/controller/Maintain.php

@@ -44,7 +44,7 @@ class Maintain extends Base
      */
     public function getCopyFlow()
     {
-        $list = ApproveFlow::getCopyTo(4,$this->user_id);
+        $list = ApproveFlow::getCopyTo(5,$this->user_id);
         $this->success('ok',['list'=>$list]);
     }
 

+ 59 - 59
application/api/controller/SchoolDocument.php

@@ -1,13 +1,13 @@
 <?php
 namespace app\api\controller;
 use app\common\model\ApproveFlow;
-use app\common\model\MaintainInfo;
-use app\common\model\MaintainApprove;
+use app\common\model\DocumentInfo;
+use app\common\model\DocumentApprove;
 use app\common\service\ApproveService;
 use hg\apidoc\annotation as Apidoc;
 
 /**
- * @Apidoc\Title("员工维修管理")
+ * @Apidoc\Title("学校文件")
  * @Apidoc\Group("api")
  */
 class SchoolDocument extends Base
@@ -19,8 +19,8 @@ class SchoolDocument extends Base
     }
 
     /**
-     * @Apidoc\Title("获取维修审核流程")
-     * @Apidoc\Desc("获取维修流程")
+     * @Apidoc\Title("获取学校文件审核流程")
+     * @Apidoc\Desc("获取学校文件流程")
      * @Apidoc\Method("GET")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
@@ -29,7 +29,7 @@ class SchoolDocument extends Base
      */
     public function getApproveFlow()
     {
-        $list = ApproveFlow::getApproveUser(5,$this->user_id);
+        $list = ApproveFlow::getApproveUser(6,$this->user_id);
         $this->success('ok',['list'=>$list]);
     }
 
@@ -44,24 +44,24 @@ class SchoolDocument extends Base
      */
     public function getCopyFlow()
     {
-        $list = ApproveFlow::getCopyTo(4,$this->user_id);
+        $list = ApproveFlow::getCopyTo(6,$this->user_id);
         $this->success('ok',['list'=>$list]);
     }
 
     /**
-     * @Apidoc\Title("维修申请")
-     * @Apidoc\Desc("维修申请")
+     * @Apidoc\Title("学校文件申请")
+     * @Apidoc\Desc("学校文件申请")
      * @Apidoc\Method("POST")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
      * @Apidoc\Query("title", type="string",desc="标题")
-     * @Apidoc\Query("content", type="string", desc="维修详细内容")
+     * @Apidoc\Query("content", type="string", desc="学校文件详细内容")
      * @Apidoc\Query("images", type="string", desc="图片(多张|隔开)")
-     * @Apidoc\Query("address", type="string", desc="维修地址")
+     * @Apidoc\Query("address", type="string", desc="学校文件地址")
      * @Apidoc\Query("flow_user", type="string", desc="审批人id(多个逗号隔开)")
      * @Apidoc\Query("copy_user", type="string", desc="抄送人id(多个逗号隔开)")
      */
-    public function applyMaintain()
+    public function applyDocument()
     {
         $request_param = input('post.');
         $request_param['user_id'] = $this->user_id;// 申请会员id
@@ -69,22 +69,22 @@ class SchoolDocument extends Base
         $flow_user = isset($request_param['flow_user']) ? $request_param['flow_user']:'' ;
         $copy_user = isset($request_param['copy_user']) ? $request_param['copy_user']:'' ;
         if(!$flow_user) $this->error('请选择审批人');
-        $flow_info = MaintainInfo::create($request_param);//生成维修记录
+        $flow_info = DocumentInfo::create($request_param);//生成学校文件记录
         $approve_res = ApproveFlow::getApproveData($flow_user,$copy_user,$flow_info->id);
-        $flow_data = $approve_res['flow_data'];// 维修流程
+        $flow_data = $approve_res['flow_data'];// 学校文件流程
         $flow_num  =  $approve_res['flow_num'];
         if(!empty($flow_data)) {
-            MaintainInfo::where('id',$flow_info->id)->update(['approve_num'=>$flow_num]);
-            (new MaintainApprove())->saveAll($flow_data);
+            DocumentInfo::where('id',$flow_info->id)->update(['approve_num'=>$flow_num]);
+            (new DocumentApprove())->saveAll($flow_data);
         }else{
-            MaintainInfo::where('id',$flow_info->id)->update(['status'=>2]);
+            DocumentInfo::where('id',$flow_info->id)->update(['status'=>2]);
         }
-        $this->success('维修已提交,请等待审核',['detail'=>$flow_info->toArray()]);
+        $this->success('学校文件已提交,请等待审核',['detail'=>$flow_info->toArray()]);
 
     }
     /**
-     * @Apidoc\Title("维修记录(列表)")
-     * @Apidoc\Desc("维修记录")
+     * @Apidoc\Title("学校文件记录(列表)")
+     * @Apidoc\Desc("学校文件记录")
      * @Apidoc\Method("GET")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
@@ -92,33 +92,33 @@ class SchoolDocument extends Base
      * @Apidoc\Query("page_num", type="string", desc="每页数量")
      * @Apidoc\Query("type", type="int", desc="出差类型id")
      * @Apidoc\Query("status", type="int", desc="审批状态0全部,1审批中,2审批通过,3审批拒绝,9取消")
-     * @Apidoc\Returned("type", type="int", desc="维修类型id")
+     * @Apidoc\Returned("type", type="int", desc="学校文件类型id")
      * @Apidoc\Returned("word_size", type="string", desc="发文字号")
      * @Apidoc\Returned("level", type="int", desc="缓急程度(1缓,2稍急,3很急)")
      * @Apidoc\Returned("num", type="int", desc="申请数量")
      * @Apidoc\Returned("title", type="string", desc="标题")
      * @Apidoc\Returned("document", type="string", desc="附件(文件路径)")
-     * @Apidoc\Returned("content", type="string", desc="维修详细内容")
+     * @Apidoc\Returned("content", type="string", desc="学校文件详细内容")
      * @Apidoc\Returned("apply_date", type="string", desc="申请日期")
      */
-    public function getMaintainList()
+    public function getDocumentList()
     {
         $sel_where = [];
         $sel_where[] = ['user_id','=',$this->user_id];
         if(input('get.status') > 0)  $sel_where[] = ['status','=',input('get.status')];
         if(input('get.type') > 0)  $sel_where[] = ['type','=',input('get.type')];
-        $list = MaintainInfo::where($sel_where)->limit($this->off_set,$this->page_num)->select()->toArray();
+        $list = DocumentInfo::where($sel_where)->limit($this->off_set,$this->page_num)->select()->toArray();
         $this->success('ok',['list'=>$list]);
     }
 
     /**
-     * @Apidoc\Title("维修详情")
-     * @Apidoc\Desc("维修详情")
+     * @Apidoc\Title("学校文件详情")
+     * @Apidoc\Desc("学校文件详情")
      * @Apidoc\Method("GET")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
-     * @Apidoc\Query("id", type="int",require=true, desc="维修记录id")
-     * @Apidoc\Returned("type", type="int", desc="维修类型id")
+     * @Apidoc\Query("id", type="int",require=true, desc="学校文件记录id")
+     * @Apidoc\Returned("type", type="int", desc="学校文件类型id")
      * @Apidoc\Returned("word_size", type="string", desc="发文字号")
      * @Apidoc\Returned("level", type="int", desc="缓急程度(1缓,2稍急,3很急)")
      * @Apidoc\Returned("num", type="int", desc="申请数量")
@@ -126,20 +126,20 @@ class SchoolDocument extends Base
      * @Apidoc\Returned("headimg", type="string", desc="申请人头像")
      * @Apidoc\Returned("user_name", type="string", desc="申请人昵称")
      * @Apidoc\Returned("document", type="string", desc="附件(文件路径)")
-     * @Apidoc\Returned("content", type="string", desc="维修详细内容")
+     * @Apidoc\Returned("content", type="string", desc="学校文件详细内容")
      * @Apidoc\Returned("apply_date", type="string", desc="申请日期")
-     * @Apidoc\Returned("approve_list", type="array", desc="维修记录")
-     * @Apidoc\Returned("approve_list.status", type="int", desc="维修状态:0待维修(未到该维修人维修),1维修中(已到该维修人维修,还未维修)2维修通过3维修拒绝")
-     * @Apidoc\Returned("approve_list.approve_time", type="string", desc="维修时间")
-     * @Apidoc\Returned("approve_list.remark", type="string", desc="维修备注")
-     * @Apidoc\Returned("approve_list.user_name", type="string", desc="维修人")
-     * @Apidoc\Returned("approve_list.headimg", type="string", desc="维修人头像")
-     * @Apidoc\Returned("approve_list.time", type="string", desc="维修用时(上一次维修完成到本次维修的时间,单位秒)")
+     * @Apidoc\Returned("approve_list", type="array", desc="学校文件记录")
+     * @Apidoc\Returned("approve_list.status", type="int", desc="学校文件状态:0待学校文件(未到该学校文件人学校文件),1学校文件中(已到该学校文件人学校文件,还未学校文件)2学校文件通过3学校文件拒绝")
+     * @Apidoc\Returned("approve_list.approve_time", type="string", desc="学校文件时间")
+     * @Apidoc\Returned("approve_list.remark", type="string", desc="学校文件备注")
+     * @Apidoc\Returned("approve_list.user_name", type="string", desc="学校文件人")
+     * @Apidoc\Returned("approve_list.headimg", type="string", desc="学校文件人头像")
+     * @Apidoc\Returned("approve_list.time", type="string", desc="学校文件用时(上一次学校文件完成到本次学校文件的时间,单位秒)")
      */
-    public function getMaintainInfo()
+    public function getDocumentInfo()
     {
         $id = input('get.id');
-        $detail = MaintainInfo::with('approveList')
+        $detail = DocumentInfo::with('approveList')
             ->alias('a')
             ->field('a.*,u.branch_id,u.headimg,u.name user_name')
             ->leftJoin('StoreMember u','a.user_id = u.id')
@@ -156,64 +156,64 @@ class SchoolDocument extends Base
      * @Apidoc\Tag("")
      * @Apidoc\Query("page", type="int",require=true, desc="页数")
      * @Apidoc\Query("page_num", type="int",require=true, desc="每页数量")
-     * @Apidoc\Query("type", type="int", desc="维修类型id")
+     * @Apidoc\Query("type", type="int", desc="学校文件类型id")
      * @Apidoc\Returned("word_size", type="string", desc="发文字号")
      * @Apidoc\Returned("level", type="int", desc="缓急程度(1缓,2稍急,3很急)")
      * @Apidoc\Returned("num", type="int", desc="申请数量")
      * @Apidoc\Returned("title", type="string", desc="标题")
      * @Apidoc\Returned("document", type="string", desc="附件(文件路径)")
-     * @Apidoc\Returned("content", type="string", desc="维修详细内容")
-     * @Apidoc\Returned("apply_date", type="string", desc="维修日期")
-     * @Apidoc\Returned("approve_status", type="int", desc="维修状态(我的审批状态)")
-     * @Apidoc\Returned("approve_time", type="string", desc="维修时间")
-     * @Apidoc\Returned("approve_id", type="int", desc="维修记录id")
-     * @Apidoc\Returned("remark", type="string", desc="维修备注")
+     * @Apidoc\Returned("content", type="string", desc="学校文件详细内容")
+     * @Apidoc\Returned("apply_date", type="string", desc="学校文件日期")
+     * @Apidoc\Returned("approve_status", type="int", desc="学校文件状态(我的审批状态)")
+     * @Apidoc\Returned("approve_time", type="string", desc="学校文件时间")
+     * @Apidoc\Returned("approve_id", type="int", desc="学校文件记录id")
+     * @Apidoc\Returned("remark", type="string", desc="学校文件备注")
      */
-    public function getApproveMaintain()
+    public function getApproveDocument()
     {
-        $list = MaintainApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
+        $list = DocumentApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
             ->alias('p')
             ->where(['p.approve_user'=>$this->user_id])
             ->where('p.status','>','0')
-            ->leftJoin('MaintainInfo i','p.info_id = i.id')
+            ->leftJoin('DocumentInfo i','p.info_id = i.id')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         $this->success('ok',['list'=>$list]);
     }
 
     /**
-     * @Apidoc\Title("维修审批")
-     * @Apidoc\Desc("维修审批")
+     * @Apidoc\Title("学校文件审批")
+     * @Apidoc\Desc("学校文件审批")
      * @Apidoc\Method("POST")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
      * @Apidoc\Query("id", type="int",require=true, desc="申请记录id")
-     * @Apidoc\Query("status", type="string",require=true, desc="维修状态(2维修通过3维修拒绝)")
-     * @Apidoc\Query("remark", type="string",require=true, desc="维修备注")
+     * @Apidoc\Query("status", type="string",require=true, desc="学校文件状态(2学校文件通过3学校文件拒绝)")
+     * @Apidoc\Query("remark", type="string",require=true, desc="学校文件备注")
      */
-    public function approveMaintain()
+    public function approveDocument()
     {
         $approve_id = input('post.id');
         $status = input('post.status');
         $remark = input('post.remark');
-        $res = ApproveService::approveMaintain($approve_id,$this->user_id,$status,$remark);
+        $res = ApproveService::approveDocument($approve_id,$this->user_id,$status,$remark);
         if(!$res['ret_val']) $this->error($res['msg']);
         $this->success('审批完成');
     }
 
     /**
-     * @Apidoc\Title("撤销维修申请")
-     * @Apidoc\Desc("撤销维修申请")
+     * @Apidoc\Title("撤销学校文件申请")
+     * @Apidoc\Desc("撤销学校文件申请")
      * @Apidoc\Method("POST")
      * @Apidoc\Author("HG")
      * @Apidoc\Tag("")
-     * @Apidoc\Query("id", type="int",require=true, desc="维修记录id")
+     * @Apidoc\Query("id", type="int",require=true, desc="学校文件记录id")
      */
     public function cancelApply()
     {
         $id  = input('post.id');
-        $apply_info  = MaintainInfo::where('id',$id)->where('user_id',$this->user_id)->find();
-        if(!$apply_info)$this->error('维修记录有误');
+        $apply_info  = DocumentInfo::where('id',$id)->where('user_id',$this->user_id)->find();
+        if(!$apply_info)$this->error('学校文件记录有误');
         $apply_info->status = 9;
         $apply_info->save();
         $this->success('撤销成功');