ems-system/src/main/java/com/xzzn/ems/domain/EmsStrategyTempTimeConfig.java

@@ -41,7 +41,7 @@ public class EmsStrategyTempTimeConfig extends BaseEntity
 
     /** 模板id */
     @Excel(name = "模板id")
-    private Long  templateId;
+    private String  templateId;
 
     public void setId(Long id)
     {
@@ -93,12 +93,12 @@ public class EmsStrategyTempTimeConfig extends BaseEntity
         return chargeStatus;
     }
 
-    public void setTemplateId(Long  templateId)
+    public void setTemplateId(String  templateId)
     {
         this.templateId = templateId;
     }
 
-    public Long  getTemplateId()
+    public String  getTemplateId()
     {
         return templateId;
     }

ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml

@@ -95,7 +95,7 @@
     </delete>
 
     <select id="getStrategyTimeList" parameterType="EmsStrategyTimeConfig" resultType="com.xzzn.ems.domain.vo.StrategyTimeConfigVo">
-        select  t.id,
+        select  distinct t.id,
                 t.month,
                 t.charge_discharge_mode as chargeDischargeMode,
                 t.template_id as templateId,