|
@@ -2564,6 +2564,25 @@ public class IotRdDailyReportController {
|
|
|
reportVO.setRdStatusLabel(constructStatusPair.get(reportVO.getRdStatus()));
|
|
reportVO.setRdStatusLabel(constructStatusPair.get(reportVO.getRdStatus()));
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ BigDecimal accidentTime = reportVO.getAccidentTime();
|
|
|
|
|
+ BigDecimal repairTime = reportVO.getRepairTime();
|
|
|
|
|
+ BigDecimal selfStopTime = reportVO.getSelfStopTime();
|
|
|
|
|
+ BigDecimal complexityTime = reportVO.getComplexityTime();
|
|
|
|
|
+ BigDecimal relocationTime = reportVO.getRelocationTime();
|
|
|
|
|
+ BigDecimal rectificationTime = reportVO.getRectificationTime();
|
|
|
|
|
+ BigDecimal waitingStopTime = reportVO.getWaitingStopTime();
|
|
|
|
|
+ BigDecimal winterBreakTime = reportVO.getWinterBreakTime();
|
|
|
|
|
+ BigDecimal partyaDesignTime = reportVO.getPartyaDesign();
|
|
|
|
|
+ BigDecimal partyaPrepareTime = reportVO.getPartyaPrepare();
|
|
|
|
|
+ BigDecimal partyaResourceTime = reportVO.getPartyaResource();
|
|
|
|
|
+ BigDecimal otherNptTime = reportVO.getOtherNptTime();
|
|
|
|
|
+ if (accidentTime.compareTo(BigDecimal.ZERO) > 0 || repairTime.compareTo(BigDecimal.ZERO) > 0 || selfStopTime.compareTo(BigDecimal.ZERO) > 0
|
|
|
|
|
+ || complexityTime.compareTo(BigDecimal.ZERO) > 0 || relocationTime.compareTo(BigDecimal.ZERO) > 0 || rectificationTime.compareTo(BigDecimal.ZERO) > 0
|
|
|
|
|
+ || waitingStopTime.compareTo(BigDecimal.ZERO) > 0 || winterBreakTime.compareTo(BigDecimal.ZERO) > 0 || partyaDesignTime.compareTo(BigDecimal.ZERO) > 0
|
|
|
|
|
+ || partyaPrepareTime.compareTo(BigDecimal.ZERO) > 0 || partyaResourceTime.compareTo(BigDecimal.ZERO) > 0 || otherNptTime.compareTo(BigDecimal.ZERO) > 0) {
|
|
|
|
|
+ // 设置非生产时间填写标识
|
|
|
|
|
+ reportVO.setNonProductFlag(true);
|
|
|
|
|
+ }
|
|
|
// 创建时间 格式化 yyyy-MM-dd
|
|
// 创建时间 格式化 yyyy-MM-dd
|
|
|
if (ObjUtil.isNotEmpty(reportVO.getCreateTime())) {
|
|
if (ObjUtil.isNotEmpty(reportVO.getCreateTime())) {
|
|
|
reportVO.setCreateTimeStr(LocalDateTimeUtil.format(reportVO.getCreateTime(), DatePattern.NORM_DATE_PATTERN));
|
|
reportVO.setCreateTimeStr(LocalDateTimeUtil.format(reportVO.getCreateTime(), DatePattern.NORM_DATE_PATTERN));
|