|
@@ -1270,9 +1270,9 @@ class BasicPanel extends Controller
|
|
|
* @date 2026-03-23
|
|
* @date 2026-03-23
|
|
|
*
|
|
*
|
|
|
*/
|
|
*/
|
|
|
- public function get_violation_store_city_count(request $request, ViolationStoreModel $ViolationStoreModel)
|
|
|
|
|
|
|
+ public function get_violation_store_province_proportion(request $request, ViolationStoreModel $ViolationStoreModel)
|
|
|
{
|
|
{
|
|
|
- $request->scene('get_violation_store_city_count')->validate();
|
|
|
|
|
|
|
+ $request->scene('get_violation_store_province_proportion')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
@@ -1348,7 +1348,7 @@ class BasicPanel extends Controller
|
|
|
*/
|
|
*/
|
|
|
public function get_violation_store_city_proportion(request $request, ViolationStoreModel $ViolationStoreModel)
|
|
public function get_violation_store_city_proportion(request $request, ViolationStoreModel $ViolationStoreModel)
|
|
|
{
|
|
{
|
|
|
- $request->scene('get_violation_company_city_proportion')->validate();
|
|
|
|
|
|
|
+ $request->scene('get_violation_store_city_proportion')->validate();
|
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
$admin_company_id = request('admin_company_id', '0');
|
|
|
$company_id = request('access_token.company_id', '0');
|
|
$company_id = request('access_token.company_id', '0');
|
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
$is_admin = request('access_token.is_admin', '0'); //是否管理员操作 0=是1=否
|
|
@@ -1372,6 +1372,7 @@ class BasicPanel extends Controller
|
|
|
} else {
|
|
} else {
|
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
$map[] = ['company_id', '=', $admin_company_id];
|
|
|
}
|
|
}
|
|
|
|
|
+
|
|
|
// 违规店铺省份统计
|
|
// 违规店铺省份统计
|
|
|
$ViolationStoreModel = $ViolationStoreModel->query();
|
|
$ViolationStoreModel = $ViolationStoreModel->query();
|
|
|
if ($terminal_type) {
|
|
if ($terminal_type) {
|