diff --git a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java b/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java index 600563b6..819a95f9 100644 --- a/src/main/java/com/xujie/sys/modules/pms/controller/EamController.java +++ b/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 list = eamService.getAllCoreComponents(data); + // 写入Excel + EasyExcel.write(response.getOutputStream(), ExportCoreComponentsData.class) + .sheet("核心备件更换记录") + .doWrite(list); + } + /** * @Description eamFamilySearch * @Title eamAdminSearch 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 new file mode 100644 index 00000000..62f868f0 --- /dev/null +++ b/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; +} diff --git a/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java b/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java index 045f57e8..0d9f3ebc 100644 --- a/src/main/java/com/xujie/sys/modules/pms/entity/EamWorkOrderCoreComponentsData.java +++ b/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; + } diff --git a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java b/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java index f88280a1..eb9070fb 100644 --- a/src/main/java/com/xujie/sys/modules/pms/mapper/EamMapper.java +++ b/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 getAllCoreComponents(EamWorkOrderCoreComponentsData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java b/src/main/java/com/xujie/sys/modules/pms/service/EamService.java index 54aa1b14..6c1294f3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/EamService.java +++ b/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 getAllCoreComponents(EamWorkOrderCoreComponentsData data); } diff --git a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java b/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java index e45b1a12..aae88fbc 100644 --- a/src/main/java/com/xujie/sys/modules/pms/service/Impl/EamServiceImpl.java +++ b/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 getAllCoreComponents(EamWorkOrderCoreComponentsData data) { + return eamMapper.getAllCoreComponents(data); + } + /** * 员工考勤vs报工工时 */ diff --git a/src/main/resources/mapper/pms/EamMapper.xml b/src/main/resources/mapper/pms/EamMapper.xml index a2ddead1..d02ed0bc 100644 --- a/src/main/resources/mapper/pms/EamMapper.xml +++ b/src/main/resources/mapper/pms/EamMapper.xml @@ -4028,4 +4028,33 @@ +