|
@@ -2738,7 +2738,7 @@ class Orders extends Base {
|
|
|
return $data;
|
|
|
}
|
|
|
//所有订单列表
|
|
|
- public function queryAllOrder($orgId,$page,$size,$workTypeMode,$currOrderMode,$beginTime,$endTime){
|
|
|
+ public function queryAllOrder($orgId,$page,$size,$workTypeMode,$currOrderMode,$beginTime,$endTime,$dept=0){
|
|
|
if(in_array($workTypeMode,[0,1,2,3,4,15])){
|
|
|
$map[] = ['work_type_mode','=',$workTypeMode];
|
|
|
}
|
|
@@ -2751,6 +2751,9 @@ class Orders extends Base {
|
|
|
if($endTime){
|
|
|
$map[] = ['create_time','<=',$endTime.' 23:59:59'];
|
|
|
}
|
|
|
+ if($dept > 0){
|
|
|
+ $map[] = ['dep_id','=',$dept];
|
|
|
+ }
|
|
|
$map[] = ['del', '=', 0];
|
|
|
$map[] = ['org_id', '=', $orgId];
|
|
|
$offset = ($page - 1) * $size;
|