|
@@ 127-133 (lines=7) @@
|
| 124 |
|
$conditions = $filter->getCondition(); |
| 125 |
|
$values = $conditions[$filter->getColumn()]; |
| 126 |
|
|
| 127 |
|
if ($value_from = $values['from']) { |
| 128 |
|
$date_from = DateTimeHelper::tryConvertToDateTime($value_from, [$filter->getPhpFormat()]); |
| 129 |
|
$date_from->setTime(0, 0, 0); |
| 130 |
|
|
| 131 |
|
$expr = Criteria::expr()->gte($filter->getColumn(), $date_from->format('Y-m-d H:i:s')); |
| 132 |
|
$this->criteria->andWhere($expr); |
| 133 |
|
} |
| 134 |
|
|
| 135 |
|
if ($value_to = $values['to']) { |
| 136 |
|
$date_to = DateTimeHelper::tryConvertToDateTime($value_to, [$filter->getPhpFormat()]); |
|
@@ 135-141 (lines=7) @@
|
| 132 |
|
$this->criteria->andWhere($expr); |
| 133 |
|
} |
| 134 |
|
|
| 135 |
|
if ($value_to = $values['to']) { |
| 136 |
|
$date_to = DateTimeHelper::tryConvertToDateTime($value_to, [$filter->getPhpFormat()]); |
| 137 |
|
$date_to->setTime(23, 59, 59); |
| 138 |
|
|
| 139 |
|
$expr = Criteria::expr()->lte($filter->getColumn(), $date_to->format('Y-m-d H:i:s')); |
| 140 |
|
$this->criteria->andWhere($expr); |
| 141 |
|
} |
| 142 |
|
} |
| 143 |
|
|
| 144 |
|
|