周海龙 / globalso · 提交

转到一个项目

作者 刘锟
提交 123348801c0af7c944bc7642b6da82d102a162e2 1 个父辈 13d0ef92

update

内嵌 并排对比
正在显示 1 个修改的文件 包含 3 行增加 和 3 行删除
@@ -32,14 +32,14 @@ class InquiryForwardController extends BaseController @@ -32,14 +32,14 @@ class InquiryForwardController extends BaseController
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'])) { 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']]]; 35 + $this->map['inquiry_date'] = ['between', [$this->map['start_date'] . ' 00:00:00', $this->map['end_date'] . ' 23:59:59']];
36 unset($this->map['start_date']); 36 unset($this->map['start_date']);
37 unset($this->map['end_date']); 37 unset($this->map['end_date']);
38 } elseif (isset($this->param['start_date'])) { 38 } elseif (isset($this->param['start_date'])) {
39 - $this->map['inquiry_date'] = ['>=', $this->map['start_date']]; 39 + $this->map['inquiry_date'] = ['>=', $this->map['start_date'] . ' 00:00:00'];
40 unset($this->map['start_date']); 40 unset($this->map['start_date']);
41 } elseif (isset($this->param['end_date'])) { 41 } elseif (isset($this->param['end_date'])) {
42 - $this->map['inquiry_date'] = ['<=', $this->map['end_date']]; 42 + $this->map['inquiry_date'] = ['<=', $this->map['end_date'] . ' 23:59:59'];
43 unset($this->map['end_date']); 43 unset($this->map['end_date']);
44 } 44 }
45 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order); 45 $lists = $inquiryForwardLogic->getInquiryLists($this->map, $this->page, $this->row, $this->order);