|
@@ -34,6 +34,7 @@ class ViolationStore extends Controller
|
|
|
$store_name = request('store_name', '');
|
|
$store_name = request('store_name', '');
|
|
|
$company_name = request('company_name', '');
|
|
$company_name = request('company_name', '');
|
|
|
$social_credit_code = request('social_credit_code', '');
|
|
$social_credit_code = request('social_credit_code', '');
|
|
|
|
|
+ $store_type = request('store_type', '');
|
|
|
// 时间条件
|
|
// 时间条件
|
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
if ($start_time) $map[] = ['insert_time', '>=', strtotime($start_time)];
|
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
if ($end_time) $map[] = ['insert_time', '<=', strtotime($end_time)];
|
|
@@ -42,6 +43,7 @@ class ViolationStore extends Controller
|
|
|
if ($social_credit_code) $map[] = ['social_credit_code', 'like', "%$social_credit_code%"];
|
|
if ($social_credit_code) $map[] = ['social_credit_code', 'like', "%$social_credit_code%"];
|
|
|
if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
|
|
if ($company_name) $map[] = ['company_name', 'like', "%$company_name%"];
|
|
|
if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
|
|
if ($store_name) $map[] = ['store_name', 'like', "%$store_name%"];
|
|
|
|
|
+ if ($store_type) $map[] = ['store_type', '=', $store_type];
|
|
|
// 查询数据
|
|
// 查询数据
|
|
|
$result = $ViolationStoreModel->query()
|
|
$result = $ViolationStoreModel->query()
|
|
|
->where($map)
|
|
->where($map)
|