From 31d3591b34d4f26ad2ab207ca3044048d9adb9df Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 21 八月 2024 17:51:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 6af0943..572000a 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -89,9 +89,9 @@
         yu.unit_name,
         yp.start_time,
         yp.end_time,
-        yp.province_tag,
-        yp.important_tag,
-        yp.important_command_image_tag
+        CASE WHEN yp.province_tag = 0 THEN '' ELSE '鐪佸巺鐐逛綅' END AS provinceTagString,
+        CASE WHEN yp.important_tag = 0 THEN '' ELSE '閲嶇偣鐐逛綅' END AS importantTagString,
+        CASE WHEN yp.important_command_image_tag = 0 THEN '' ELSE '閲嶇偣鎸囨尌鍥惧儚' END AS importantCommandImageTagString
         FROM
         t_yw_point yp
         INNER JOIN t_monitor m ON yp.serial_number = m.serial_number

--
Gitblit v1.8.0