From 819e4cd3a7fa95e114b42bca049c2b6914142e70 Mon Sep 17 00:00:00 2001
From: mashili <m18306189712@163.com>
Date: Sun, 13 Jul 2025 14:14:07 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E9=85=8D=E7=BD=AE-=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java     | 6 +++---
 .../java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java   | 6 +++---
 .../resources/mapper/ems/EmsStrategyTimeConfigMapper.xml    | 2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java
index 5ba82ef..de02b59 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTimeConfig.java
@@ -36,7 +36,7 @@ public class EmsStrategyTimeConfig extends BaseEntity
 
     /** 模版id */
     @Excel(name = "模版id")
-    private Long templateId;
+    private String templateId;
 
     public void setId(Long id)
     {
@@ -88,12 +88,12 @@ public class EmsStrategyTimeConfig extends BaseEntity
         return siteId;
     }
 
-    public void setTemplateId(Long templateId)
+    public void setTemplateId(String templateId)
     {
         this.templateId = templateId;
     }
 
-    public Long getTemplateId()
+    public String getTemplateId()
     {
         return templateId;
     }
diff --git a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java
index 18862ce..4d7a202 100644
--- a/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java
+++ b/ems-system/src/main/java/com/xzzn/ems/domain/vo/StrategyTimeConfigVo.java
@@ -24,7 +24,7 @@ public class StrategyTimeConfigVo
     private String chargeDischargeMode;
 
     /** 模板id */
-    private Long templateId;
+    private String templateId;
 
     /** 模板名称 */
     private String templateName;
@@ -79,12 +79,12 @@ public class StrategyTimeConfigVo
         return siteId;
     }
 
-    public void setTemplateId(Long templateId)
+    public void setTemplateId(String templateId)
     {
         this.templateId = templateId;
     }
 
-    public Long getTemplateId()
+    public String getTemplateId()
     {
         return templateId;
     }
diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
index e67ef9e..1e526f9 100644
--- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
+++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
@@ -29,7 +29,7 @@
             <if test="month != null "> and month = #{month}</if>
             <if test="chargeDischargeMode != null  and chargeDischargeMode != ''"> and charge_discharge_mode = #{chargeDischargeMode}</if>
             <if test="siteId != null  and siteId != ''"> and site_id = #{siteId}</if>
-            <if test="templateId != null "> and template_id = #{templateId}</if>
+            <if test="templateId != null  and templateId != ''"> and template_id = #{templateId}</if>
         </where>
     </select>