修改人员工时统计导出

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

@@ -925,7 +925,8 @@ public class StatisticsServiceImpl implements StatisticsService {
         row_1Cell3.setCellValue("参与项目数");
         // 参数商机数
         HSSFCell row_1Cell4 = row_1.createCell(3);
-        row_1Cell4.setCellValue("参数商机数");
+        row_1Cell4.setCellValue("参与商机数");
+
 
 
 
@@ -1058,16 +1059,22 @@ public class StatisticsServiceImpl implements StatisticsService {
         setBorderStyle(cellRangeAddress6, sheet1);
 
         // 合计行
-        CellRangeAddress cellRangeAddress3 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 1, userWorkTimeStatisticsReport.size() + 1, 0, 1);
+        CellRangeAddress cellRangeAddress3 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 1, userWorkTimeStatisticsReport.size() + 1, 0, 3);
         sheet1.addMergedRegion(cellRangeAddress3);
         setBorderStyle(cellRangeAddress3, sheet1);
+
+        // 总计行
+        CellRangeAddress cellRangeAddress7 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, 0, 3);
+        sheet1.addMergedRegion(cellRangeAddress7);
+        setBorderStyle(cellRangeAddress7, sheet1);
         // 项目行和总计行,正常工时和加班工时表头列数
         short lastCellNum = row_2.getLastCellNum();
-        for (int i = 0; i < lastCellNum / 2; i++) {
-            // 总计行
-            CellRangeAddress cellRangeAddress4 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, i * 2, i * 2 + 1);
+        for (int i = 2; i < lastCellNum / 2; i++) {
+
+                CellRangeAddress cellRangeAddress4 = new CellRangeAddress(userWorkTimeStatisticsReport.size() + 2, userWorkTimeStatisticsReport.size() + 2, i*2, i*2+1);
                 sheet1.addMergedRegion(cellRangeAddress4);
                 setBorderStyle(cellRangeAddress4, sheet1);
+
             /**
              * 这里i>0 改为了i>1
              */