|
|
@ -59,10 +59,7 @@ import java.text.DecimalFormat; |
|
|
|
import java.time.Duration; |
|
|
|
import java.time.Duration; |
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.time.LocalDateTime; |
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.time.format.DateTimeFormatter; |
|
|
|
import java.util.Arrays; |
|
|
|
import java.util.*; |
|
|
|
import java.util.Date; |
|
|
|
|
|
|
|
import java.util.List; |
|
|
|
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
@ -518,7 +515,7 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ |
|
|
|
header_row_cell_0.setCellValue(i + 1); |
|
|
|
header_row_cell_0.setCellValue(i + 1); |
|
|
|
// 设备名称
|
|
|
|
// 设备名称
|
|
|
|
HSSFCell header_row_cell_1 = detail_row.getCell(1); |
|
|
|
HSSFCell header_row_cell_1 = detail_row.getCell(1); |
|
|
|
header_row_cell_1.setCellValue(task.getEmName()); |
|
|
|
header_row_cell_1.setCellValue(Optional.ofNullable(task.getEmName()).orElse("")); |
|
|
|
// 计划开始时间
|
|
|
|
// 计划开始时间
|
|
|
|
HSSFCell header_row_cell_2 = detail_row.getCell(2); |
|
|
|
HSSFCell header_row_cell_2 = detail_row.getCell(2); |
|
|
|
header_row_cell_2.setCellValue(DateUtil.format(task.getPlanStartTime(),DateUtil.PATTERN_DATETIME)); |
|
|
|
header_row_cell_2.setCellValue(DateUtil.format(task.getPlanStartTime(),DateUtil.PATTERN_DATETIME)); |
|
|
@ -527,10 +524,10 @@ public class AccessPlanV4ServiceImpl implements AccessPlanV4Service{ |
|
|
|
header_row_cell_3.setCellValue(DateUtil.format(task.getPlanEndTime(),DateUtil.PATTERN_DATETIME)); |
|
|
|
header_row_cell_3.setCellValue(DateUtil.format(task.getPlanEndTime(),DateUtil.PATTERN_DATETIME)); |
|
|
|
// 计划工时
|
|
|
|
// 计划工时
|
|
|
|
HSSFCell header_row_cell_4 = detail_row.getCell(4); |
|
|
|
HSSFCell header_row_cell_4 = detail_row.getCell(4); |
|
|
|
header_row_cell_4.setCellValue(task.getPlanHours()); |
|
|
|
header_row_cell_4.setCellValue(Optional.ofNullable(task.getPlanHours()).orElse(0)); |
|
|
|
// 检修负责人
|
|
|
|
// 检修负责人
|
|
|
|
HSSFCell header_row_cell_7 = detail_row.getCell(7); |
|
|
|
HSSFCell header_row_cell_7 = detail_row.getCell(7); |
|
|
|
header_row_cell_7.setCellValue(task.getHeadName()); |
|
|
|
header_row_cell_7.setCellValue(Optional.ofNullable(task.getHeadName()).orElse("")); |
|
|
|
} |
|
|
|
} |
|
|
|
// 检修项目
|
|
|
|
// 检修项目
|
|
|
|
HSSFCell header_row_cell_5 = detail_row.getCell(5); |
|
|
|
HSSFCell header_row_cell_5 = detail_row.getCell(5); |
|
|
|