|
|
@@ -108,7 +108,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
Integer[] status = {1, 4}; |
|
|
|
map.put("status", status); |
|
|
|
} |
|
|
|
if (map.containsKey("driverArea") && !"".equals(map.get("driverArea"))) { |
|
|
|
if (map.containsKey("driverArea") && !StringUtils.isEmpty(map.get("driverArea"))) { |
|
|
|
map.put("driverArea", BigInteger.valueOf(Long.valueOf(map.get("driverArea").toString()))); |
|
|
|
} else { |
|
|
|
map.remove("driverArea"); |
|
|
@@ -301,7 +301,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
reportInputDTO.setFormatInputUser(StringUtils.isEmpty(inputUser) ? "" : inputUser.getRealname()); |
|
|
|
} |
|
|
|
if (!StringUtils.isEmpty(reportInputDTO.getInputTime())) { |
|
|
|
reportInputDTO.setFormatInputTime(DateUtil.format(reportInputDTO.getInputTime(), format)); |
|
|
|
reportInputDTO.setFormatInputTime(DateUtil.format(reportInputDTO.getInputTime(), "yyyy-MM-dd")); |
|
|
|
} |
|
|
|
TauvInspectDriver driver = inspectDriverMapper.selectById(reportInputDTO.getInspectDriverId()); |
|
|
|
reportInputDTO.setNum(driver.getNum()); |
|
|
@@ -847,7 +847,7 @@ public class TauvReportServiceImpl extends BaseServiceImpl<TauvReportMapper, Tau |
|
|
|
} |
|
|
|
if (reportDTO.getInputTime() != null) { |
|
|
|
reportDTO.setCreateTime(reportDTO.getInputTime()); |
|
|
|
reportDTO.setFormatInputTime(DateUtil.format(reportDTO.getInputTime(), "yyyy-MM-dd HH:mm:ss")); |
|
|
|
reportDTO.setFormatInputTime(DateUtil.format(reportDTO.getInputTime(), "yyyy-MM-dd")); |
|
|
|
} else { |
|
|
|
reportDTO.setFormatInputTime(""); |
|
|
|
} |