From acb9cd837f6b1ff14f9c9b6855a39fc399cfe778 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=AE=8F=E6=96=8C?= <2164406372@qq.com>
Date: Mon, 24 Nov 2025 14:24:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=B8=E5=BF=83=E5=A4=87?=
 =?UTF-8?q?=E4=BB=B6=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pms/data/ExportCoreComponentsData.java    |  9 ++++
 src/main/resources/mapper/pms/EamMapper.xml   | 41 +++++++++++--------
 2 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/xujie/sys/modules/pms/data/ExportCoreComponentsData.java b/src/main/java/com/xujie/sys/modules/pms/data/ExportCoreComponentsData.java
index 62f868f0..d759f7b0 100644
--- a/src/main/java/com/xujie/sys/modules/pms/data/ExportCoreComponentsData.java
+++ b/src/main/java/com/xujie/sys/modules/pms/data/ExportCoreComponentsData.java
@@ -23,4 +23,13 @@ public class ExportCoreComponentsData {
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
     private String createdDate;
+
+    @ExcelProperty("维修人员")
+    private String createdBy;
+
+    @ExcelProperty("故障信息")
+    private String faultReason;
+
+    @ExcelProperty("机台")
+    private String resourceDesc;
 }
diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml
index d02ed0bc..03b9b4eb 100644
--- a/src/main/resources/mapper/pms/EamMapper.xml
+++ b/src/main/resources/mapper/pms/EamMapper.xml
@@ -4030,25 +4030,30 @@
     </select>
     <select id="getAllCoreComponents" resultType="com.xujie.sys.modules.pms.data.ExportCoreComponentsData">
         SELECT
-            rs.id,
-            rs.site,
-            rs.bu_no,
-            rs.resource_id,
-            rs.part_no,
-            ps.part_description,
-            rs.qty_usable,
-            rs.delflag,
-            rs.version,
-            ps.spec,
-            ps.umid,
-            ps.remark,
-            ewc.oldSerialNo,
-            ewc.newSerialNo,
-            ewc.created_date
-        FROM eam_workOrder_coreComponents ewc,resource_spare rs
-        LEFT JOIN part_spare ps ON rs.site = ps.site and rs.bu_no = ps.bu_no AND rs.part_no = ps.part_no
+        rs.id,
+        rs.site,
+        rs.bu_no,
+        rs.part_no,
+        ps.part_description,
+        rs.qty_usable,
+        rs.delflag,
+        rs.version,
+        ewc.oldSerialNo,
+        ewc.newSerialNo,
+        ewc.created_date,
+        ps.spec,
+        ps.umid,
+        ps.remark,
+        ewc.created_by,
+        d.fault_reason,
+        rs.resource_id,
+        dbo.eam_Get_eamResourceDesc(d.Site, d.ObjectID) as resourceDesc
+        FROM eam_workOrder_coreComponents ewc
+        LEFT JOIN resource_spare rs ON ewc.site = rs.site AND ewc.bu_no = rs.bu_no AND ewc.partNo = rs.part_no
+        LEFT JOIN part_spare ps ON ewc.site = ps.site AND ewc.bu_no = ps.bu_no AND ewc.partNo = ps.part_no
+        LEFT JOIN eam_workOrder d ON ewc.site = d.Site AND ewc.bu_no = d.bu_no AND ewc.OrderNo = d.OrderNo
         <where>
-            rs.site = #{site} and rs.bu_no = #{buNo} and rs.site = ewc.site and rs.bu_no = ewc.bu_no and rs.part_no = ewc.partNo and ps.coreFlag = 'Y'
+            ewc.site = #{site} and ewc.bu_no = #{buNo} and ps.coreFlag = 'Y'
             <if test="startDate != null ">
                 AND ewc.created_date >= #{startDate}
             </if>