周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 ca8afd7a7773f3b3bd6641731e5b0f5ae6b04f9c 1 个父辈 21b41dbb

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 10 行增加 和 7 行删除
@@ -31,13 +31,16 @@ class InquiryForwardController extends BaseController @@ -31,13 +31,16 @@ 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_time'])) {  
35 - $this->map['inquiry_date'] = ['>=', $this->map['start_time']];  
36 - unset($this->map['start_time']);  
37 - }  
38 - if (isset($this->param['end_time'])) {  
39 - $this->map['inquiry_date'] = ['<=', $this->map['end_time']];  
40 - unset($this->map['end_time']); 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']);
41 } 44 }
42 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order); 45 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);
43 $this->response('success', Code::SUCCESS, $lists); 46 $this->response('success', Code::SUCCESS, $lists);