完善工时统计

wisenergy-service/src/main/java/cn/wisenergy/service/impl/StatisticsServiceImpl.java

@@ -872,13 +872,13 @@ public class StatisticsServiceImpl implements StatisticsService {
         sheet1.addMergedRegion(cellRangeAddress2);
         setBorderStyle(BorderStyle.THIN, cellRangeAddress2, sheet1);
         // 合计行
-        CellRangeAddress cellRangeAddress3 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, 0, 1);
+        CellRangeAddress cellRangeAddress3 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 1, userWorkTimeStatisticsReport.size() + 1, 0, 1);
         sheet1.addMergedRegion(cellRangeAddress3);
         setBorderStyle(BorderStyle.THIN, cellRangeAddress3, sheet1);
         // 项目行和总计行
         for (int i = 0; i < row1_lastCellNum / 2 - 1; i++) {
             // 总计行
-            CellRangeAddress cellRangeAddress4 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 3, userWorkTimeStatisticsReport.size() + 3, i * 2, i * 2 + 1);
+            CellRangeAddress cellRangeAddress4 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, i * 2, i * 2 + 1);
             sheet1.addMergedRegion(cellRangeAddress4);
             setBorderStyle(BorderStyle.THIN, cellRangeAddress4, sheet1);
             if (i > 0) {
@@ -1078,6 +1078,8 @@ public class StatisticsServiceImpl implements StatisticsService {
     // 设置单元格基本样式
     HSSFCellStyle createOrdinaryCellStyle(HSSFWorkbook sheets) {
         HSSFCellStyle cellStyle = sheets.createCellStyle();
+//        cellStyle.setFillBackgroundColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex());
+        cellStyle.setFillForegroundColor(HSSFColor.HSSFColorPredefined.WHITE.getIndex());
         // 设置全填充
         cellStyle.setFillPattern(FillPatternType.SOLID_FOREGROUND);
         // 垂直、水平中心对齐

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/StatisticsController.java

@@ -169,7 +169,7 @@ public class StatisticsController extends BaseController {
 //        String fileName = deptName + "-" + param.getYear() + "年" + param.getMonth() + "月工时汇总";
         //响应类型为application/octet- stream情况下使用了这个头信息的话，那就意味着不想直接显示内容
         response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
-        String fileName = "导出人员工时统计";
+        String fileName = "导出项目工时统计明细";
         //attachment为以附件方式下载
         try {
             response.setHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(