公管公司总表接口

Modules/Admin/Http/Controllers/Api/ApiController.php

@@ -1828,7 +1828,7 @@ class ApiController extends BaseController
         $result['pm1_sj_mmmx'] = '/';//配煤一实际末煤明细
         $result['pm1_sj_xhmmx'] = '/';//配煤一实际洗混煤明细
         $result['pm1_sj_jmmx'] = '/';//配煤一实际精煤明细
-        $result['pm1_sj_ls'] = '/';//配煤一计划列数
+        $result['pm1_sj_ls'] = '/';//配煤一实际列数
         $result['pm1_xhc'] = '/';//配煤一卸火车情况
         $result['pm2_sj_mmls'] = '/';//配煤二实际末煤列数
         $result['pm2_sj_xhmls'] = '/';//配煤二实际洗混煤列数
@@ -1930,7 +1930,7 @@ class ApiController extends BaseController
             $result['pm1_sj_xhmmx'] = $sj1->xhmmx;//配煤一实际洗混煤明细
             $result['pm1_sj_jmmx'] = $sj1->jmmx;//配煤一实际精煤明细
 
-            $result['pm1_sj_ls'] = $sj1->mmls + $sj1->xhmls + $sj1->jmls;//配煤一计划列数
+            $result['pm1_sj_ls'] = $sj1->mmls + $sj1->xhmls + $sj1->jmls;//配煤一实际列数
             $result['pm1_xhc'] = $sj1->xhcqk;//配煤一卸火车情况
             $bz1 = trim($sj1->bz ?? '');
         }
@@ -1957,9 +1957,9 @@ class ApiController extends BaseController
         $result['sj_hj'] = $result['pm1_sj_ls'] + $result['pm2_sj_ls'];//实际合计
 
         if (empty($bz1) && empty($bz2)) {
-            $result['bz'] = '无';
+            $result['bz'] = '备注:无';
         } else {
-            $result['bz'] = implode(';', array_filter([$bz1, $bz2]));
+            $result['bz'] = '备注:'.implode(';', array_filter([$bz1, $bz2]));
         }
 
         foreach ($result as $key => &$value) {