任敬轩 před 1 měsícem
rodič
revize
e4861ee990

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

@@ -1676,7 +1676,6 @@ class ApiController extends BaseController
     public function dutyChange(){
         $result['status'] = true;
         $result['msg']    = ApiEnum::RETURN_SUCCESS;
-        $result['data'] = [];
 
         $id = Input::get('id', '');
 
@@ -1684,7 +1683,20 @@ class ApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        $apply_record = DB::connection('mysql_fwe10')->table('uf_gggs_hbsq')->where('id',$id)->get();
+        $apply_record = DB::connection('mysql_fwe10')->table('uf_gggs_hbsq')->where('id',$id)->first();
+        dd($apply_record);
+        if($apply_record){
+            $dw = $apply_record->ssdw;
+            if($dw == '主值班'){
+                DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$apply_record->hbrq)->where('zzb',$apply_record->sqr)->update(['zzb'=>$apply_record->bhbr]);
+                DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$apply_record->rq)->where('zzb',$apply_record->bhbr)->update(['zzb'=>$apply_record->sqr]);
+            }
+            if($dw == '副值班'){
+                DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$apply_record->hbrq)->where('fzb1',$apply_record->sqr)->update(['zzb'=>$apply_record->bhbr]);
+                // DB::connection('mysql_fwe10')->table('uf_gggs_zbgl')->where('riqi',$apply_record->rq)->where('zzb',$apply_record->bhbr)->update(['zzb'=>$apply_record->sqr]);
+            }
+            dd($dw);
+        }
 
         return self::successResponse($result);
     }

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

@@ -161,7 +161,8 @@ class ApiService{
 //        $depart = array_unique($depart);
 //        $depart = array_values($depart);
 
-        $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. 只保留键(去重),并按频率排序