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 +15485 -893
176 changed files with 15485 additions and 893 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 41656581ca - Show all commits

3
ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java
View File

@ -55,6 +55,7 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
String templateId = requestVo.getTemplateId(); String templateId = requestVo.getTemplateId();
if (StringUtils.isEmpty(templateId)) { if (StringUtils.isEmpty(templateId)) {
templateId = PREFIX + DateUtils.dateTimeNow(); templateId = PREFIX + DateUtils.dateTimeNow();
} }
EmsStrategyTemp publicTemp = new EmsStrategyTemp(); EmsStrategyTemp publicTemp = new EmsStrategyTemp();
@ -66,8 +67,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
if (timeList != null && !timeList.isEmpty()) { if (timeList != null && !timeList.isEmpty()) {
for (EmsStrategyTempTimeConfig timeConfig : timeList) { for (EmsStrategyTempTimeConfig timeConfig : timeList) {
EmsStrategyTemp temp = new EmsStrategyTemp(); EmsStrategyTemp temp = new EmsStrategyTemp();
BeanUtils.copyProperties(publicTemp, temp);
BeanUtils.copyProperties(timeConfig, temp); BeanUtils.copyProperties(timeConfig, temp);
BeanUtils.copyProperties(publicTemp, temp);
emsStrategyTempMapper.insertEmsStrategyTemp(temp); emsStrategyTempMapper.insertEmsStrategyTemp(temp);
} }
} else {// 无时间配置只配置模板基本信息 } else {// 无时间配置只配置模板基本信息