大废品金额显示

application/api/controller/LargeWasteRewardPunish.php

@@ -105,7 +105,7 @@ class LargeWasteRewardPunish extends Api
         ->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno, 
         rtrim(责任部门) as 责任部门, CAST(sczl_cl AS SIGNED) as sczl_cl, 
         rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, Jl_bzdh, JL_bh1, 
-        sczl_bzdh, sczl_bh1, sczl_bh2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
+        sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
         ->where('sczl_gdbh',$req['date'])
         ->order('UniqId desc')
         ->page($page,$limit)
@@ -118,7 +118,7 @@ class LargeWasteRewardPunish extends Api
             ->field('sczl_gdbh, LEFT(sczl_rq, 10) as sczl_rq, rtrim(sczl_numDesc) as sczl_numDesc, sczl_ls, sczl_yjno, 
             rtrim(责任部门) as 责任部门, CAST(sczl_cl AS SIGNED) as sczl_cl, 
             rtrim(sczl_fplxA) as sczl_fplxA, sczl_fplxB, Jl_bzdh, JL_bh1, 
-            sczl_bzdh, sczl_bh1, sczl_bh2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
+            sczl_bzdh, sczl_bh1, sczl_je1, sczl_bh2, sczl_je2, rtrim(sys_id) as sys_id, sys_rq, UniqId')
             ->where($where)
             ->order('UniqId desc')
             ->page($page,$limit)
@@ -133,6 +133,12 @@ class LargeWasteRewardPunish extends Api
             $rows[$key]['sczl_bh1'] = array_key_exists($value['sczl_bh1'],$rs) ? trim($rs[$value['sczl_bh1']]) : '';
             $rows[$key]['sczl_bh2'] = array_key_exists($value['sczl_bh2'],$rs) ? trim($rs[$value['sczl_bh2']]) : '';
             $rows[$key]['sczl_fplxB'] = $value['sczl_fplxB'] == 1 ? '制程废' : '';
+            if ($value['sczl_je1'] > 0){
+                $rows[$key]['sczl_bh1'] = $rows[$key]['sczl_bh1'].'('.$value['sczl_je1'].')';
+            }
+            if ($value['sczl_je2'] > 0){
+                $rows[$key]['sczl_bh2'] = $rows[$key]['sczl_bh2'].'('.$value['sczl_je2'].')';
+            }
             unset($rows[$key]['sczl_yjno']);
         }