Browse Source

仓储煤仓

任敬轩 11 hours ago
parent
commit
a18cf1c20d
2 changed files with 52 additions and 3 deletions
  1. 51 2
      Modules/Admin/Http/Controllers/Api/ApiController.php
  2. 1 1
      Modules/Admin/Routes/api.php

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

@@ -1812,8 +1812,57 @@ class ApiController extends BaseController
             return self::errorResponse(ApiEnum::STATUS_CODE_EMPTY);
         }
 
-        $data = DB::connection('mysql_fwe10')->table('uf_gggs_ccmc')->get();
-        dd($data);
+        $mcmc_zd = ['1号仓储煤仓','2号仓储煤仓','3号仓储煤仓','4号仓储煤仓','5号仓储煤仓','6号仓储煤仓'];
+
+        $pm1 = DB::connection('mysql_fwe10')
+            ->table('uf_gggs_ccmc as main')
+            ->select('main.id','main.ssdw', 'main.mcmc', 'main.lrsj', 'main.is_delete', 'main.create_time')
+            ->whereDate('main.lrsj', $date)
+            ->where('main.ssdw', 0)
+            ->where('main.is_delete', 0)
+            ->whereIn('main.create_time', function ($query) use ($date) {
+                $query->select(DB::raw('MAX(create_time)'))
+                    ->from('uf_gggs_ccmc')
+                    ->whereDate('lrsj', $date)
+                    ->where('ssdw', 0)
+                    ->where('is_delete', 0)
+                    ->groupBy('mcmc');
+            })
+            ->orderBy('main.mcmc')->get();
+
+        $result['list1'] = [];
+        if(count($pm1) > 0){
+            for($i=0;$i<count($pm1);$i++){
+                $result['list1'][$i]['title'] = $mcmc_zd[$pm1[$i]->mcmc];
+                $result['list1'][$i]['data'] = DB::connection('mysql_fwe10')->table('uf_gggs_cc_mx')->select('mz','ml','jd','hf','lf','zdts')->where('form_data_id',$pm1[$i]->id)->where('is_delete',0)->get()->toArray();
+            }
+        }
+
+        $pm2 = DB::connection('mysql_fwe10')
+            ->table('uf_gggs_ccmc as main')
+            ->select('main.id','main.ssdw', 'main.mcmc', 'main.lrsj', 'main.is_delete', 'main.create_time')
+            ->whereDate('main.lrsj', $date)
+            ->where('main.ssdw', 1)
+            ->where('main.is_delete', 0)
+            ->whereIn('main.create_time', function ($query) use ($date) {
+                $query->select(DB::raw('MAX(create_time)'))
+                    ->from('uf_gggs_ccmc')
+                    ->whereDate('lrsj', $date)
+                    ->where('ssdw', 0)
+                    ->where('is_delete', 0)
+                    ->groupBy('mcmc');
+            })
+            ->orderBy('main.mcmc')->get();
+
+        $result['list2'] = [];
+        if(count($pm2) > 0){
+            for($i=0;$i<count($pm2);$i++){
+                $result['list2'][$i]['title'] = $mcmc_zd[$pm2[$i]->mcmc];
+                $result['list2'][$i]['data'] = DB::connection('mysql_fwe10')->table('uf_gggs_cc_mx')->select('mz','ml','jd','hf','lf','zdts')->where('form_data_id',$pm2[$i]->id)->where('is_delete',0)->get()->toArray();
+            }
+        }
+
+        return $result;
     }
 
     //公管公司总表火车进煤情况

+ 1 - 1
Modules/Admin/Routes/api.php

@@ -126,6 +126,6 @@ Route::namespace('Api')->group(function () {
     //公管公司-风险作业报表
     Route::post('gggs/work_list','ReportController@workList');
     //公管公司仓储煤仓
-    Route::post('gggs/coal_bunker','ReportController@coalBunker');
+    Route::post('gggs/coal_bunker','ApiController@coalBunker');
 
 });