From 293227934aae7c8add6d1ad761cbf40d37e370fe Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Wed, 19 Mar 2025 09:36:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=8A=A5=E8=A1=A8bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/logpm/report/dto/ReportCheckTimeDetailDTO.java    | 2 +-
 .../src/main/java/com/logpm/report/dto/ReportTimeDTO.java | 2 +-
 .../java/com/logpm/report/mapper/ReportTimeMapper.xml     | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

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 @@
         <if test="param.openTimeEnd != null">
             and lta.create_time &lt;= #{param.openTimeEnd}
         </if>
-        <if test="param.overTimeStatus != null and param.overTimeStatus == 0">
+        <if test="param.isOverTime != null and param.isOverTime == 0">
             and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) &lt;= #{param.hoursTime}
         </if>
-        <if test="param.overTimeStatus != null and param.overTimeStatus == 1">
+        <if test="param.isOverTime != null and param.isOverTime == 1">
             and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime}
         </if>
 
@@ -1916,10 +1916,10 @@
         <if test="param.openTimeEnd != null">
             and lta.create_time &lt;= #{param.openTimeEnd}
         </if>
-        <if test="param.overTimeStatus != null and param.overTimeStatus == 0">
+        <if test="param.isOverTime != null and param.isOverTime == 0">
             and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) &lt;= #{param.hoursTime}
         </if>
-        <if test="param.overTimeStatus != null and param.overTimeStatus == 1">
+        <if test="param.isOverTime != null and param.isOverTime == 1">
             and round(TIMESTAMPDIFF(SECOND, lta.create_time, lww.create_time)/3600,1) > #{param.hoursTime}
         </if>