diff --git a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java index 0754ce5..0dc81b6 100644 --- a/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java +++ b/ems-system/src/main/java/com/xzzn/ems/mapper/EmsStrategyTimeConfigMapper.java @@ -62,4 +62,7 @@ public interface EmsStrategyTimeConfigMapper // 获取该策略下的时间配置 public List getStrategyTimeList(EmsStrategyTimeConfig emsStrategyTimeConfig); + + // 删除模板时间配置 + public void deleteTimeConfigByTemplateId(String templateId); } diff --git a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java index 32b08eb..1674340 100644 --- a/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java +++ b/ems-system/src/main/java/com/xzzn/ems/service/impl/EmsStrategyTempServiceImpl.java @@ -8,6 +8,7 @@ import com.xzzn.common.utils.StringUtils; import com.xzzn.common.utils.bean.BeanUtils; import com.xzzn.ems.domain.EmsStrategyTempTimeConfig; import com.xzzn.ems.domain.vo.StrategyTempConfigRequest; +import com.xzzn.ems.mapper.EmsStrategyTimeConfigMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.xzzn.ems.mapper.EmsStrategyTempMapper; @@ -27,6 +28,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService private static final String PREFIX= "Temp"; @Autowired private EmsStrategyTempMapper emsStrategyTempMapper; + @Autowired + private EmsStrategyTimeConfigMapper emsStrategyTimeConfigMapper; /** * 查询模板列表 @@ -102,6 +105,8 @@ public class EmsStrategyTempServiceImpl implements IEmsStrategyTempService @Override public int deleteStrategyTempById(String templateId) { + // 先删除模板的时间配置 + emsStrategyTimeConfigMapper.deleteTimeConfigByTemplateId(templateId); return emsStrategyTempMapper.deleteTempByTempId(templateId); } } diff --git a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml index 1e526f9..397ae7a 100644 --- a/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml +++ b/ems-system/src/main/resources/mapper/ems/EmsStrategyTimeConfigMapper.xml @@ -101,10 +101,13 @@ t.template_id as templateId, temp.template_name as templateName 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} and t.strategy_id = #{strategyId} order by month + + delete from ems_strategy_time_config where template_id = #{templateId} + \ No newline at end of file