Explorar el Código

全流程巡检

任敬轩 hace 1 mes
padre
commit
96c5add2f0

+ 2 - 1
Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -87,7 +87,8 @@ class ApiController extends BaseController
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
 
-        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'))->pluck('xjdw')->toArray();
+//        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'))->pluck('xjdw')->toArray();
+        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where('lrsj', '>=', DB::raw("DATE_SUB(NOW(), INTERVAL 6 MONTH)"))->pluck('xjdw')->toArray();
         $counts = array_count_values($data);// 1. 统计每个值的出现次数
         arsort($counts);// 2. 按出现次数降序排序
         $depart = array_keys($counts);// 3. 只保留键(去重),并按频率排序

+ 2 - 1
Modules/Admin/Services/ApiService.php

@@ -273,7 +273,8 @@ class ApiService{
         $area_list = array_unique($area_list);
         $area_list = array_values($area_list);
 
-        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'))->pluck('xjdw')->toArray();
+//        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where(DB::raw('QUARTER(lrsj)'), DB::raw('QUARTER(CURDATE())'))->pluck('xjdw')->toArray();
+        $data = DB::connection('mysql_fwe10')->table('uf_zhxx_qlcxjjl')->where('lrsj', '>=', DB::raw("DATE_SUB(NOW(), INTERVAL 6 MONTH)"))->pluck('xjdw')->toArray();
         $counts = array_count_values($data);// 1. 统计每个值的出现次数
         arsort($counts);// 2. 按出现次数降序排序
         $area_list = array_keys($counts);// 3. 只保留键(去重),并按频率排序