考勤月报表和后勤考勤月报表导出增加请年假天数显示

web/src/main/java/com/jpsoft/shinestar/config/RabbitmqConfig.java

@@ -159,7 +159,7 @@ public class RabbitmqConfig {
 
 
     /**
-     * 年假修改人员工作状态111
+     * 年假修改人员工作状态
      * @return
      */
     @Bean

web/src/main/java/com/jpsoft/shinestar/modules/business/controller/WorkScheduleAttendanceController.java

@@ -1886,7 +1886,9 @@ public class WorkScheduleAttendanceController {
             XSSFCell cellTitle14 = rowTitle.createCell(14);
             cellTitle14.setCellValue("请假天数");
             XSSFCell cellTitle15 = rowTitle.createCell(15);
-            cellTitle15.setCellValue("备注");
+            cellTitle15.setCellValue("年假天数");
+            XSSFCell cellTitle16 = rowTitle.createCell(16);
+            cellTitle16.setCellValue("备注");
 
             JSONArray array = requestBody.getJSONArray("data");
 
@@ -1945,6 +1947,10 @@ public class WorkScheduleAttendanceController {
 
                 row.createCell(colIndex).setCellValue(jsonObject.getString("leaveNum"));
                 colIndex++;
+
+                row.createCell(colIndex).setCellValue(jsonObject.getString("yearLeaveNum"));
+                colIndex++;
+
                 row.createCell(colIndex).setCellValue(jsonObject.getString("remark"));
                 colIndex++;
 
@@ -2434,9 +2440,11 @@ public class WorkScheduleAttendanceController {
             XSSFCell cellTitle14 = rowTitle.createCell(14);
             cellTitle14.setCellValue("请假天数");
             XSSFCell cellTitle15 = rowTitle.createCell(15);
-            cellTitle15.setCellValue("工作时长");
+            cellTitle15.setCellValue("年假天数");
             XSSFCell cellTitle16 = rowTitle.createCell(16);
-            cellTitle16.setCellValue("备注");
+            cellTitle16.setCellValue("工作时长");
+            XSSFCell cellTitle17 = rowTitle.createCell(17);
+            cellTitle17.setCellValue("备注");
 
             JSONArray array = requestBody.getJSONArray("data");
 
@@ -2496,6 +2504,8 @@ public class WorkScheduleAttendanceController {
                 row.createCell(colIndex).setCellValue(jsonObject.getString("leaveNum"));
                 colIndex++;
 
+                row.createCell(colIndex).setCellValue(jsonObject.getString("yearLeaveNum"));
+                colIndex++;
 
                 row.createCell(colIndex).setCellValue(jsonObject.getString("workTimes"));
                 colIndex++;