周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 d14052c5b98a49386dd670c7f4f2a2da9976f046 2 个父辈 e1ee5858 ca8afd7a

合并分支 'akun' 到 'master' 

Akun



查看合并请求 !1348
内嵌 并排对比
正在显示 1 个修改的文件 包含 11 行增加 和 0 行删除
@@ -31,6 +31,17 @@ class InquiryForwardController extends BaseController @@ -31,6 +31,17 @@ class InquiryForwardController extends BaseController
31 if (isset($this->param['message'])) { 31 if (isset($this->param['message'])) {
32 $this->map['message'] = ['like', '%' . $this->map['message'] . '%']; 32 $this->map['message'] = ['like', '%' . $this->map['message'] . '%'];
33 } 33 }
  34 + if (isset($this->param['start_date']) && isset($this->param['end_date'])) {
  35 + $this->map['inquiry_date'] = ['between', [$this->map['start_date'], $this->map['end_date']]];
  36 + unset($this->map['start_date']);
  37 + unset($this->map['end_date']);
  38 + } elseif (isset($this->param['start_date'])) {
  39 + $this->map['inquiry_date'] = ['>=', $this->map['start_date']];
  40 + unset($this->map['start_date']);
  41 + } elseif (isset($this->param['end_date'])) {
  42 + $this->map['inquiry_date'] = ['<=', $this->map['end_date']];
  43 + unset($this->map['end_date']);
  44 + }
34 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order); 45 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);
35 $this->response('success', Code::SUCCESS, $lists); 46 $this->response('success', Code::SUCCESS, $lists);
36 } 47 }