考核任务删除时,未开始可删除且删除关联

main
hshansha 2 months ago
parent afd98719e6
commit 093bcf5a9e

@ -147,7 +147,7 @@ public class KhPingceController extends BaseController {
for (Long id : ids) { for (Long id : ids) {
KhPingce khPingce = khPingceService.selectKhPingceById(id); KhPingce khPingce = khPingceService.selectKhPingceById(id);
if (!khPingce.getState().equals("0")) { if (!khPingce.getState().equals("0")) {
return AjaxResult.error("评测:" + khPingce.getPcTitle() + " 不是未开始状态,不允许删除"); return AjaxResult.error("评测:" + khPingce.getPcTitle() + " 当前状态不能删除");
} }
} }
return toAjax(khPingceService.deleteKhPingceByIds(ids)); return toAjax(khPingceService.deleteKhPingceByIds(ids));

@ -1,12 +1,17 @@
package com.ruoyi.kaohe.service.impl; package com.ruoyi.kaohe.service.impl;
import java.util.List; import java.util.List;
import java.util.stream.Collectors;
import com.ruoyi.common.utils.DateUtils; 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.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.ruoyi.kaohe.mapper.KhPingceMapper; import com.ruoyi.kaohe.mapper.KhPingceMapper;
import com.ruoyi.kaohe.domain.KhPingce; import com.ruoyi.kaohe.domain.KhPingce;
import com.ruoyi.kaohe.service.IKhPingceService; import com.ruoyi.kaohe.service.IKhPingceService;
import org.springframework.transaction.annotation.Transactional;
/** /**
* Service * Service
@ -19,6 +24,8 @@ public class KhPingceServiceImpl implements IKhPingceService
{ {
@Autowired @Autowired
private KhPingceMapper khPingceMapper; private KhPingceMapper khPingceMapper;
@Autowired
private KhPcEmpMapper khPcEmpMapper;
/** /**
* *
@ -77,9 +84,21 @@ public class KhPingceServiceImpl implements IKhPingceService
* @return * @return
*/ */
@Override @Override
@Transactional
public int deleteKhPingceByIds(Long[] ids) 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<KhPcEmp> temItems = khPcEmpMapper.selectKhPcEmpList(query);
List<Long> 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;
} }
/** /**

Loading…
Cancel
Save