|
|
@@ -18,12 +18,10 @@ class ProjectService extends Service
|
|
|
$responsibility_person_id = $this->pg('responsibility_person_id');
|
|
|
|
|
|
$create_time_begin_time = $this->pg('create_time_begin_time');
|
|
|
- $create_time_end_time = $this->pg('create_time_begin_time');
|
|
|
- $corret_create_end_time = $create_time_end_time ? Carbon::createFromTimeString($create_time_end_time)->endOfDay()->toDateTimeString() : null;
|
|
|
+ $create_time_end_time = $this->pg('create_time_end_time');
|
|
|
|
|
|
$update_time_begin_time = $this->pg('update_time_begin_time');
|
|
|
- $update_time_end_time = $this->pg('update_time_begin_time');
|
|
|
- $corret_update_end_time = $update_time_end_time ? Carbon::createFromTimeString($update_time_end_time)->endOfDay()->toDateTimeString() : null;
|
|
|
+ $update_time_end_time = $this->pg('update_time_end_time');
|
|
|
|
|
|
$min_amount = $this->pg('min_amount');
|
|
|
$max_amount = $this->pg('max_amount');
|
|
|
@@ -38,8 +36,8 @@ class ProjectService extends Service
|
|
|
->like('p.name|p.source', $keyword)
|
|
|
->in('p.status', $status)
|
|
|
->eq('p.responsibility_person_id', $responsibility_person_id)
|
|
|
- ->between('p.create_time', $create_time_begin_time, $corret_create_end_time)
|
|
|
- ->between('p.update_time', $update_time_begin_time, $corret_update_end_time)
|
|
|
+ ->between('p.create_time', $create_time_begin_time, $create_time_end_time)
|
|
|
+ ->between('p.update_time', $update_time_begin_time, $update_time_end_time)
|
|
|
->between('p.pre_dev_time', $min_dev_time_days, $max_dev_time_days)
|
|
|
->between('p.pre_maintain_time', $min_maintain_time_days, $max_maintain_time_days)
|
|
|
->between('p.estimated_amount', $min_amount, $max_amount)
|
