From 998de76819583d13196850d1af030f3ea12b6319 Mon Sep 17 00:00:00 2001 From: qiankanghui <11284155+qian-kanghui@user.noreply.gitee.com> Date: Thu, 5 Feb 2026 13:59:42 +0800 Subject: [PATCH] =?UTF-8?q?refactor(eam):=20=E9=87=8D=E6=9E=84=E8=AE=BE?= =?UTF-8?q?=E5=A4=87=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将方法名从 reportExchangeWorkOrderExport 重命名为 reportExchangeWorkOrderExcel - 修复类名大小写问题，将 reportExchangeWorkOrderExportData 改为 ReportExchangeWorkOrderExportData - 更新注释信息并补充作者和日期信息 - 注释掉暂时不需要的 reportWorkOrderExcel 方法 - 优化代码格式和命名规范 --- .../modules/pms/controller/EamController.java | 35 +++++++++++++++---- ...=> ReportExchangeWorkOrderExportData.java} | 2 +- 2 files changed, 29 insertions(+), 8 deletions(-) rename src/main/java/com/xujie/sys/modules/pms/data/{reportExchangeWorkOrderExportData.java => ReportExchangeWorkOrderExportData.java} (96%) 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 b3e67064..b8b7aea9 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 @@ -57,12 +57,34 @@ public class EamController { private QueryCriteriaConstructorDefault queryCriteriaConstructorDefault; /** - * @Description 换线专家组维修执行工单导出 + * @Description 设备维修组维修执行工单 * @Title * @author qkh - * @date + * @date 2026/2/5 **/ - @PostMapping(value="/reportExchangeWorkOrderExport") + // @PostMapping(value="/reportWorkOrderExcel") + // public void reportWorkOrderExport(@RequestBody EamWorkOrderInData 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"); + // //获取数据 + // PageUtils page = eamService.eamWorkOrderSearch2(data); + // EasyExcel.write(response.getOutputStream(), ReportExchangeWorkOrderExportData.class) + // .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) + // .sheet("设备维修组维修执行工单") + // .doWrite(page.getList()); + // } + + + /** + * @Description 维修执行工单导出 + * @Title + * @author qkh + * @date 2026/2/5 + **/ + @PostMapping(value="/reportExchangeWorkOrderExcel") public void reportExchangeWorkOrderExport(@RequestBody EamWorkOrderInData data, HttpServletResponse response) throws IOException { // 设置响应头 response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); @@ -71,7 +93,7 @@ public class EamController { response.setHeader("Content-Disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); //获取数据 PageUtils page = eamService.eamWorkOrderSearch2(data); - EasyExcel.write(response.getOutputStream(), reportExchangeWorkOrderExportData.class) + EasyExcel.write(response.getOutputStream(), ReportExchangeWorkOrderExportData.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) .sheet("换线专家组维修执行工单") .doWrite(page.getList()); @@ -81,7 +103,7 @@ public class EamController { * @Description 换线专家组维修工单 * @Title * @author qkh - * @date 2026/2/4 + * @date 2026/2/5 **/ @PostMapping(value="/eamExchangeOrderExportExcel") public void eamExchangeOrderExportExcel (@RequestBody EamWorkOrderInData data, HttpServletResponse response) throws IOException { @@ -92,8 +114,7 @@ public class EamController { response.setHeader("Content-Disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx"); //获取数据 - List list = - eamService.eamWorkOrderSearchForDefectExport(data); + List list = eamService.eamWorkOrderSearchForDefectExport(data); EasyExcel.write(response.getOutputStream(), EamWorkOrderExportData.class) .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy()) diff --git a/src/main/java/com/xujie/sys/modules/pms/data/reportExchangeWorkOrderExportData.java b/src/main/java/com/xujie/sys/modules/pms/data/ReportExchangeWorkOrderExportData.java similarity index 96% rename from src/main/java/com/xujie/sys/modules/pms/data/reportExchangeWorkOrderExportData.java rename to src/main/java/com/xujie/sys/modules/pms/data/ReportExchangeWorkOrderExportData.java index 44335992..346204a3 100644 --- a/src/main/java/com/xujie/sys/modules/pms/data/reportExchangeWorkOrderExportData.java +++ b/src/main/java/com/xujie/sys/modules/pms/data/ReportExchangeWorkOrderExportData.java @@ -8,7 +8,7 @@ import java.math.BigDecimal; import java.util.Date; @Data -public class reportExchangeWorkOrderExportData { +public class ReportExchangeWorkOrderExportData { @ExcelProperty("工单编码") private String orderNo;