refactor(sip):优化项目订单导出逻辑并调整邮件发送流程- 移除冗余的return语句以优化邮件发送后的执行流
- 修改Excel文件名从"订单数据汇总"为"订单数据"- 调整sheet名称:原"订单数据明细"改为"订单数据汇总" - 将第二个sheet名称从"产品数据"更正为"订单数据明细"以匹配实际内容master
parent
ad219353c6
commit
52125a6419
|
|
@ -1238,7 +1238,6 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
dict.put("currentDate",DateUtil.now());
|
dict.put("currentDate",DateUtil.now());
|
||||||
TemplateMailUtil.sendTemplateMail(emailList,title,
|
TemplateMailUtil.sendTemplateMail(emailList,title,
|
||||||
TemplateMailUtil.MailTemplate.REJECT_EMAIL,dict);
|
TemplateMailUtil.MailTemplate.REJECT_EMAIL,dict);
|
||||||
return;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1478,7 +1477,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
// 补充项目详细数据
|
// 补充项目详细数据
|
||||||
enrichProjectData(projectInfos);
|
enrichProjectData(projectInfos);
|
||||||
ExcelUtil<ProjectInfo> util = new ExcelUtil<>(ProjectInfo.class);
|
ExcelUtil<ProjectInfo> util = new ExcelUtil<>(ProjectInfo.class);
|
||||||
String fileName = util.encodingFilename("订单数据汇总");
|
String fileName = util.encodingFilename("订单数据");
|
||||||
String filePath = util.getAbsoluteFile(fileName);
|
String filePath = util.getAbsoluteFile(fileName);
|
||||||
ExcelWriter excelWriter = EasyExcel.write(filePath).registerWriteHandler(new SimpleColumnWidthStyleStrategy(20)).build();
|
ExcelWriter excelWriter = EasyExcel.write(filePath).registerWriteHandler(new SimpleColumnWidthStyleStrategy(20)).build();
|
||||||
|
|
||||||
|
|
@ -1488,7 +1487,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
List<List<String>> head1 = generateHead1();
|
List<List<String>> head1 = generateHead1();
|
||||||
|
|
||||||
// 创建第一个sheet
|
// 创建第一个sheet
|
||||||
WriteSheet writeSheet1 = EasyExcel.writerSheet(0, "订单数据明细")
|
WriteSheet writeSheet1 = EasyExcel.writerSheet(0, "订单数据汇总")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
// 创建第一个表格(可以理解为数据区域)
|
// 创建第一个表格(可以理解为数据区域)
|
||||||
|
|
@ -1504,7 +1503,7 @@ public class ProjectOrderInfoServiceImpl implements IProjectOrderInfoService, To
|
||||||
List<List<String>> head2 = generateHead2();
|
List<List<String>> head2 = generateHead2();
|
||||||
|
|
||||||
// 创建第二个sheet
|
// 创建第二个sheet
|
||||||
WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "产品数据")
|
WriteSheet writeSheet2 = EasyExcel.writerSheet(1, "订单数据明细")
|
||||||
.build();
|
.build();
|
||||||
|
|
||||||
// 创建第二个表格
|
// 创建第二个表格
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue