Merge remote-tracking branch 'origin/pre-production'

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

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超时
 
 
 

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>