From 173b6b8fd81b710c10cd6b3b1d4143d04a256340 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 16 五月 2023 18:36:01 +0800
Subject: [PATCH] optimize report
---
service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java | 15 ++++++---------
1 files changed, 6 insertions(+), 9 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..4a4afc2 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
@@ -2,18 +2,15 @@
import com.alibaba.fastjson.JSONObject;
import com.java110.dto.data.ExportDataDto;
-import com.java110.dto.reportFeeMonthStatistics.ReportFeeMonthStatisticsDto;
import com.java110.dto.scheduleClasses.ScheduleClassesDto;
-import com.java110.dto.scheduleClassesDay.ScheduleClassesDayDto;
-import com.java110.dto.scheduleClassesStaff.ScheduleClassesStaffDto;
-import com.java110.dto.scheduleClassesTime.ScheduleClassesTimeDto;
+import com.java110.dto.scheduleClasses.ScheduleClassesDayDto;
+import com.java110.dto.scheduleClasses.ScheduleClassesStaffDto;
+import com.java110.dto.scheduleClasses.ScheduleClassesTimeDto;
import com.java110.intf.store.IScheduleClassesDayV1InnerServiceSMO;
import com.java110.intf.store.IScheduleClassesStaffV1InnerServiceSMO;
import com.java110.intf.store.IScheduleClassesV1InnerServiceSMO;
import com.java110.job.export.IExportDataAdapt;
import com.java110.utils.util.DateUtil;
-import com.java110.utils.util.StringUtil;
-import com.java110.vo.ResultVo;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.streaming.SXSSFWorkbook;
@@ -107,14 +104,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