From afbec553f03f99dd32c269b68b5437461d7bf891 Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 12 Nov 2025 16:01:35 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/kaohe/controller/KhPingceController.java | 12 +++++++++--- .../ruoyi/kaohe/controller/KhVoteEmpController.java | 8 ++++---- .../com/ruoyi/kaohe/service/IKhVoteEmpService.java | 2 +- .../kaohe/service/impl/KhKhrwResultServiceImpl.java | 8 ++++---- .../kaohe/service/impl/KhVoteEmpServiceImpl.java | 5 ++++- 5 files changed, 22 insertions(+), 13 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 d9e3bb4..1dc8fe2 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 @@ -247,7 +247,7 @@ public class KhPingceController extends BaseController { * ids有值 按任务id-----修改所有关联的vote的voteemp数据为原始状态 */ // @PreAuthorize("@ss.hasPermi('kaohe:pingce:remove')") - @Log(title = "任务清除打分数据", businessType = BusinessType.DELETE) + @Log(title = "任务清除已打分数据", businessType = BusinessType.DELETE) @DeleteMapping("/clean") @Transactional public AjaxResult removeTest(@RequestParam Long[] ids) { @@ -260,6 +260,12 @@ public class KhPingceController extends BaseController { List vIds = votes.stream().map(KhVote::getId).collect(Collectors.toList()); //修改voteemp for (Long vId : vIds) { + //修改投票为未统计计算平均分、最终分 + KhVote v = new KhVote(); + v.setId(vId); + v.setStatistical("0"); + khVoteService.updateKhVote(v); + KhVoteEmp vemp = new KhVoteEmp(); vemp.setVoteId(vId); List vEmps = khVoteEmpService.selectKhVoteEmpList(vemp); @@ -291,7 +297,8 @@ public class KhPingceController extends BaseController { } } return toAjax(1); - } /*else {//null认为清理所有 （已完成删除全部数据，进行中数据清除评分数据） + } + /*else {//null认为清理所有 （已完成删除全部数据，进行中数据清除评分数据） //已完成的数据直接清除任务及所有关联数据————完全删除已完成任务 KhPingce khPingce = new KhPingce(); khPingce.setState("2"); @@ -348,7 +355,6 @@ public class KhPingceController extends BaseController { } AjaxResult.success("按要求清理数据库成功") }*/ - return AjaxResult.error("请选择需要清理的考核任务！"); } } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteEmpController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteEmpController.java index 7da8e62..ccd03e7 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteEmpController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteEmpController.java @@ -118,14 +118,14 @@ public class KhVoteEmpController extends BaseController return khVoteEmpService.voteSubmit(param); } /** - * 进行投票——修改并计算对应的分值 + * 进行投票——统计平均分、最终得分 */ @PreAuthorize("@ss.hasPermi('kaohe:vote_emp:edit')") @Log(title = "投票统计", businessType = BusinessType.UPDATE) - @PutMapping("/StatisticalResults/{id}") - public AjaxResult StatisticalResults(@PathVariable Long id) + @PutMapping("/statisticalResults/{id}") + public AjaxResult statisticalResults(@PathVariable Long id) { - return khVoteEmpService.StatisticalResults(id); + return khVoteEmpService.statisticalResults(id); } /** diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteEmpService.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteEmpService.java index 99a9382..d43b43a 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteEmpService.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/IKhVoteEmpService.java @@ -66,5 +66,5 @@ public interface IKhVoteEmpService List selectVoteEmpsByVoteId(KhVoteEmp khVoteEmp); - AjaxResult StatisticalResults(Long id); + AjaxResult statisticalResults(Long id); } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java index b38b6df..0471701 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhKhrwResultServiceImpl.java @@ -140,10 +140,10 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService //查询该考核任务下的所有评分任务 List votes = khVoteMapper.selectKhVoteList(khVote); for (KhVote vote : votes) { - //当前投票是否统计计算平均分和最终得分 - if(vote.getStatistical().equals("0")){ - khVoteEmpService.StatisticalResults(vote.getId()); - } + //当前投票是否统计计算平均分和最终得分————去掉if 担心客户在评测结束前点击统计平均值及最终分 + //if(vote.getStatistical().equals("0")){ + khVoteEmpService.statisticalResults(vote.getId()); + //} KhVoteEmp khVoteEmp = new KhVoteEmp(); khVoteEmp.setVoteId(vote.getId()); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java index e6c8e75..fb12b8e 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java @@ -115,7 +115,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { @Override @Transactional - public AjaxResult StatisticalResults(Long id) { + public AjaxResult statisticalResults(Long id) { //修改未已统计计算 KhVote vote = new KhVote(); vote.setId(id); @@ -127,6 +127,9 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { vEmp.setVoteId(id); List khVoteEmps = khVoteEmpMapper.selectKhVoteEmpList(vEmp); for (KhVoteEmp voteEmp : khVoteEmps) { + if(!(voteEmp.getVoteNum().compareTo(BigDecimal.ZERO) == 1)){ + return AjaxResult.error("投票人数需大于0才能统计"); + } if (voteEmp.getKhitemTypeid().equals(1L)) { //选项评分 List voteItems = khVoteItemsMapper.selectKhVoteItemsList(null);//从数据库获取分值 BigDecimal a = new BigDecimal("100");