|
@@ -440,7 +440,7 @@ class OrderSuperLoss extends Api
|
|
|
])
|
|
])
|
|
|
->group('b.sczl_gxh, b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
|
|
->group('b.sczl_gxh, b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
|
|
|
b.sczl_bh4, b.sczl_bh5, b.sczl_bh6, b.sczl_bh7, b.sczl_bh8, b.sczl_bh9')
|
|
b.sczl_bh4, b.sczl_bh5, b.sczl_bh6, b.sczl_bh7, b.sczl_bh8, b.sczl_bh9')
|
|
|
- ->order('a.Gy0_gxh asc, b.开工时间 asc, c.sczl_rq desc')
|
|
|
|
|
|
|
+ ->order('a.Gy0_gxh asc, b.开工时间 asc')
|
|
|
->select();
|
|
->select();
|
|
|
foreach ($gy_data as $key=>$value){
|
|
foreach ($gy_data as $key=>$value){
|
|
|
$gy_data[$key]['Gy0_yjno'] = $value['Gy0_yjno'] > 10 ? $value['Gy0_yjno'] : '0'.$value['Gy0_yjno'];
|
|
$gy_data[$key]['Gy0_yjno'] = $value['Gy0_yjno'] > 10 ? $value['Gy0_yjno'] : '0'.$value['Gy0_yjno'];
|
|
@@ -1216,7 +1216,7 @@ class OrderSuperLoss extends Api
|
|
|
])
|
|
])
|
|
|
->group('a.Gy0_gxh,b.sczl_jtbh,b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
|
|
->group('a.Gy0_gxh,b.sczl_jtbh,b.sczl_bh1, CASE WHEN b.sczl_bh2 = "000000" THEN "" ELSE b.sczl_bh2 END, b.sczl_bh3,
|
|
|
b.sczl_bh4, b.sczl_bh5, b.sczl_bh6, b.sczl_bh7, b.sczl_bh8, b.sczl_bh9')
|
|
b.sczl_bh4, b.sczl_bh5, b.sczl_bh6, b.sczl_bh7, b.sczl_bh8, b.sczl_bh9')
|
|
|
- ->order('a.Gy0_gxh asc, b.开工时间 asc, c.sczl_rq desc')
|
|
|
|
|
|
|
+ ->order('a.Gy0_gxh asc, b.开工时间 asc')
|
|
|
->select();
|
|
->select();
|
|
|
$gy_data = $this->appendMissingSuperLossProcessRows(
|
|
$gy_data = $this->appendMissingSuperLossProcessRows(
|
|
|
$gy_data,
|
|
$gy_data,
|
