|
|
@@ -1830,14 +1830,38 @@ class ApiController extends BaseController
|
|
|
})
|
|
|
->orderBy('main.mcmc')->get();
|
|
|
|
|
|
+ $total1 = [];
|
|
|
+ $temp1 = [];
|
|
|
+
|
|
|
$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();
|
|
|
+ if(count($result['list1'][$i]['data']) > 0){
|
|
|
+ $data = $result['list1'][$i]['data'];
|
|
|
+ for($j=0;$j<count($data);$j++){
|
|
|
+ $mz = $data[$j]->mz;
|
|
|
+ $ml = $data[$j]->ml;
|
|
|
+ if (isset($temp1[$mz])) {
|
|
|
+ $temp1[$mz] += $ml;
|
|
|
+ } else {
|
|
|
+ $temp1[$mz] = $ml;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ foreach ($temp1 as $key => $value) {
|
|
|
+ $total1[] = [
|
|
|
+ 'mz' => $key, // 煤种
|
|
|
+ 'ml' => $value // 总煤量
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
+ $result['total1'] = $total1;
|
|
|
+
|
|
|
$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')
|
|
|
@@ -1854,14 +1878,38 @@ class ApiController extends BaseController
|
|
|
})
|
|
|
->orderBy('main.mcmc')->get();
|
|
|
|
|
|
+ $total2 = [];
|
|
|
+ $temp2 = [];
|
|
|
+
|
|
|
$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();
|
|
|
+ if(count($result['list2'][$i]['data']) > 0){
|
|
|
+ $data = $result['list2'][$i]['data'];
|
|
|
+ for($j=0;$j<count($data);$j++){
|
|
|
+ $mz = $data[$j]->mz;
|
|
|
+ $ml = $data[$j]->ml;
|
|
|
+ if (isset($temp2[$mz])) {
|
|
|
+ $temp2[$mz] += $ml;
|
|
|
+ } else {
|
|
|
+ $temp2[$mz] = $ml;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ foreach ($temp2 as $key => $value) {
|
|
|
+ $total2[] = [
|
|
|
+ 'mz' => $key, // 煤种
|
|
|
+ 'ml' => $value // 总煤量
|
|
|
+ ];
|
|
|
+ }
|
|
|
+
|
|
|
+ $result['total2'] = $total2;
|
|
|
+
|
|
|
return $result;
|
|
|
}
|
|
|
|