|
|
@@ -3,6 +3,8 @@ namespace app\api\controller;
|
|
|
|
|
|
use app\common\model\CarApprove;
|
|
|
use app\common\model\DocumentApprove;
|
|
|
+use app\common\model\EvectionApprove;
|
|
|
+use app\common\model\LeaveApprove;
|
|
|
use app\common\model\MaintainApprove;
|
|
|
use app\common\model\OfferApprove;
|
|
|
use hg\apidoc\annotation as Apidoc;
|
|
|
@@ -25,6 +27,11 @@ class General extends Base
|
|
|
* @Apidoc\Tag("")
|
|
|
* @Apidoc\Query("page", type="int",desc="页数")
|
|
|
* @Apidoc\Query("page_num", type="string", desc="每页数量")
|
|
|
+ * @Apidoc\Returned("id", type="int", desc="审批记录id")
|
|
|
+ * @Apidoc\Returned("create_at", type="string", desc="申请时间")
|
|
|
+ * @Apidoc\Returned("module", type="string", desc="所属模块")
|
|
|
+ * @Apidoc\Returned("approve_info", type="array", desc="申请记录详情")
|
|
|
+ * @Apidoc\Returned("approve_info.id", type="int", desc="申请记录详情id")
|
|
|
*/
|
|
|
public function getAllApprove()
|
|
|
{
|
|
|
@@ -60,8 +67,20 @@ class General extends Base
|
|
|
->find()->toArray();
|
|
|
break;
|
|
|
case "evection_approve":
|
|
|
+ $v['approve_info'] = EvectionApprove::field('i.*,p.status approve_status,p.approve_time,p.remark')
|
|
|
+ ->alias('p')
|
|
|
+ ->where(['p.id'=>$v['id']])
|
|
|
+ ->where('p.status','>','0')
|
|
|
+ ->leftJoin('EvectionInfo i','p.info_id = i.id')
|
|
|
+ ->find()->toArray();
|
|
|
break;
|
|
|
case "leave_approve":
|
|
|
+ $v['approve_info']= LeaveApprove::field('i.*,p.status approve_status,p.approve_time,p.remark')
|
|
|
+ ->alias('p')
|
|
|
+ ->where(['p.id'=>$v['id']])
|
|
|
+ ->where('p.status','>','0')
|
|
|
+ ->leftJoin('LeaveInfo i','p.info_id = i.id')
|
|
|
+ ->find()->toArray();
|
|
|
break;
|
|
|
case "maintain_approve":
|
|
|
$v['approve_info'] =MaintainApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
|
