From 7007db947ea409a973aee8a681ee86cf9d2708bf Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 六月 2023 18:54:52 +0800
Subject: [PATCH] 优化1.5 的bug
---
service-job/src/main/java/com/java110/job/export/adapt/ReportStaffMonthScheduleClassesAdapt.java | 85 +++++++++++++++++++-----------------------
1 files changed, 39 insertions(+), 46 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 3e5cb09..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;
@@ -64,8 +61,8 @@
calendar.setTime(DateUtil.getDateFromStringB(curMonthDay));
int maxDay = calendar.getActualMaximum(Calendar.DAY_OF_MONTH);
- for(int day = 1; day <= maxDay ; day++){
- row.createCell(day).setCellValue(day+"");
+ for (int day = 1; day <= maxDay; day++) {
+ row.createCell(day).setCellValue(day + "");
}
ScheduleClassesStaffDto scheduleClassesStaffDto = new ScheduleClassesStaffDto();
@@ -74,20 +71,20 @@
scheduleClassesStaffDto.setScheduleId(reqJson.getString("scheduleId"));
scheduleClassesStaffDto.setStoreId(reqJson.getString("storeId"));
- getStaffMonthScheduleClasses(sheet,scheduleClassesStaffDto,reqJson);
+ getStaffMonthScheduleClasses(sheet, scheduleClassesStaffDto, reqJson);
return workbook;
}
- private void getStaffMonthScheduleClasses(Sheet sheet, ScheduleClassesStaffDto scheduleClassesStaffDto,JSONObject reqJson) {
+ private void getStaffMonthScheduleClasses(Sheet sheet, ScheduleClassesStaffDto scheduleClassesStaffDto, JSONObject reqJson) {
scheduleClassesStaffDto.setPage(1);
scheduleClassesStaffDto.setRow(MAX_ROW);
long count = scheduleClassesStaffV1InnerServiceSMOImpl.queryScheduleClassesStaffsCount(scheduleClassesStaffDto);
- int record = (int)Math.ceil((double) count / (double) MAX_ROW);
+ int record = (int) Math.ceil((double) count / (double) MAX_ROW);
List<ScheduleClassesStaffDto> scheduleClassesStaffDtos = null;
- for(int page = 1;page <= record; page++){
+ for (int page = 1; page <= record; page++) {
scheduleClassesStaffDto.setPage(page);
scheduleClassesStaffDto.setRow(MAX_ROW);
scheduleClassesStaffDtos = scheduleClassesStaffV1InnerServiceSMOImpl.queryScheduleClassesStaffs(scheduleClassesStaffDto);
@@ -95,29 +92,28 @@
computeStaffCurMonthWorkday(tmpScheduleClassesStaffDto, reqJson);
}
- appendData(scheduleClassesStaffDtos,sheet,(page-1)*MAX_ROW);
+ appendData(scheduleClassesStaffDtos, sheet, (page - 1) * MAX_ROW);
}
}
- private void appendData(List<ScheduleClassesStaffDto> scheduleClassesStaffDtos,Sheet sheet,int step) {
+ private void appendData(List<ScheduleClassesStaffDto> scheduleClassesStaffDtos, Sheet sheet, int step) {
Row row = null;
ScheduleClassesStaffDto scheduleClassesStaffDto = null;
String cellValue = "";
ScheduleClassesDayDto day = null;
for (int roomIndex = 0; roomIndex < scheduleClassesStaffDtos.size(); roomIndex++) {
- row = sheet.createRow(roomIndex +step + 1);
- scheduleClassesStaffDto = scheduleClassesStaffDtos.get(0);
+ row = sheet.createRow(roomIndex + step + 1);
+ scheduleClassesStaffDto = scheduleClassesStaffDtos.get(roomIndex);
row.createCell(0).setCellValue(scheduleClassesStaffDto.getStaffName());
- for(int dayIndex = 1 ; dayIndex <= scheduleClassesStaffDto.getDays().size(); dayIndex++) {
-
- day = scheduleClassesStaffDto.getDays().get(dayIndex);
- if(!ScheduleClassesDayDto.WORKDAY_NORMAL.equals(day.getWorkday())){
- cellValue= "浼戞伅";
- }else{
- cellValue= "姝ｅ父涓婁笅鐝�";
- for(ScheduleClassesTimeDto time : day.getTimes()){
- cellValue +=(time.getStartTime()+"-"+time.getEndTime());
+ for (int dayIndex = 1; dayIndex <= scheduleClassesStaffDto.getDays().size(); dayIndex++) {
+ day = scheduleClassesStaffDto.getDays().get(dayIndex-1);
+ if (ScheduleClassesDayDto.WORKDAY_NO.equals(day.getWorkday())) {
+ cellValue = "浼戞伅";
+ } else {
+ cellValue = day.getWorkdayName()+"\r\n";
+ for (ScheduleClassesTimeDto time : day.getTimes()) {
+ cellValue += (time.getStartTime() + "-" + time.getEndTime());
}
}
row.createCell(dayIndex).setCellValue(cellValue);
@@ -166,7 +162,6 @@
}
-
}
private void doDay(ScheduleClassesStaffDto scheduleClassesStaffDto,
@@ -179,11 +174,11 @@
int curDay = 1;
for (int day = 1; day <= maxDay; day++) {
scDay = new ScheduleClassesDayDto();
- String today = curMonth + "-"+day;
+ String today = curMonth + "-" + day;
int scheduleCycle = Integer.parseInt(scheduleClassesDto.getScheduleCycle());
- int allDay = DateUtil.daysBetween(scheduleClassesDto.getComputeTime(), today)+1;
+ int allDay = DateUtil.daysBetween(scheduleClassesDto.getComputeTime(), today) + 1;
curDay = allDay % scheduleCycle;
//
// if (curDay == 0 && day == 1) {
@@ -197,15 +192,14 @@
}
-
- scDay.setDay(day+"");
+ scDay.setDay(day + "");
//璁＄畻 鎺掔彮
- for(ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos){
- if((curDay+"").equals(scheduleClassesDayDto1.getDay())){
+ for (ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos) {
+ if ((curDay + "").equals(scheduleClassesDayDto1.getDay())) {
tmpScheduleClassesDayDto = scheduleClassesDayDto1;
}
}
- if(tmpScheduleClassesDayDto != null ){
+ if (tmpScheduleClassesDayDto != null) {
scDay.setWorkday(tmpScheduleClassesDayDto.getWorkday());
scDay.setTimes(tmpScheduleClassesDayDto.getTimes());
}
@@ -227,7 +221,7 @@
for (int day = 1; day <= maxDay; day++) {
scDay = new ScheduleClassesDayDto();
Calendar today = Calendar.getInstance();
- today.setTime(DateUtil.getDateFromStringB(curMonth + "-"+day));
+ today.setTime(DateUtil.getDateFromStringB(curMonth + "-" + day));
int week = today.get(Calendar.WEEK_OF_MONTH);
curDay = today.get(Calendar.DAY_OF_WEEK);
@@ -242,21 +236,21 @@
}
}
- scDay.setDay(day+"");
+ scDay.setDay(day + "");
//璁＄畻 鎺掔彮
- for(ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos){
- if((curDay+"").equals(scheduleClassesDayDto1.getDay()) && (week+"").equals(scheduleClassesDayDto1.getWeekFlag())){
+ for (ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos) {
+ if ((curDay + "").equals(scheduleClassesDayDto1.getDay()) && (week + "").equals(scheduleClassesDayDto1.getWeekFlag())) {
tmpScheduleClassesDayDto = scheduleClassesDayDto1;
}
}
- if(tmpScheduleClassesDayDto == null){ // 娌℃湁璁剧疆鍛�
- for(ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos){
- if((curDay+"").equals(scheduleClassesDayDto1.getDay())){
+ if (tmpScheduleClassesDayDto == null) { // 娌℃湁璁剧疆鍛�
+ for (ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos) {
+ if ((curDay + "").equals(scheduleClassesDayDto1.getDay())) {
tmpScheduleClassesDayDto = scheduleClassesDayDto1;
}
}
}
- if(tmpScheduleClassesDayDto != null ){
+ if (tmpScheduleClassesDayDto != null) {
scDay.setWorkday(tmpScheduleClassesDayDto.getWorkday());
scDay.setTimes(tmpScheduleClassesDayDto.getTimes());
}
@@ -279,14 +273,14 @@
for (int day = 1; day <= maxDay; day++) {
scDay = new ScheduleClassesDayDto();
curDay = day;
- scDay.setDay(day+"");
+ scDay.setDay(day + "");
//璁＄畻 鎺掔彮
- for(ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos){
- if((curDay+"").equals(scheduleClassesDayDto1.getDay())){
+ for (ScheduleClassesDayDto scheduleClassesDayDto1 : scheduleClassesDayDtos) {
+ if ((curDay + "").equals(scheduleClassesDayDto1.getDay())) {
tmpScheduleClassesDayDto = scheduleClassesDayDto1;
}
}
- if(tmpScheduleClassesDayDto != null ){
+ if (tmpScheduleClassesDayDto != null) {
scDay.setWorkday(tmpScheduleClassesDayDto.getWorkday());
scDay.setTimes(tmpScheduleClassesDayDto.getTimes());
}
@@ -295,7 +289,6 @@
scheduleClassesStaffDto.setDays(days);
}
-
}
--
Gitblit v1.8.0