人员工时工价表导出添加员工编号

fhKeeper/formulahousekeeper/management-workshop/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4596,6 +4596,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         List<String> row_first =new ArrayList<>();
         row_first.add("部门名称");
         row_first.add("人员");
+        row_first.add("员工编号");
         for(int i=0;i<headerList.size();i++){
             if(i==0){
                 row_first.add(headerList.get(0));
@@ -4612,13 +4613,14 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             tempCell.setCellStyle(headStyle);
         }
         for(int i=1;i<=headerList.size();i++){
-            sheet.addMergedRegion(new CellRangeAddress(0, 0, 2+2*(i-1), 2+2*(i-1)+1));//日期
+            sheet.addMergedRegion(new CellRangeAddress(0, 0, 3+2*(i-1), 3+2*(i-1)+1));//日期
         }
-        sheet.addMergedRegion(new CellRangeAddress(0,0,2+2*headerList.size(),2+2*headerList.size()+1));
+        sheet.addMergedRegion(new CellRangeAddress(0,0,3+2*headerList.size(),3+2*headerList.size()+1));
         List<String> list=new ArrayList<>();
         for (User user : mapList) {
             list.add(user.getDepartmentCascade());
             list.add(user.getName());
+            list.add(user.getJobNumber());
             for (String s : headerList) {
                 List<Map<String,Object>> itemList= user.getPersonWorkHoursWages();
                 Optional<Map<String, Object>> first = itemList.stream().filter(it -> it.get("crateDate").equals(s)).findFirst();
@@ -4649,7 +4651,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         for(int i = 0;i<mapList.size();i++){
             SXSSFRow tempRow = sheet.createRow(rowNum++);
             tempRow.setHeight((short)500);
-            for(int j=0;j<2+2*headerList.size()+2;j++){
+            for(int j=0;j<3+2*headerList.size()+2;j++){
                 SXSSFCell tempCell = tempRow.createCell(j);
                 String cellValue = "";
                 tempCell.setCellStyle(cellStyle);