优化

application/api/controller/WorkOrderVerification.php

@@ -82,7 +82,7 @@ class WorkOrderVerification extends Api
 
         // 查询每天的上报数量，并关联生产总数和整单总数
         $rows = db()->table('设备_产量计酬')->alias('c')
-            ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号', 'left')
+            ->join('工单_基本资料 j', 'c.订单编号 = j.订单编号 AND j.Mod_rq IS NULL', 'left')
             ->field('
                     c.订单编号, j.款式, j.生产款号, j.客户编号, 
                     c.sczl_jtbh, c.工序名称 as 工序, c.sczl_bh,
@@ -96,7 +96,6 @@ class WorkOrderVerification extends Api
             ->whereNull('c.mod_rq')
             ->order('c.sczl_rq desc')
             ->select();
-
         // 初始化
         $result = [];
         // 处理当前月份的数据
@@ -154,23 +153,23 @@ class WorkOrderVerification extends Api
             }
         }
 
-        // 排序
-        usort($result, function ($a, $b) {
-            // 先按客户编号排序
-            $clientComparison = strcmp($a['客户编号'], $b['客户编号']);
-            if ($clientComparison !== 0) {
-                return $clientComparison;
-            }
+// 排序
+usort($result, function ($a, $b) {
+    // 先按订单编号排序
+    $orderComparison = strcmp($a['订单编号'], $b['订单编号']);
+    if ($orderComparison !== 0) {
+        return $orderComparison;
+    }
 
-            // 再按组别排序
-            $groupComparison = strcmp($a['组别'], $b['组别']);
-            if ($groupComparison !== 0) {
-                return $groupComparison;
-            }
+    // 再按组别排序
+    $groupComparison = strcmp($a['组别'], $b['组别']);
+    if ($groupComparison !== 0) {
+        return $groupComparison;
+    }
 
-            // 最后按订单编号排序
-            return strcmp($a['订单编号'], $b['订单编号']);
-        });
+    // 最后按客户编号排序
+    return strcmp($a['客户编号'], $b['客户编号']);
+});
         $result = array_values($result);
 
         $this->success('成功', $result);