设备透视表优化

application/api/controller/Decision.php

@@ -702,6 +702,7 @@ class Decision extends Api
             ->join('工单_工艺资料 b', 'a.Gy0_gdbh = b.Gy0_gdbh AND a.印件及工序 = b.Gy0_yjno AND a.工序 = b.Gy0_gxh')
             ->join('成品入仓 c', 'a.Gy0_gdbh = c.jjcp_gdbh AND a.印件及工序 = c.jjcp_yjno')
             ->join('设备_基本资料 d', 'a.sczl_jtbh = d.设备编号')
+            ->where('d.设备编组', '01、切纸机组')
             ->where('a.sys_ny', 'like', $param['year'] . '%')
             ->where('a.工序名称', 'not like', '%机检%')
             ->where('c.jjcp_smb', 'like', '末%')
@@ -728,13 +729,12 @@ class Decision extends Api
                 'core' => $coreName
             ];
         }
-
         // 处理分类标记
         $processedList = [];
         foreach ($rawList as $item) {
             foreach ($groupMap as $group) {
                 // 使用核心词进行模糊匹配
-                if (strpos($item['Gy0_gxmc'], $group['core']) !== false) {
+                if (strpos($item['设备编组'], $group['core']) !== false) {
                     $item['type_id'] = $group['id'];
                     $item['type_name'] = $group['name'];
                     $processedList[] = $item;
@@ -742,7 +742,6 @@ class Decision extends Api
                 }
             }
         }
-
         // 按分类ID排序
         usort($processedList, function($a, $b) {
             return $a['type_id'] <=> $b['type_id'];