qiuenguang 1 год назад
Родитель
Сommit
fb3adb1c18
1 измененных файлов с 5 добавлено и 6 удалено
  1. 5 6
      application/api/controller/OrderSuperLoss.php

+ 5 - 6
application/api/controller/OrderSuperLoss.php

@@ -1456,34 +1456,33 @@ class OrderSuperLoss extends Api
         //按人分配超节损数据
         foreach ($datanumber as $key => $value){
             foreach ($value as $n=>$m){
+                $gdbh = [];
                 foreach ($m as $k=>$v){
                     if (strpos($v['sczl_gxmc'],'拆片') === false){
-                        $gdbh = '';
                         for ($i = 1;$i <=10;$i++){
                             $bh = $v['sczl_bh'.$i];
                             $rate = $v['sczl_rate'.$i];
                             $name = explode(' ',$v['member']);
-                            $gdbh = $v['Gy0_gdbh'].','.$gdbh;
                             if ($bh !== ''){
+                                array_push($gdbh,$v['Gy0_gdbh'].'('.$v['Gy0_yjno'].'-'.$v['Gy0_gxh'].')');
                                 $name_key = $bh.'('.$name[$i-1].')';
                                 if (!array_key_exists($name_key,$res[$key][$n])){
                                     $res[$key][$n][$name_key]['money'] = 0;
                                 }
                                 $res[$key][$n][$name_key]['money'] = floatval($res[$key][$n][$name_key]) + floatval($v['节损奖'])*floatval($rate);
                                 $res[$key][$n][$name_key]['money'] = number_format($res[$key][$n][$name_key]['money'],2);
-                                $res[$key][$n][$name_key]['gdbh'] = $gdbh;
+                                $res[$key][$n][$name_key]['gdbh'] = implode(',',array_unique($gdbh));
                             }
                         }
                     }else{
-                        $gdbh = '';
-                        $gdbh = $v['Gy0_gdbh'].','.$gdbh;
+                        array_push($gdbh,$v['Gy0_gdbh'].'('.$v['Gy0_yjno'].'-'.$v['Gy0_gxh'].')');
                         $name_key = $v['sczl_bh1'].'('.$v['member'].')';
                         if (!array_key_exists($name_key,$res[$key][$n])){
                             $res[$key][$n][$name_key]['money'] = 0;
                         }
                         $res[$key][$n][$name_key]['money'] = $res[$key][$n][$name_key]['money'] + $v['节损奖'];
                         $res[$key][$n][$name_key]['money'] = number_format($res[$key][$n][$name_key]['money'],2);
-                        $res[$key][$n][$name_key]['gdbh'] = $gdbh;
+                        $res[$key][$n][$name_key]['gdbh'] = implode(',',array_unique($gdbh));
                     }
                 }
             }