From 7dd0025424f01dda86103d48b34ea03c9aed6ab2 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 21 三月 2023 00:57:41 +0800
Subject: [PATCH] 加入充电规则功能
---
service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java b/service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java
index b30f2c4..1682ecb 100644
--- a/service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java
+++ b/service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java
@@ -107,14 +107,14 @@
ScheduleClassesDayDto day = null;
for (int roomIndex = 0; roomIndex < scheduleClassesStaffDtos.size(); roomIndex++) {
row = sheet.createRow(roomIndex + step + 1);
- scheduleClassesStaffDto = scheduleClassesStaffDtos.get(0);
+ scheduleClassesStaffDto = scheduleClassesStaffDtos.get(roomIndex);
row.createCell(0).setCellValue(scheduleClassesStaffDto.getStaffName());
for (int dayIndex = 1; dayIndex <= scheduleClassesStaffDto.getDays().size(); dayIndex++) {
day = scheduleClassesStaffDto.getDays().get(dayIndex-1);
- if (!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getWorkday())) {
+ if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getWorkday())) {
cellValue = "浼戞伅";
} else {
- cellValue = "姝ｅ父涓婁笅鐝�";
+ cellValue = day.getWorkdayName()+"\r\n";
for (ScheduleClassesTimeDto time : day.getTimes()) {
cellValue += (time.getStartTime() + "-" + time.getEndTime());
}
--
Gitblit v1.8.0