功能完善

master
薛宏祥 12 months ago
parent 563a552bb3
commit b7da9254ff
  1. 10
      src/main/java/org/springblade/modules/business/service/impl/MaintenanceTaskDetailServiceImpl.java
  2. 10
      src/main/java/org/springblade/modules/business/service/impl/WorkOrderServiceImpl.java

@ -52,7 +52,8 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
@Override
public void maintenanceOutputService(MaintenanceTask task, HttpServletResponse response) throws IOException {
//数据获取
String templateFile = "./src/main/resources/excel/MaintenanceTaskReport.xlsx";
String templateFile = "MaintenanceTaskReport.xlsx";
InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("excel" + "/" + templateFile);
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
Map<String, Object> map = new HashMap<>();
map.put("taskName", task.getDeptName());
@ -123,7 +124,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
}
//将数据导出到Excel
ServletOutputStream outputStream = response.getOutputStream();
try (ExcelWriter excelWriter = EasyExcel.write(outputStream).withTemplate(templateFile).build()) {
try (ExcelWriter excelWriter = EasyExcel.write(outputStream).withTemplate(fileInputStream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
excelWriter.fill(maintenanceOutputDataList, fillConfig, writeSheet);
excelWriter.fill(map, writeSheet);
@ -137,7 +138,8 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
public void batchMaintenanceOutputService(List<MaintenanceTask> taskList, HttpServletResponse response) throws IOException {
for (MaintenanceTask task : taskList) {
//数据获取
String templateFile = "./src/main/resources/excel/MaintenanceTaskReport.xlsx";
String templateFile = "MaintenanceTaskReport.xlsx";
InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("excel" + "/" + templateFile);
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
Map<String, Object> map = new HashMap<>();
map.put("taskName", task.getDeptName());
@ -211,7 +213,7 @@ public class MaintenanceTaskDetailServiceImpl extends BaseServiceImpl<Maintenanc
ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
String fileName = task.getTaskCode() + "巡检报告.xlsx";
zos.putNextEntry(new ZipEntry(fileName));
try (ExcelWriter excelWriter = EasyExcel.write(zos).withTemplate(templateFile).build()) {
try (ExcelWriter excelWriter = EasyExcel.write(zos).withTemplate(fileInputStream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
excelWriter.fill(maintenanceOutputDataList, fillConfig, writeSheet);
excelWriter.fill(map, writeSheet);

@ -568,7 +568,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
@Override
public void reportService(WorkOrder workOrder, HttpServletResponse response) throws IOException {
//数据获取
String templateFileName = "./src/main/resources/excel/WorkOrderServiceSheet.xlsx";
String templateFileName = "WorkOrderServiceSheet.xlsx";
InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("excel" + "/" + templateFileName);
double total = 0.0;
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
List<WorkOrderRepairMaterial> workOrderRepairMaterialList = workOrderRepairMaterialService.list(Wrappers.lambdaQuery(WorkOrderRepairMaterial.class).eq(WorkOrderRepairMaterial::getOrderId, workOrder.getId()));
@ -653,7 +654,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
}
//写入Excel并导出
ServletOutputStream out = response.getOutputStream();
try (ExcelWriter excelWriter = EasyExcel.write(out).withTemplate(templateFileName).build()) {
try (ExcelWriter excelWriter = EasyExcel.write(out).withTemplate(fileInputStream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
excelWriter.fill(workOrderFillDataList, fillConfig, writeSheet);
excelWriter.fill(map, writeSheet);
@ -668,7 +669,8 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
for (WorkOrder workOrder : workOrderList) {
//数据获取
String templateFileName = "./src/main/resources/excel/WorkOrderServiceSheet.xlsx";
String templateFileName = "WorkOrderServiceSheet.xlsx";
InputStream fileInputStream = this.getClass().getClassLoader().getResourceAsStream("excel" + "/" + templateFileName);
double total = 0.0;
FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
List<WorkOrderRepairMaterial> workOrderRepairMaterialList = workOrderRepairMaterialService.list(Wrappers.lambdaQuery(WorkOrderRepairMaterial.class).eq(WorkOrderRepairMaterial::getOrderId, workOrder.getId()));
@ -755,7 +757,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
ZipOutputStream zos = new ZipOutputStream(response.getOutputStream());
String fileName = workOrder.getReportUnitName() + "运维服务单.xlsx";
zos.putNextEntry(new ZipEntry(fileName));
try (ExcelWriter excelWriter = EasyExcel.write(zos).withTemplate(templateFileName).build()) {
try (ExcelWriter excelWriter = EasyExcel.write(zos).withTemplate(fileInputStream).build()) {
WriteSheet writeSheet = EasyExcel.writerSheet().build();
excelWriter.fill(workOrderFillDataList, fillConfig, writeSheet);
excelWriter.fill(map, writeSheet);

Loading…
Cancel
Save