合并分支 'akun' 到 'master'

Akun



查看合并请求 !1348

@@ -31,6 +31,17 @@ class InquiryForwardController extends BaseController
         if (isset($this->param['message'])) {
             $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
         }
+        if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
+            $this->map['inquiry_date'] = ['between', [$this->map['start_date'], $this->map['end_date']]];
+            unset($this->map['start_date']);
+            unset($this->map['end_date']);
+        } elseif (isset($this->param['start_date'])) {
+            $this->map['inquiry_date'] = ['>=', $this->map['start_date']];
+            unset($this->map['start_date']);
+        } elseif (isset($this->param['end_date'])) {
+            $this->map['inquiry_date'] = ['<=', $this->map['end_date']];
+            unset($this->map['end_date']);
+        }
         $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);
         $this->response('success', Code::SUCCESS, $lists);
     }