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(); // 创建第二个表格