|
|
@@ -2,6 +2,7 @@
|
|
|
namespace app\api\controller;
|
|
|
|
|
|
use app\common\model\CarApprove;
|
|
|
+use app\common\model\ContractApprove;
|
|
|
use app\common\model\DocumentApprove;
|
|
|
use app\common\model\EvectionApprove;
|
|
|
use app\common\model\LeaveApprove;
|
|
|
@@ -45,6 +46,7 @@ class General extends Base
|
|
|
->unionAll("select $field FROM dd_evection_approve WHERE $where")
|
|
|
->unionAll("select $field FROM dd_leave_approve WHERE $where")
|
|
|
->unionAll("select $field FROM dd_maintain_approve WHERE $where")
|
|
|
+ ->unionAll("select $field FROM dd_contract_approve WHERE $where")
|
|
|
->order('create_at desc,id desc')
|
|
|
->limit($this->off_set,$this->page_num)
|
|
|
->select();
|
|
|
@@ -98,6 +100,14 @@ class General extends Base
|
|
|
->leftJoin('OfferInfo i','p.info_id = i.id')
|
|
|
->find()->toArray();
|
|
|
break;
|
|
|
+ case "contract_approve":
|
|
|
+ $v['approve_info'] = ContractApprove::field('i.*,p.id approve_id,p.status approve_status,p.approve_time,p.remark')
|
|
|
+ ->alias('p')
|
|
|
+ ->where(['p.id'=>$v['id']])
|
|
|
+ ->where('p.status','>','0')
|
|
|
+ ->leftJoin('ContractInfo i','p.info_id = i.id')
|
|
|
+ ->find()->toArray();
|
|
|
+ break;
|
|
|
}
|
|
|
}
|
|
|
|
