From fc91f1c3c0c52372b07587e292753473643574d5 Mon Sep 17 00:00:00 2001
From: Zangzhipeng <lybluers@163.com>
Date: Fri, 2 Aug 2024 13:21:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=9A=90=E6=82=A3=E6=8E=92?=
 =?UTF-8?q?=E6=9F=A5=E6=8E=A5=E5=8F=A3=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../server_api/controller/HighDangerController.java       | 8 ++++----
 .../src/main/resources/sql-mapper/HighDangerMapper.xml    | 4 ++++
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
index 431a8b4..8b4ac69 100644
--- a/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
+++ b/hiatmp-hidden-danger-server/src/main/java/com/hisense/hiatmp/server_api/controller/HighDangerController.java
@@ -174,7 +174,7 @@ public class HighDangerController {
                 diffHours = Math.abs(diffHours);
 
                 int comparison = nowDate.compareTo(pcEndTime);
-                if (comparison < 0) { // 超期逻辑
+                if (comparison > 0) { // 超期逻辑
                     if (diffHours < 1) {
                         base.setDeadlineStatus("超期不足一小时");
                         base.setDeadlineType("1");
@@ -192,7 +192,7 @@ public class HighDangerController {
                     base.setDeadline(diffDays);
                     base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时");
                     base.setDeadlineType("1");
-                } else if (comparison > 0 && diffDays <= 3) { // 临期逻辑
+                } else if (comparison < 0 && diffDays <= 3) { // 临期逻辑
                     if (diffHours < 1) {
                         base.setDeadlineStatus("临期不足一小时");
                         base.setDeadlineType("2");
@@ -233,7 +233,7 @@ public class HighDangerController {
                 diffHours = Math.abs(diffHours);
 
                 int comparison = nowDate.compareTo(pcStartTime);
-                if (comparison < 0) { // 超期
+                if (comparison > 0) { // 超期
                     if (diffHours < 1) {
                         base.setDeadlineStatus("超期不足一小时");
                         base.setDeadlineType("1");
@@ -251,7 +251,7 @@ public class HighDangerController {
                     base.setDeadline(diffDays);
                     base.setDeadlineStatus("超期" + diffDays + "天" + remainingHours + "小时");
                     base.setDeadlineType("1");
-                } else if (comparison > 0 && diffDays <= termTime) { // 临期
+                } else if (comparison < 0 && diffDays <= termTime) { // 临期
                     if (diffHours < 1) {
                         base.setDeadlineStatus("临期不足一小时");
                         base.setDeadlineType("2");
diff --git a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
index 166cf47..83b6801 100644
--- a/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
+++ b/hiatmp-hidden-danger-server/src/main/resources/sql-mapper/HighDangerMapper.xml
@@ -10,6 +10,7 @@
          business_id,
          name,
          type,
+         operator,
          source,
          find_way,
          area,
@@ -27,6 +28,7 @@
              #{businessId},
              #{name},
              #{type},
+             #{operator},
              #{source},
              #{findWay},
              #{area},
@@ -45,11 +47,13 @@
         insert into tht_hidden_danger_road
         (nid,
          business_id,
+         section_code,
          pc_count)
         values
             (
                 #{nid},
                 #{businessId},
+                #{sectionCode},
                 #{pcCount}
             )
     </insert>