1

app/Service/SalesOrderService.php

@@ -585,6 +585,31 @@ class SalesOrderService extends Service
                 $model->where('state', '>=', SalesOrder::State_four);
             }
         }
+        if(isset($data['state'])) $model->where('state',$data['state']);
+        if(isset($data['invoice_state'])) $model->where('invoice_state',$data['invoice_state']);
+        if(! empty($data['order_type'])) $model->where('order_type',$data['order_type']);
+        if(! empty($data['business_type'])) $model->where('business_type',$data['business_type']);
+        if(! empty($data['sale_type'])) $model->where('sale_type',$data['sale_type']);
+        if(! empty($data['plat_type'])) $model->where('order_type',$data['plat_type']);
+        if(! empty($data['plat_order'])) $model->where('plat_order','LIKE', '%'.$data['plat_order'].'%');
+        if(! empty($data['customer'])) {
+            $model2 = Customer::Clear($user,$data);
+            $customer = $model->where('del_time',0)
+                ->where('title', 'LIKE', '%'.$data['title'].'%')
+                ->select('id')
+                ->get()->toArray();
+            $model->whereIn('customer_id',array_unique(array_column($customer,'id')));
+        }
+        if(! empty($data['sign_time'])){
+            $return = $this->changeDateToNewDate2($data['sign_time']);
+            $model->where('sign_time','>=',$return[0]);
+            $model->where('sign_time','<=',$return[1]);
+        }
+        if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
+            $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
+            $model->where('crt_time','>=',$return[0]);
+            $model->where('crt_time','<=',$return[1]);
+        }
 
         $list = $this->limit($model,'',$data);
         $list = $this->fillData($list,$data);
@@ -751,7 +776,7 @@ class SalesOrderService extends Service
             $data['data'][$key]['send_state_title'] = $basic_map[$value['send_state']] ?? '';
             $data['data'][$key]['logistics_company_title'] = $basic_map[$value['logistics_company']] ?? '';
             $data['data'][$key]['customer_title'] = $customer[$value['customer_id']] ?? '';
-            $data['data'][$key]['sign_time'] = $value['sign_time'] ? date('Y-m-d H:i:s',$value['sign_time']) : '';
+            $data['data'][$key]['sign_time'] = $value['sign_time'] ? date('Y-m-d',$value['sign_time']) : '';
             $data['data'][$key]['construction_time'] = $value['construction_time'] ? date('Y-m-d H:i:s',$value['construction_time']) : '';
             $data['data'][$key]['handover_time'] = $value['handover_time'] ? date('Y-m-d H:i:s',$value['handover_time']) : '';
             $data['data'][$key]['expire_time'] = $value['expire_time'] ? date('Y-m-d H:i:s',$value['expire_time']) : '';

app/Service/Service.php

@@ -312,6 +312,26 @@ class Service
         return $return;
     }
 
+    function changeDateToNewDate2($time){
+        if(empty($time_range)) return [];
+
+        // 创建一个 DateTime 对象并设置时区为 UTC
+        $dateTime = new \DateTime($time_range, new \DateTimeZone('UTC'));
+
+        // 将时区设置为 PRC
+        $dateTime->setTimezone(new \DateTimeZone('Asia/Shanghai'));
+
+        // 将日期时间格式化为特定格式
+        $formattedDate = $dateTime->format('Y-m-d 00:00:00');
+        $formattedDate1 = $dateTime->format('Y-m-d 23:59:59');
+
+        $return = [];
+        $return[] = strtotime($formattedDate);
+        $return[] = strtotime($formattedDate1);
+
+        return $return;
+    }
+
     //前端传来的时间 转为时间戳
     //精确到分
     function changeDateToDateMin($time){