From 9e105c2e276ea6a883969ed9ed8a6fb65be4f4ac Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期六, 25 二月 2023 19:09:51 +0800
Subject: [PATCH] 优化考勤代码
---
service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
index 76b5582..526aaa8 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/MonthAttendanceAdapt.java
@@ -37,7 +37,7 @@
workbook = new SXSSFWorkbook();
workbook.setCompressTempFiles(false);
- Sheet sheet = workbook.createSheet("鏈堣�冨嫟琛�");
+ Sheet sheet = workbook.createSheet(reqJson.getIntValue("taskYear") + "骞�" + reqJson.getIntValue("taskMonth") + "鏈堣�冨嫟琛�");
Row row = sheet.createRow(0);
row.createCell(0).setCellValue("閮ㄩ棬");
row.createCell(1).setCellValue("鍛樺伐");
@@ -47,14 +47,14 @@
calendar.set(Calendar.MONTH, reqJson.getIntValue("taskMonth") - 1);
int maxDayOfMonth = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
for (int day = 1; day <= maxDayOfMonth; day++) {
- row.createCell(day + 2).setCellValue(day + "鏃�");
+ row.createCell(day + 1).setCellValue(day + "鏃�");
}
- row.createCell(2 + maxDayOfMonth + 1).setCellValue("姝ｅ父鑰冨嫟");
- row.createCell(2 + maxDayOfMonth + 2).setCellValue("杩熷埌");
- row.createCell(2 + maxDayOfMonth + 3).setCellValue("鏃╅��");
- row.createCell(2 + maxDayOfMonth + 4).setCellValue("鏃峰伐");
- row.createCell(2 + maxDayOfMonth + 5).setCellValue("鍏嶈�冨嫟");
+ row.createCell(1 + maxDayOfMonth + 1).setCellValue("姝ｅ父鑰冨嫟");
+ row.createCell(1 + maxDayOfMonth + 2).setCellValue("杩熷埌");
+ row.createCell(1 + maxDayOfMonth + 3).setCellValue("鏃╅��");
+ row.createCell(1 + maxDayOfMonth + 4).setCellValue("鏃峰伐");
+ row.createCell(1 + maxDayOfMonth + 5).setCellValue("鍏嶈�冨嫟");
AttendanceClassesTaskDto attendanceClassesTaskDto = BeanConvertUtil.covertBean(reqJson, AttendanceClassesTaskDto.class);
@@ -100,16 +100,16 @@
dayObj = attendanceClassesTaskDto.getDays();
for (int day = 1; day <= maxDayOfMonth; day++) {
if (!dayObj.containsKey(day)) {
- row.createCell(day + 2).setCellValue("鏃犻渶鑰冨嫟");
+ row.createCell(day + 1).setCellValue("浼戞伅");
continue;
}
if (dayObj.get(day) == null) {
- row.createCell(day + 2).setCellValue("鏃犻渶鑰冨嫟");
+ row.createCell(day + 1).setCellValue("浼戞伅");
continue;
}
detailDtos = (List<AttendanceClassesTaskDetailDto>) dayObj.get(day);
if (detailDtos == null || detailDtos.size() < 1) {
- row.createCell(day + 2).setCellValue("鏃犻渶鑰冨嫟");
+ row.createCell(day + 1).setCellValue("浼戞伅");
continue;
}
@@ -122,19 +122,19 @@
}
if (!AttendanceClassesTaskDetailDto.STATE_WAIT.equals(detailDto.getState())) {
- value += (detailDto.getCheckTime()+"("+detailDto.getStateName()+");");
+ value += (detailDto.getCheckTime() + "(" + detailDto.getStateName() + ");" + String.valueOf((char) 10));
} else {
- value += (" - ("+detailDto.getStateName()+");");
+ value += (" - (" + detailDto.getStateName() + ");" + String.valueOf((char) 10));
}
}
- row.createCell(day + 2).setCellValue(value);
+ row.createCell(day + 1).setCellValue(value);
}
- row.createCell(2 + maxDayOfMonth + 1).setCellValue(attendanceClassesTaskDto.getClockIn());
- row.createCell(2 + maxDayOfMonth + 2).setCellValue(attendanceClassesTaskDto.getLate());
- row.createCell(2 + maxDayOfMonth + 3).setCellValue(attendanceClassesTaskDto.getEarly());
- row.createCell(2 + maxDayOfMonth + 4).setCellValue(attendanceClassesTaskDto.getNoClockIn());
- row.createCell(2 + maxDayOfMonth + 5).setCellValue(attendanceClassesTaskDto.getFree());
+ row.createCell(1 + maxDayOfMonth + 1).setCellValue(attendanceClassesTaskDto.getClockIn());
+ row.createCell(1 + maxDayOfMonth + 2).setCellValue(attendanceClassesTaskDto.getLate());
+ row.createCell(1 + maxDayOfMonth + 3).setCellValue(attendanceClassesTaskDto.getEarly());
+ row.createCell(1 + maxDayOfMonth + 4).setCellValue(attendanceClassesTaskDto.getNoClockIn());
+ row.createCell(1 + maxDayOfMonth + 5).setCellValue(attendanceClassesTaskDto.getFree());
}
}
--
Gitblit v1.8.0