Xu·LinPeng 3 giorni fa
parent
commit
e0d80eb2a0

+ 12 - 0
Modules/Camera/Http/Controllers/Api/CameraApiController.php

@@ -5012,6 +5012,18 @@ class CameraApiController extends BaseController
                 $gao = 0;
                 $zhong = 0;
                 $di = 0;
+                foreach ($coal_washery_risk_info_arr as  &$v) {
+                    $v->sort = $coal_washery_dict[$v->sgdd]->sort;
+
+                }
+                unset($v);
+
+                usort($coal_washery_risk_info_arr, function($a, $b) {
+                    if ($a->risk_level == $b->risk_level) {
+                        return $a->sort <=> $b->sort; // 风险类型相同,按作业的排序字段排序,升序
+                    }
+                    return $a->risk_level <=> $b->risk_level; // 否则按风险类型升序,高中低
+                });
 
                 foreach ($coal_washery_risk_info_arr as $k => $v) {
                     if(!in_array($v->wwdw,$wwdw)){