From 4549f1863701a0b128af12832bef2e1037dfeaec Mon Sep 17 00:00:00 2001
From: zhaokai <zhaokai@zcloudchina.com>
Date: Tue, 30 Jun 2026 15:08:50 +0800
Subject: [PATCH] =?UTF-8?q?fix(config):=20=E6=9B=B4=E6=96=B0=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=96=87=E4=BB=B6=E5=B9=B6=E4=BC=98=E5=8C=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E5=BA=93=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 start/src/main/resources/bootstrap.yml                        | 4 ++--
 .../java/com/zcloud/safety/receive/BusCalendarController.java | 1 +
 web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/start/src/main/resources/bootstrap.yml b/start/src/main/resources/bootstrap.yml
index ec451cc..fda3619 100644
--- a/start/src/main/resources/bootstrap.yml
+++ b/start/src/main/resources/bootstrap.yml
@@ -4,6 +4,6 @@ spring:
 #      - classpath:nacos.yml
 #      - classpath:sdk.yml
       - classpath:nacos-prod.yml
-#      - classpath:sdk-prod.yml
-      - classpath:sdk-prod-gwj.yml
+      - classpath:sdk-prod.yml
+#      - classpath:sdk-prod-gwj.yml
       - classpath:swagger.yml
diff --git a/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java b/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
index 9798654..6398cad 100644
--- a/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
+++ b/web-adapter/src/main/java/com/zcloud/safety/receive/BusCalendarController.java
@@ -56,6 +56,7 @@ public class BusCalendarController {
             }
 
             String decryptValue = EncryptAndDecryptUtil.decryptSm4(EncryptAndDecryptUtil.decryptSm2(key), value);
+            log.info("接收数港安全月历审核结果成功，解密报文：{}", decryptValue);
             SgCalendarAuditDTO auditDTO = JSON.parseObject(decryptValue, SgCalendarAuditDTO.class);
             String validateMessage = validateAudit(auditDTO);
             if (validateMessage != null) {
diff --git a/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml b/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
index 5b33c9d..21566e2 100644
--- a/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
+++ b/web-infrastructure/src/main/resources/mapper/SgDutyMapper.xml
@@ -39,10 +39,10 @@
                 AND duty_phone LIKE CONCAT('%', #{params.dutyPhone}, '%')
             </if>
             <if test="params.startDutyTime != null and params.startDutyTime != ''">
-                AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)) &gt;= #{params.startDutyTime}
+                AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', -1)), 10) &gt;= LEFT(#{params.startDutyTime}, 10)
             </if>
             <if test="params.endDutyTime != null and params.endDutyTime != ''">
-                AND TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)) &lt;= #{params.endDutyTime}
+                AND LEFT(TRIM(SUBSTRING_INDEX(CONCAT(duty_time, '~', duty_time), '~', 1)), 10) &lt;= LEFT(#{params.endDutyTime}, 10)
             </if>
         </where>
         ORDER BY create_time DESC