Merge remote-tracking branch 'origin/main'

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));

ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java

@@ -4,8 +4,10 @@ import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 import com.ruoyi.kaohe.domain.KhPcEmp;
+import com.ruoyi.kaohe.domain.KhPingce;
 import com.ruoyi.kaohe.domain.KhVoteEmp;
 import com.ruoyi.kaohe.service.IKhPcEmpService;
+import com.ruoyi.kaohe.service.IKhPingceService;
 import com.ruoyi.kaohe.service.IKhVoteEmpService;
 import org.springframework.scheduling.annotation.Scheduled;
 import java.math.BigDecimal;
@@ -44,6 +46,8 @@ public class KhVoteController extends BaseController {
     private IKhPcEmpService pcEmpService;
     @Autowired
     private IKhVoteEmpService voteEmpService;
+    @Autowired
+    private IKhPingceService khPingceService;
 
     @Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次   监测时间修改评分状态
     public void performTask() {
@@ -60,14 +64,35 @@ public class KhVoteController extends BaseController {
             if (state.equals("0") && (now.after(sTime) && now.before(eTime))) {
                 vote.setState("1");
                 khVoteService.updateKhVote(vote);
-                System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务： " + vote.getVoteTitle() + "  状态为进行中");
+                System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务： " +vote.getId()+" "+ vote.getVoteTitle() + "  状态为进行中");
             }
             if (now.after(eTime)) {
                 vote.setState("2");
                 khVoteService.updateKhVote(vote);
-                System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务： " + vote.getVoteTitle() + "  状态为已完成");
+                System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改评分任务： " +vote.getId()+" "+ vote.getVoteTitle() + "  状态为已完成");
             }
         }
+        //修改考核任务状态，当考核任务下所有评分都为已完成时，修改考核任务状态为已完成
+        KhPingce param = new KhPingce();
+        param.setState("1");
+        List<KhPingce> pingces = khPingceService.selectKhPingceList(param);
+        for (KhPingce pingce : pingces) {
+            boolean finishflag=true;
+            KhVote khVote = new KhVote();
+            khVote.setPingceId(pingce.getId());
+            List<KhVote> khVotes = khVoteService.selectKhVoteList(khVote);
+            for (KhVote vote : khVotes) {
+                if(!vote.getState().equals("2")){
+                    finishflag=false;
+                }
+            }
+          if(finishflag){
+              pingce.setState("2");
+              khPingceService.updateKhPingce(pingce);
+              System.out.println("执行定时任务: " + System.currentTimeMillis() + " 修改考核任务： " +pingce.getId()+" "+ pingce.getPcTitle() + "  状态为已完成");
+          }
+        }
+
     }
 
     /**

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