|
|
@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
import java.io.BufferedInputStream;
|
|
|
import java.io.OutputStream;
|
|
|
+import java.text.DecimalFormat;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
import java.util.*;
|
|
|
@@ -255,7 +256,7 @@ public class AttendanceServiceImpl extends BaseServiceImpl<AttendanceMapper, Att
|
|
|
//第二行:周几行
|
|
|
for (int i = 1; i <= daysInMonth; i++) {
|
|
|
LocalDate date = LocalDate.of(year, month, i);
|
|
|
- verticalHeaderRow.add(date.format(weekFormatter).substring(1));
|
|
|
+ verticalHeaderRow.add(" "+date.format(weekFormatter).substring(1) + " ");
|
|
|
}
|
|
|
verticalHeaderRow.add("本月出勤/小时");
|
|
|
verticalHeaderRow.add("本月出勤/天");
|
|
|
@@ -293,11 +294,10 @@ public class AttendanceServiceImpl extends BaseServiceImpl<AttendanceMapper, Att
|
|
|
|
|
|
// 每日考勤数据
|
|
|
Map<String, Double> dailyMap = new HashMap<>();
|
|
|
- if (attendance.getDailyAttendances() != null) {
|
|
|
for (DailyAttendance daily : attendance.getDailyAttendances()) {
|
|
|
- dailyMap.put(daily.getWorkDate(), daily.getWorkHours());
|
|
|
+ DecimalFormat df = new DecimalFormat("#.0");
|
|
|
+ dailyMap.put(daily.getWorkDate(), Double.parseDouble(df.format(daily.getWorkHours())));
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
for (int day = 1; day <= daysInMonth; day++) {
|
|
|
LocalDate currentDate = LocalDate.of(year, month, day);
|