xzzn/emsback
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
Conversation 0 Commits 349 Files Changed 375 +15484 -893
176 changed files with 15484 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9fcc81fbac - Show all commits

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

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

2
ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml
View File

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