排序优化

application/api/controller/ReportingWork.php

@@ -129,13 +129,14 @@ class ReportingWork extends Api
         $data = db('工单_基础工艺资料')
             ->where('work_order', $params['workorder'])
             ->where('part_code', $params['part_code'])
-            ->where('big_process', '车缝')
-            ->where('del_rq', null)
+            ->whereNull('del_rq')
             ->where('status', 0)
             ->field('process_code as 工艺编号,process_name as 工艺名称,standard_hour as 标准工时,standard_minutes as 标准分钟,
             standard_score as 标准工分,coefficient as 系数,remark as 备注,money as 金额')
-            ->order('process_code')
             ->select();
+        usort($data, function ($a, $b) {
+            return strnatcmp((string)$a['工艺编号'], (string)$b['工艺编号']);
+        });
         $this->success('成功', $data);
     }
 
@@ -495,7 +496,7 @@ class ReportingWork extends Api
             ->field('work_order,majorprocess,part_code,process_code,process_name,staff_no,staff_name,
             standard_hour,standard_score,money,coefficient,number,production_hour,
             production_score,salary,machine,sys_id,sys_rq,id')
-            ->order('process_code asc,staff_no asc')
+            ->order('process_code asc,staff_no asc,sys_rq desc')
             ->select();
         $this->success('成功', $rows);
     }