销假管理修改

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

@@ -412,7 +412,7 @@ public class RequestForLeaveInfoController {
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("className"),""));
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("leaveTypeN"),""));
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("cancelTime"),""));
-            row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("approvedId"),""));
+            row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("approvalPersonIdStr"),""));
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("startTime"),""));
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("endTime"),""));
             row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("days"),""));
@@ -482,7 +482,7 @@ public class RequestForLeaveInfoController {
             Row rowTitle = sheet.createRow(0);
 
             String[] titles = new String[]{"序号","姓名","工号","部门",
-                    "请假类型","销假时间","销假审核人","开始时间","结束时间","请假时长","请假事由","审批状态","申请时间"};
+                    "请假类型","销假时间","销假审核人","开始时间","结束时间","请假时长","请假事由","审批状态","审核备注","申请时间"};
 
             for (int i=0;i<titles.length;i++) {
                 Cell cell = rowTitle.createCell(i);
@@ -501,12 +501,13 @@ public class RequestForLeaveInfoController {
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("className"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("leaveTypeN"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("cancelTime"),""));
-                row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("approvedId"),""));
+                row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("approvalPersonIdStr"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("startTime"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("endTime"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("days"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("reason"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("statusN"),""));
+                row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("approvalExplain"),""));
                 row.createCell(colIndex++).setCellValue(StringUtils.strValue(map.get("createTime"),""));
             }
 
@@ -845,6 +846,11 @@ public class RequestForLeaveInfoController {
             //请假理由
             map.put("reason", target.getReason());
 
+
+            map.put("approvalExplain", target.getApprovalExplain());
+
+
+
             //上传图片
 
             List<String> imageUrlList = new ArrayList<>();