From 093bcf5a9eac931038ca8991bcdeb29853bd2020 Mon Sep 17 00:00:00 2001
From: hshansha <qingkongguiyatou@126.com>
Date: Mon, 27 Oct 2025 12:30:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E6=A0=B8=E4=BB=BB=E5=8A=A1=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E6=97=B6=EF=BC=8C=E6=9C=AA=E5=BC=80=E5=A7=8B=E5=8F=AF?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=B8=94=E5=88=A0=E9=99=A4=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kaohe/controller/KhPingceController.java  |  2 +-
 .../service/impl/KhPingceServiceImpl.java     | 21 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 2 deletions(-)

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<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;
     }
 
     /**