jqh 6 years ago
parent
commit
ecb3966a27

+ 2 - 2
src/Grid/Column/Filter/Between.php

@@ -76,11 +76,11 @@ class Between extends Filter
         }
 
         if (!isset($value['start'])) {
-            return $model->where($this->getColumnName(), '<', $value['end']);
+            return $model->where($this->getColumnName(), '<=', $value['end']);
         }
 
         if (!isset($value['end'])) {
-            return $model->where($this->getColumnName(), '>', $value['start']);
+            return $model->where($this->getColumnName(), '=>', $value['start']);
         }
 
         return $model->whereBetween($this->getColumnName(), array_values($value));

+ 25 - 0
src/Grid/Column/Filter/Gt.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Dcat\Admin\Grid\Column\Filter;
+
+use Dcat\Admin\Grid\Model;
+
+class Gt extends Equal
+{
+    /**
+     * Add a binding to the query.
+     *
+     * @param string     $value
+     * @param Model|null $model
+     */
+    public function addBinding($value, Model $model)
+    {
+        $value = trim($value);
+        if (empty($value)) {
+            return;
+        }
+
+        $model->where($this->getColumnName(), '>', $value);
+    }
+
+}

+ 25 - 0
src/Grid/Column/Filter/Lt.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Dcat\Admin\Grid\Column\Filter;
+
+use Dcat\Admin\Grid\Model;
+
+class Lt extends Equal
+{
+    /**
+     * Add a binding to the query.
+     *
+     * @param string     $value
+     * @param Model|null $model
+     */
+    public function addBinding($value, Model $model)
+    {
+        $value = trim($value);
+        if (empty($value)) {
+            return;
+        }
+
+        $model->where($this->getColumnName(), '<', $value);
+    }
+
+}

+ 25 - 0
src/Grid/Column/Filter/Ngt.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Dcat\Admin\Grid\Column\Filter;
+
+use Dcat\Admin\Grid\Model;
+
+class Ngt extends Equal
+{
+    /**
+     * Add a binding to the query.
+     *
+     * @param string     $value
+     * @param Model|null $model
+     */
+    public function addBinding($value, Model $model)
+    {
+        $value = trim($value);
+        if (empty($value)) {
+            return;
+        }
+
+        $model->where($this->getColumnName(), '<=', $value);
+    }
+
+}

+ 25 - 0
src/Grid/Column/Filter/Nlt.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Dcat\Admin\Grid\Column\Filter;
+
+use Dcat\Admin\Grid\Model;
+
+class Nlt extends Equal
+{
+    /**
+     * Add a binding to the query.
+     *
+     * @param string     $value
+     * @param Model|null $model
+     */
+    public function addBinding($value, Model $model)
+    {
+        $value = trim($value);
+        if (empty($value)) {
+            return;
+        }
+
+        $model->where($this->getColumnName(), '>=', $value);
+    }
+
+}