From 52125a6419b671bc6bf0b03f74c1cb76f4550a0f Mon Sep 17 00:00:00 2001 From: chenhao Date: Fri, 31 Oct 2025 15:50:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(sip):=E4=BC=98=E5=8C=96=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=AE=A2=E5=8D=95=E5=AF=BC=E5=87=BA=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=20=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E7=9A=84return=E8=AF=AD=E5=8F=A5=E4=BB=A5=E4=BC=98=E5=8C=96?= =?UTF-8?q?=E9=82=AE=E4=BB=B6=E5=8F=91=E9=80=81=E5=90=8E=E7=9A=84=E6=89=A7?= =?UTF-8?q?=E8=A1=8C=E6=B5=81=20-=20=E4=BF=AE=E6=94=B9Excel=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E4=BB=8E"=E8=AE=A2=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B1=87=E6=80=BB"=E4=B8=BA"=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=95=B0=E6=8D=AE"-=20=E8=B0=83=E6=95=B4sheet=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=9A=E5=8E=9F"=E8=AE=A2=E5=8D=95=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=98=8E=E7=BB=86"=E6=94=B9=E4=B8=BA"=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=95=B0=E6=8D=AE=E6=B1=87=E6=80=BB"=20-=20=E5=B0=86?= =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E4=B8=AAsheet=E5=90=8D=E7=A7=B0=E4=BB=8E"?= =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=95=B0=E6=8D=AE"=E6=9B=B4=E6=AD=A3?= =?UTF-8?q?=E4=B8=BA"=E8=AE=A2=E5=8D=95=E6=95=B0=E6=8D=AE=E6=98=8E?= =?UTF-8?q?=E7=BB=86"=E4=BB=A5=E5=8C=B9=E9=85=8D=E5=AE=9E=E9=99=85?= =?UTF-8?q?=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sip/service/impl/ProjectOrderInfoServiceImpl.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java index 3e6ce6bb..4422c330 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/service/impl/ProjectOrderInfoServiceImpl.java @@ -1238,7 +1238,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To dict.put("currentDate",DateUtil.now()); TemplateMailUtil.sendTemplateMail(emailList,title, TemplateMailUtil.MailTemplate.REJECT_EMAIL,dict); - return; } } } @@ -1478,7 +1477,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To // 补充项目详细数据 enrichProjectData(projectInfos); ExcelUtil util = new ExcelUtil<>(ProjectInfo.class); - String fileName = util.encodingFilename("订单数据汇总"); + String fileName = util.encodingFilename("订单数据"); String filePath = util.getAbsoluteFile(fileName); ExcelWriter excelWriter = EasyExcel.write(filePath).registerWriteHandler(new SimpleColumnWidthStyleStrategy(20)).build(); @@ -1488,7 +1487,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To List> head1 = generateHead1(); // 创建第一个sheet - WriteSheet writeSheet1 = EasyExcel.writerSheet(0, "订单数据明细") + WriteSheet writeSheet1 = EasyExcel.writerSheet(0, "订单数据汇总") .build(); // 创建第一个表格（可以理解为数据区域） @@ -1504,7 +1503,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To List> head2 = generateHead2(); // 创建第二个sheet - WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "产品数据") + WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "订单数据明细") .build(); // 创建第二个表格