1.增加核心备件导出

src/main/java/com/xujie/sys/modules/pms/controller/EamController.java

@@ -80,6 +80,31 @@ public class EamController {
                 .doWrite(page.getList());
     }
 
+    /**
+     * @Description 核心备件更换记录导出excel
+     * @Title coreComponentsExpiortExcel
+     * @param data
+     * @author zhb
+     * @date 2025/11/14 14:11
+     * @return R
+     * @throw
+     */
+    @PostMapping(value="/coreComponentsExpiortExcel")
+    public void coreComponentsExpiortExcel (@RequestBody EamWorkOrderCoreComponentsData data, HttpServletResponse response) throws IOException {
+        // 设置响应头
+        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+        response.setCharacterEncoding("utf-8");
+        String fileName = URLEncoder.encode("核心备件更换记录", "UTF-8").replaceAll("\\+", "%20");
+        response.setHeader("Content-Disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
+
+        //获取数据
+        List<ExportCoreComponentsData> list  = eamService.getAllCoreComponents(data);
+        // 写入Excel
+        EasyExcel.write(response.getOutputStream(), ExportCoreComponentsData.class)
+                .sheet("核心备件更换记录")
+                .doWrite(list);
+    }
+
     /**
      * @Description eamFamilySearch
      * @Title eamAdminSearch

src/main/java/com/xujie/sys/modules/pms/data/ExportCoreComponentsData.java

@@ -0,0 +1,26 @@
+package com.xujie.sys.modules.pms.data;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Data
+public class ExportCoreComponentsData {
+    @ExcelProperty("备件编码")
+    private String partNo;
+
+    @ExcelProperty("备件名称")
+    private String partDescription;
+
+    @ExcelProperty("老序列号")
+    private String oldSerialNo;
+
+    @ExcelProperty("新序列号")
+    private String newSerialNo;
+
+    @ExcelProperty("更换时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private String createdDate;
+}

src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java

@@ -1,8 +1,12 @@
 package com.xujie.sys.modules.pms.entity;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import com.xujie.sys.modules.pms.data.EamWorkOrderCoreComponents;
 import lombok.Data;
 import org.apache.ibatis.type.Alias;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Alias("EamWorkOrderCoreComponentsData")
 @Data
@@ -11,4 +15,12 @@ public class EamWorkOrderCoreComponentsData extends EamWorkOrderCoreComponents {
 
     private String objectID;
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date startDate;
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+    private Date endDate;
+
 }

src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java

@@ -512,4 +512,6 @@ public interface EamMapper {
     void updateIsReturn2(EamWorkOrderInData inData);
 
     String queryItemNo(EamPropertiesItemData data);
+
+    List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/EamService.java

@@ -1210,4 +1210,6 @@ public interface EamService {
     void cancelDefectOrder(EamWorkOrderInData inData);
 
     void returnWorkOrder(EamWorkOrderInData data);
+
+    List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data);
 }

src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java

@@ -4007,6 +4007,11 @@ public class EamServiceImpl implements EamService {
         eamMapper.returnWorkOrder(data);
     }
 
+    @Override
+    public List<ExportCoreComponentsData> getAllCoreComponents(EamWorkOrderCoreComponentsData data) {
+        return eamMapper.getAllCoreComponents(data);
+    }
+
     /**
      * 员工考勤vs报工工时
      */

src/main/resources/mapper/pms/EamMapper.xml

@@ -4028,4 +4028,33 @@
     <select id="queryItemNo" resultType="java.lang.String">
         SELECT  DBO.get_next_code (#{site},#{buNo},#{itemNo},#{itemType})
     </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
+        <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'
+            <if test="startDate != null ">
+                AND ewc.created_date >= #{startDate}
+            </if>
+            <if test="endDate != null ">
+                AND #{endDate} >= CAST(ewc.created_date AS DATE)
+            </if>
+        </where>
+    </select>
 </mapper>