dev #2

Merged
dashixiong merged 349 commits from dev into main 2026-02-11 01:55:46 +00:00
176 changed files with 15484 additions and 893 deletions
Showing only changes of commit a0b83fc8a4 - Show all commits

View File

@ -62,4 +62,7 @@ public interface EmsStrategyTimeConfigMapper
// 获取该策略下的时间配置 // 获取该策略下的时间配置
public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig); public List<StrategyTimeConfigVo> getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig);
// 删除模板时间配置
public void deleteTimeConfigByTemplateId(String templateId);
} }

View File

@ -8,6 +8,7 @@ import com.xzzn.common.utils.StringUtils;
import com.xzzn.common.utils.bean.BeanUtils; import com.xzzn.common.utils.bean.BeanUtils;
import com.xzzn.ems.domain.EmsStrategyTempTimeConfig; import com.xzzn.ems.domain.EmsStrategyTempTimeConfig;
import com.xzzn.ems.domain.vo.StrategyTempConfigRequest; import com.xzzn.ems.domain.vo.StrategyTempConfigRequest;
import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.xzzn.ems.mapper.EmsStrategyTempMapper; import com.xzzn.ems.mapper.EmsStrategyTempMapper;
@ -27,6 +28,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
private static final String PREFIX= "Temp"; private static final String PREFIX= "Temp";
@Autowired @Autowired
private EmsStrategyTempMapper emsStrategyTempMapper; private EmsStrategyTempMapper emsStrategyTempMapper;
@Autowired
private EmsStrategyTimeConfigMapper emsStrategyTimeConfigMapper;
/** /**
* 查询模板列表 * 查询模板列表
@ -102,6 +105,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService
@Override @Override
public int deleteStrategyTempById(String templateId) { public int deleteStrategyTempById(String templateId) {
// 先删除模板的时间配置
emsStrategyTimeConfigMapper.deleteTimeConfigByTemplateId(templateId);
return emsStrategyTempMapper.deleteTempByTempId(templateId); return emsStrategyTempMapper.deleteTempByTempId(templateId);
} }
} }

View File

@ -101,10 +101,13 @@
t.template_id as templateId, t.template_id as templateId,
temp.template_name as templateName temp.template_name as templateName
from ems_strategy_time_config t from ems_strategy_time_config t
LEFT JOIN ems_strategy_temp temp on t.template_id = temp.id LEFT JOIN ems_strategy_temp temp on t.template_id = temp.template_id
where t.site_id = #{siteId} where t.site_id = #{siteId}
and t.strategy_id = #{strategyId} and t.strategy_id = #{strategyId}
order by month order by month
</select> </select>
<delete id="deleteTimeConfigByTemplateId" parameterType="String">
delete from ems_strategy_time_config where template_id = #{templateId}
</delete>
</mapper> </mapper>