|
@@ -1,6 +1,9 @@
|
|
|
package com.ruoyi.powerdistribution.controller;
|
|
|
|
|
|
import com.alibaba.excel.EasyExcel;
|
|
|
+import com.alibaba.excel.ExcelWriter;
|
|
|
+import com.alibaba.excel.write.metadata.WriteSheet;
|
|
|
+import com.alibaba.excel.write.metadata.fill.FillConfig;
|
|
|
import com.ruoyi.common.core.controller.BaseController;
|
|
|
import com.ruoyi.common.utils.DateUtils;
|
|
|
import com.ruoyi.common.utils.poi.ExcelUtil;
|
|
@@ -11,6 +14,8 @@ import com.ruoyi.powerdistribution.service.*;
|
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.AllArgsConstructor;
|
|
|
+import org.apache.poi.ss.usermodel.Workbook;
|
|
|
+import org.apache.poi.xssf.streaming.SXSSFWorkbook;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.security.access.prepost.PreAuthorize;
|
|
|
import org.springframework.web.bind.annotation.GetMapping;
|
|
@@ -20,6 +25,8 @@ import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
import javax.servlet.http.HttpServletResponse;
|
|
|
import java.io.IOException;
|
|
|
+import java.io.InputStream;
|
|
|
+import java.io.OutputStream;
|
|
|
import java.util.List;
|
|
|
|
|
|
@RestController
|
|
@@ -97,8 +104,26 @@ public class ReportController extends BaseController {
|
|
|
nextDay.setReportDate(DateUtils.getNextDateStr(reportDate,DateUtils.YYYYMMDD,1));
|
|
|
List<PdmReportPlanNextDay> nextDayList = pdmReportPlanNextDayService.selectPdmReportPlanNextDayList(nextDay);
|
|
|
|
|
|
- ExcelUtil<PdmReportIllegalDay> util = new ExcelUtil<>(PdmReportIllegalDay.class);
|
|
|
- util.exportExcel(response, illegalList, "违章");
|
|
|
+ response.setContentType("application/vnd.ms-excel");
|
|
|
+ response.setCharacterEncoding("utf-8");
|
|
|
+ String fileName = java.util.UUID.randomUUID() + ".xlsx";
|
|
|
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName);
|
|
|
+ String templateFileName = "excelTemplate/dayReport.xlsx";
|
|
|
+ InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream(templateFileName);
|
|
|
+ OutputStream ops = response.getOutputStream();
|
|
|
+
|
|
|
+ ExcelWriter excelWriter = EasyExcel.write(ops).withTemplate(fis).build();
|
|
|
+ WriteSheet writeSheet = EasyExcel.writerSheet("违章情况").build();
|
|
|
+ FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
|
|
|
+ excelWriter.fill(illegalList, fillConfig, writeSheet);
|
|
|
+ WriteSheet writeSheet2 = EasyExcel.writerSheet("作业计划").build();
|
|
|
+ excelWriter.fill(planlist, fillConfig, writeSheet2);
|
|
|
+ WriteSheet writeSheet3 = EasyExcel.writerSheet("履职情况").build();
|
|
|
+ excelWriter.fill(appointmentlist, fillConfig, writeSheet3);
|
|
|
+ WriteSheet writeSheet4 = EasyExcel.writerSheet("明日计划").build();
|
|
|
+ excelWriter.fill(nextDayList, fillConfig, writeSheet4);
|
|
|
+ excelWriter.finish();
|
|
|
+
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -120,16 +145,14 @@ public class ReportController extends BaseController {
|
|
|
pdmReportPlan.setReportDate(startDate);
|
|
|
pdmReportPlan.setReportEndDate(endDate);
|
|
|
List<PdmReportPlanWeek> planlist = pdmReportPlanWeekService.selectPdmReportPlanWeekList(pdmReportPlan);
|
|
|
-
|
|
|
PdmReportPlanNextWeek next = new PdmReportPlanNextWeek();
|
|
|
next.setReportDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
|
|
|
List<PdmReportPlanNextWeek> nextList = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(next);
|
|
|
-
|
|
|
PdmWorkPlan workPlan = new PdmWorkPlan();
|
|
|
workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
|
|
|
workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
|
|
|
-
|
|
|
List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
|
|
|
+
|
|
|
ReportDayWeek vo = new ReportDayWeek();
|
|
|
vo.setAppointmentList(appointmentlist);
|
|
|
vo.setIllegalList(illegalList);
|
|
@@ -153,8 +176,46 @@ public class ReportController extends BaseController {
|
|
|
pdmReportIllegal.setReportDate(startDate);
|
|
|
pdmReportIllegal.setReportEndDate(endDate);
|
|
|
List<PdmReportIllegalWeek> illegalList = pdmReportIllegalWeekService.selectPdmReportIllegalWeekList(pdmReportIllegal);
|
|
|
+ PdmReportAppointmentWeek pdmReportAppointment = new PdmReportAppointmentWeek();
|
|
|
+ pdmReportAppointment.setReportDate(startDate);
|
|
|
+ pdmReportAppointment.setReportEndDate(endDate);
|
|
|
+ List<PdmReportAppointmentWeek> appointmentlist = pdmReportAppointmentWeekService.selectPdmReportAppointmentWeekList(pdmReportAppointment);
|
|
|
+ PdmReportPlanWeek pdmReportPlan = new PdmReportPlanWeek();
|
|
|
+ pdmReportPlan.setReportDate(startDate);
|
|
|
+ pdmReportPlan.setReportEndDate(endDate);
|
|
|
+ List<PdmReportPlanWeek> planlist = pdmReportPlanWeekService.selectPdmReportPlanWeekList(pdmReportPlan);
|
|
|
+ PdmReportPlanNextWeek next = new PdmReportPlanNextWeek();
|
|
|
+ next.setReportDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
|
|
|
+ List<PdmReportPlanNextWeek> nextList = pdmReportPlanNextWeekService.selectPdmReportPlanNextWeekList(next);
|
|
|
+ PdmWorkPlan workPlan = new PdmWorkPlan();
|
|
|
+ workPlan.setStartDate(DateUtils.getNextMonday(startDate,DateUtils.YYYYMMDD));
|
|
|
+ workPlan.setEndDate(DateUtils.getNextSunday(endDate,DateUtils.YYYYMMDD));
|
|
|
+ List<PdmWorkPlan> workList = pdmWorkPlanService.selectPdmWorkPlanList(workPlan);
|
|
|
+
|
|
|
+ //ExcelUtil<PdmReportIllegalWeek> util = new ExcelUtil<>(PdmReportIllegalWeek.class);
|
|
|
+ //util.exportExcel(response, illegalList, "违章统计");
|
|
|
+
|
|
|
+ response.setContentType("application/vnd.ms-excel");
|
|
|
+ response.setCharacterEncoding("utf-8");
|
|
|
+ String fileName = java.util.UUID.randomUUID() + ".xlsx";
|
|
|
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName);
|
|
|
+ String templateFileName = "excelTemplate/weekReport.xlsx";
|
|
|
+ InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream(templateFileName);
|
|
|
+ OutputStream ops = response.getOutputStream();
|
|
|
+
|
|
|
+ ExcelWriter excelWriter = EasyExcel.write(ops).withTemplate(fis).build();
|
|
|
+ WriteSheet writeSheet = EasyExcel.writerSheet("违章情况").build();
|
|
|
+ FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
|
|
|
+ excelWriter.fill(illegalList, fillConfig, writeSheet);
|
|
|
+ WriteSheet writeSheet2 = EasyExcel.writerSheet("本周计划执行情况").build();
|
|
|
+ excelWriter.fill(planlist, fillConfig, writeSheet2);
|
|
|
+ WriteSheet writeSheet3 = EasyExcel.writerSheet("履职情况").build();
|
|
|
+ excelWriter.fill(appointmentlist, fillConfig, writeSheet3);
|
|
|
+ WriteSheet writeSheet4 = EasyExcel.writerSheet("下周计划安排").build();
|
|
|
+ excelWriter.fill(nextList, fillConfig, writeSheet4);
|
|
|
+ WriteSheet writeSheet5 = EasyExcel.writerSheet("三级及以上作业风险计划").build();
|
|
|
+ excelWriter.fill(workList, fillConfig, writeSheet5);
|
|
|
+ excelWriter.finish();
|
|
|
|
|
|
- ExcelUtil<PdmReportIllegalWeek> util = new ExcelUtil<>(PdmReportIllegalWeek.class);
|
|
|
- util.exportExcel(response, illegalList, "违章统计");
|
|
|
}
|
|
|
}
|