|
|
@@ -267,7 +267,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
SysCity cityInfo = iSysCityService.getInfoById(reportInputDTO.getDriverArea()); |
|
|
|
reportInputDTO.setDriverAreaText(StringUtils.isEmpty(cityInfo) ? "" : cityInfo.getName()); |
|
|
|
} |
|
|
|
reportInputDTO.setFormatInspectTime(StringUtils.isEmpty(reportInputDTO.getInspectTime()) ? "" : DateUtil.format(reportInputDTO.getInspectTime(), format)); |
|
|
|
reportInputDTO.setFormatInspectTime(StringUtils.isEmpty(reportInputDTO.getInspectTime()) ? "" : DateUtil.format(reportInputDTO.getInspectTime(), "yyyy-MM-dd")); |
|
|
|
if (!StringUtils.isEmpty(reportInputDTO.getVideoUrl())) { |
|
|
|
String videoUrl = reportInputDTO.getVideoUrl(); |
|
|
|
if (!videoUrl.contains("://")) { |
|
|
@@ -469,7 +469,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
data.put("reportCheckList", reportChecksList); |
|
|
|
} |
|
|
|
data.put("questionFileList", questionFileList); |
|
|
|
String format = "yyyy-MM-dd HH:mm:ss"; |
|
|
|
String format = "yyyy-MM-dd"; |
|
|
|
data.put("inspectTime", StringUtils.isEmpty(reportInfo.getInspectTime()) ? "" : DateUtil.format(reportInfo.getInspectTime(), format)); |
|
|
|
data.put("driverStart", reportInfo.getDriverStart()); |
|
|
|
data.put("driverEnd", reportInfo.getDriverEnd()); |
|
|
@@ -703,7 +703,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
} else { |
|
|
|
info.setDriverAreaText(""); |
|
|
|
} |
|
|
|
info.setFormatInspectTime(StringUtils.isEmpty(info.getInspectTime()) ? "" : DateUtil.format(info.getInspectTime(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
info.setFormatInspectTime(StringUtils.isEmpty(info.getInspectTime()) ? "" : DateUtil.format(info.getInspectTime(), "yyyy-MM-dd")); |
|
|
|
} |
|
|
|
return info; |
|
|
|
} |
|
|
@@ -852,7 +852,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
reportDTO.setFormatInputTime(""); |
|
|
|
} |
|
|
|
reportDTO.setStatusText(statusList.getOrDefault(reportDTO.getStatus().intValue(), "")); |
|
|
|
reportDTO.setFormatInspectTime(StringUtils.isEmpty(reportDTO.getInspectTime()) ? "" : DateUtil.format(reportDTO.getInspectTime(), format)); |
|
|
|
reportDTO.setFormatInspectTime(StringUtils.isEmpty(reportDTO.getInspectTime()) ? "" : DateUtil.format(reportDTO.getInspectTime(), "yyyy-MM-dd")); |
|
|
|
TauvInspectDriver driverInfo = inspectDriverMapper.selectById(reportDTO.getInspectDriverId()); |
|
|
|
if (!StringUtils.isEmpty(driverInfo)) { |
|
|
|
reportDTO.setNum(driverInfo.getNum()); |