|
|
@@ -103,7 +103,7 @@ class PhOrders extends Auth
|
|
|
->where('id',$v['dep_id'])
|
|
|
->value('title');
|
|
|
}
|
|
|
- $workerId = Db::name('ph_todo')->where('order_id',$v['id'])->column('worker_id');
|
|
|
+ $workerId = Db::name('ph_todo')->where('order_id',$v['id'])->whereIn('status',[1,2])->column('worker_id');
|
|
|
if (!empty($workerId)) {
|
|
|
foreach ($workerId as $k2=>$v2){
|
|
|
$userId = Db::name('worker')->where('id',$v2)->value('user_id');
|
|
|
@@ -411,21 +411,18 @@ class PhOrders extends Auth
|
|
|
$b = input('begin','','trim');
|
|
|
$e = input('end','','trim');
|
|
|
if($b){
|
|
|
- $b = date('Y-m-d 00:00:00',strtotime($b));
|
|
|
$map[] = ['a.create_time','>=',$b];
|
|
|
}
|
|
|
if($e){
|
|
|
- $e = date('Y-m-d 23:59:59',strtotime($e));
|
|
|
$map[] = ['a.create_time','<=',$e];
|
|
|
}
|
|
|
$map[] = ['a.org_id','=',$this->orgId];
|
|
|
-// $map[] = ['a.is_service','=',1];
|
|
|
+ $map[] = ['a.is_service','=',1];
|
|
|
$map= empty($map) ? true: $map;
|
|
|
//数据查询
|
|
|
$lists = Db::name('ph_orders')->alias('a')
|
|
|
- ->join('ph_todo b','a.id = b.order_id')
|
|
|
->where($map)
|
|
|
- ->field('a.*,b.worker_id')
|
|
|
+ ->field('a.*')
|
|
|
->distinct(true)
|
|
|
->order($order)
|
|
|
->select();
|
|
|
@@ -438,6 +435,18 @@ class PhOrders extends Auth
|
|
|
$lists[$k]['depName'] = '';
|
|
|
$lists[$k]['cateName'] = '';
|
|
|
$lists[$k]['price'] = '';
|
|
|
+ $lists[$k]['workerName'] = '';
|
|
|
+ $workerId = Db::name('ph_todo')
|
|
|
+ ->where('order_id',$v['id'])
|
|
|
+ ->whereIn('status',[1,2])
|
|
|
+ ->column('worker_id');
|
|
|
+ if (!empty($workerId)) {
|
|
|
+ foreach ($workerId as $k2=>$v2){
|
|
|
+ $userId = Db::name('worker')->where('id',$v2)->value('user_id');
|
|
|
+ $workerId[$k2]= Db::name('user')->where('id',$userId)->value('real_name');
|
|
|
+ }
|
|
|
+ $lists[$k]['workerName'] = implode(',',$workerId);
|
|
|
+ }
|
|
|
if($v['cate_id'] > 0){
|
|
|
$cate = Db::name('cate')
|
|
|
->where('id',$v['cate_id'])
|
|
|
@@ -451,15 +460,6 @@ class PhOrders extends Auth
|
|
|
->where('id',$v['dep_id'])
|
|
|
->value('title');
|
|
|
}
|
|
|
- $worker = explode(',',$v['worker_id']);
|
|
|
- foreach ($worker as $kk=>$vv){
|
|
|
- $worker[$kk] = Db::name('worker')
|
|
|
- ->alias('a')
|
|
|
- ->join('user b','a.user_id = b.id')
|
|
|
- ->where('a.id',$vv)
|
|
|
- ->value('b.real_name');
|
|
|
- }
|
|
|
- $lists[$k]['workerName'] = implode(',',$worker);
|
|
|
$lists[$k]['days'] = $v['status'] == 2 ? $this->getWorkerDay($v['start'],$v['end']) : '';
|
|
|
}
|
|
|
int_to_string($lists,['status' => $this->status]);
|
|
|
@@ -603,7 +603,7 @@ class PhOrders extends Auth
|
|
|
$objPHPExcel->getActiveSheet()->setCellValue('Q' . ($i + 2), $lists[$i]['update_time']);
|
|
|
}
|
|
|
//设置保存的Excel表格名称
|
|
|
- $filename = '订单列表' . date('YmdHis', time()) . '.xls';
|
|
|
+ $filename = '订单列表' . date('YmdHis', time()) . '.xlsx';
|
|
|
|
|
|
//设置当前激活的sheet表格名称
|
|
|
$objPHPExcel->getActiveSheet()->setTitle('订单列表');
|
|
|
@@ -616,7 +616,7 @@ class PhOrders extends Auth
|
|
|
header('Content-Disposition:inline;filename="' . $filename);
|
|
|
|
|
|
//生成excel文件
|
|
|
- $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel5');
|
|
|
+ $objWriter = \PHPExcel_IOFactory::createWriter($objPHPExcel, 'Excel2007');
|
|
|
//下载文件在浏览器窗口
|
|
|
return $objWriter->save('php://output');
|
|
|
}
|
