diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java index 1afb0be4d..0c191e7bd 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportCheckTimeDetailDTO.java @@ -105,7 +105,7 @@ public class ReportCheckTimeDetailDTO implements Serializable { private String remark; private String consigneeAddress; - private Integer overTimeStatus; // 0未超时 1超时 + private Integer isOverTime; // 0未超时 1超时 // 总运单数 1 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java index 9f920fd29..7f9f50191 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/dto/ReportTimeDTO.java @@ -84,7 +84,7 @@ public class ReportTimeDTO implements Serializable { private String serviceNum; private String freezeStatus; private String waybillStatus; - private Integer overTimeStatus; // 0未超时 1超时 + private Integer isOverTime; // 0未超时 1超时 diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml index 176b94a02..aa2db686d 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml @@ -1740,10 +1740,10 @@ and lta.create_time <= #{param.openTimeEnd} - + and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) <= #{param.hoursTime} - + and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime} @@ -1916,10 +1916,10 @@ and lta.create_time <= #{param.openTimeEnd} - + and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) <= #{param.hoursTime} - + and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime}