4

@@ -45,11 +45,12 @@ class SalesmanorderController extends AdminBaseController{
         }
         }
         $money = 0;
         $money = 0;
         foreach($data_arr['data'] as $key => $val){
         foreach($data_arr['data'] as $key => $val){
+            $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
+        }
+        foreach ($data_arr['data'] as $key => $val){
             if($val['state'] == 2 || $val['state'] == 3 || $val['state'] == 5){
             if($val['state'] == 2 || $val['state'] == 3 || $val['state'] == 5){
-                $data_arr['data'][$key]['grade_class'] = $val['school'].'-'.$val['grade'].$val['class'];
                 $money += $data_arr['data'][$key]['money'];
                 $money += $data_arr['data'][$key]['money'];
             }
             }
-
         }
         }
         $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
         $data_school = Db::name('indent') -> group('school') -> where('indent_type',2) -> select() -> toArray();
         foreach($data_school as $key => $val){
         foreach($data_school as $key => $val){