|
...
|
...
|
@@ -105,6 +105,25 @@ class HomeEs extends Base { |
|
|
|
]];
|
|
|
|
}
|
|
|
|
|
|
|
|
// 时间 必须是数组
|
|
|
|
$udate = app()->request('udate');
|
|
|
|
if($udate && is_array($udate) && count($udate) == 2){
|
|
|
|
$udate = array_values($udate);
|
|
|
|
$udate = array_map(function ($v){
|
|
|
|
if(is_numeric($v)) return $v;
|
|
|
|
return strtotime($v);
|
|
|
|
},$udate);
|
|
|
|
// 时间范围搜索
|
|
|
|
$query['query']['bool']['must'][] = [
|
|
|
|
'range' => [
|
|
|
|
'udate' => [
|
|
|
|
'gte' => $udate[0], // 大于等于开始日期
|
|
|
|
'lte' => $udate[1] // 小于等于结束日期
|
|
|
|
]
|
|
|
|
]
|
|
|
|
];
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
if(in_array($attachment,[0,1])){ //附件
|
|
|
|
$query['query']['bool']['must'][] = ['term'=>[
|
...
|
...
|
|