Commit df04f477 authored by zhuwei's avatar zhuwei

PC-进场记录列表

parent 22207889
......@@ -7,6 +7,7 @@ namespace app\index\controller;
* Date: 2018/6/13
* Time: 上午10:18
*/
use app\api_broker\service\OrderLogService;
use app\index\extend\Basic;
use app\model\OMarchInModel;
use think\Request;
......@@ -89,11 +90,15 @@ class MarchIn extends Basic
}
//搜索条件 end
$fields_evaluate = 'a.report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,';
$fields_evaluate = 'a.id,a.report_id,a.order_id,d.user_name,d.user_phone,a.create_time,d.report_agent_name,';
$fields_evaluate .= 'd.report_agent_phone,e.store_name,a.march_in_img,f.longitude,f.latitude,a.march_in_area';
$data['list'] = $this->oMarchInModel->findmarchInList($pageNo, $pageSize, 'a.id desc', $fields_evaluate, $where);
$data['total'] = $this->oMarchInModel->findmarchInListCount($fields_evaluate, $where);
$OrderLogService = new OrderLogService();
foreach ($data['list'] as $k=>$v){
$data['list'][$k]['march_in_img'] = $OrderLogService->getOImg($v['id'],1);
}
//var_dump($result);
//return $result;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment