|
@@ -592,6 +592,10 @@ class ConstructionService extends Service
|
|
$model->where('day_start_stamp','>=',$this->changeDateToDateMin($data['pq_period'][0]));
|
|
$model->where('day_start_stamp','>=',$this->changeDateToDateMin($data['pq_period'][0]));
|
|
$model->where('day_end_stamp','<=',$this->changeDateToDateMin($data['pq_period'][1]));
|
|
$model->where('day_end_stamp','<=',$this->changeDateToDateMin($data['pq_period'][1]));
|
|
}
|
|
}
|
|
|
|
+ if(! empty($data['crt_time'][0]) && ! empty($data['crt_time'][1])) {
|
|
|
|
+ $return = $this->changeDateToTimeStampAboutRange($data['crt_time']);
|
|
|
|
+ $model->whereBetween('crt_time',[$return[0],$return[1]]);
|
|
|
|
+ }
|
|
if(! empty($data['sale_order'])){
|
|
if(! empty($data['sale_order'])){
|
|
$model2 = SalesOrder::Clear($user,$data);
|
|
$model2 = SalesOrder::Clear($user,$data);
|
|
$sale = $model2->where('del_time',0)
|
|
$sale = $model2->where('del_time',0)
|