diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java index ad2bfe8..8fa43cd 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhPingceController.java @@ -147,7 +147,7 @@ public class KhPingceController extends BaseController { for (Long id : ids) { KhPingce khPingce = khPingceService.selectKhPingceById(id); if (!khPingce.getState().equals("0")) { - return AjaxResult.error("评测:" + khPingce.getPcTitle() + " 不是未开始状态,不允许删除"); + return AjaxResult.error("评测:" + khPingce.getPcTitle() + " 当前状态不能删除"); } } return toAjax(khPingceService.deleteKhPingceByIds(ids)); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhPingceServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhPingceServiceImpl.java index b81d4e2..e354f76 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhPingceServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhPingceServiceImpl.java @@ -1,12 +1,17 @@ package com.ruoyi.kaohe.service.impl; import java.util.List; +import java.util.stream.Collectors; + import com.ruoyi.common.utils.DateUtils; +import com.ruoyi.kaohe.domain.KhPcEmp; +import com.ruoyi.kaohe.mapper.KhPcEmpMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.kaohe.mapper.KhPingceMapper; import com.ruoyi.kaohe.domain.KhPingce; import com.ruoyi.kaohe.service.IKhPingceService; +import org.springframework.transaction.annotation.Transactional; /** * 考核评测Service业务层处理 @@ -19,6 +24,8 @@ public class KhPingceServiceImpl implements IKhPingceService { @Autowired private KhPingceMapper khPingceMapper; + @Autowired + private KhPcEmpMapper khPcEmpMapper; /** * 查询考核评测 @@ -77,9 +84,21 @@ public class KhPingceServiceImpl implements IKhPingceService * @return 结果 */ @Override + @Transactional public int deleteKhPingceByIds(Long[] ids) { - return khPingceMapper.deleteKhPingceByIds(ids); + int r = khPingceMapper.deleteKhPingceByIds(ids); + for (Long id : ids) { + //删除原来关联 + KhPcEmp query = new KhPcEmp(); + query.setPcId(id); + List temItems = khPcEmpMapper.selectKhPcEmpList(query); + List pcEmpIds = temItems.stream().map(KhPcEmp::getId).collect(Collectors.toList()); + if (pcEmpIds != null && pcEmpIds.size() > 0) { + khPcEmpMapper.deleteKhPcEmpByIds(pcEmpIds.toArray(new Long[pcEmpIds.size()])); + } + } + return r; } /**