From c2f47cfac1b40d05c20b2cb935814041be422c6c Mon Sep 17 00:00:00 2001 From: hshansha Date: Wed, 12 Nov 2025 17:04:57 +0800 Subject: [PATCH 1/3] bug --- .../java/com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 fb12b8e..c37ab8c 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 @@ -162,7 +162,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { } } else if (voteEmp.getKhitemTypeid().equals(2L)) { voteEmp.setAvgScore(voteEmp.getVoteScore().divide(voteEmp.getVoteNum(), 4, RoundingMode.HALF_UP));//计算平均分 - voteEmp.setEndScore(voteEmp.getOptionA().multiply(voteEmp.getPercentage())); //计算最终分 + voteEmp.setEndScore(voteEmp.getAvgScore().multiply(voteEmp.getPercentage())); //计算最终分 } else if (voteEmp.getKhitemTypeid().equals(3L)) { voteEmp.setAvgScore(voteEmp.getVoteScore().divide(voteEmp.getVoteNum(), 4, RoundingMode.HALF_UP)); voteEmp.setEndScore(voteEmp.getAvgScore()); From b54b27c60d1e36de83da0d4cccf8f20b7b243bde Mon Sep 17 00:00:00 2001 From: hshansha Date: Fri, 14 Nov 2025 09:16:28 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/kaohe/controller/KhPingceController.java | 8 ++++++++ .../com/ruoyi/kaohe/controller/KhVoteController.java | 4 ++-- .../main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java | 6 +++--- .../kaohe/service/impl/KhKhrwResultServiceImpl.java | 2 +- .../kaohe/service/impl/KhVoteEmpServiceImpl.java | 12 ++++++------ .../main/resources/mapper/kaohe/KhVoteEmpMapper.xml | 6 +++--- .../src/main/resources/mapper/kaohe/KhVoteMapper.xml | 2 +- 7 files changed, 24 insertions(+), 16 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 1dc8fe2..76a3a15 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 @@ -272,6 +272,7 @@ public class KhPingceController extends BaseController { if (vEmps != null && vEmps.size() > 0) { //修改关联的员工数据到最初创建状态 for (KhVoteEmp uPEmp : vEmps) { + uPEmp.setVersion(0);//版本号清0 uPEmp.setVoteNum(BigDecimal.ZERO); uPEmp.setVoteScore(BigDecimal.ZERO); uPEmp.setAvgScore(BigDecimal.ZERO); @@ -321,12 +322,19 @@ 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); if (vEmps != null && vEmps.size() > 0) { //修改关联的员工数据到最初创建状态 for (KhVoteEmp uPEmp : vEmps) { + uPEmp.setVersion(0L);//版本号清0 uPEmp.setVoteNum(BigDecimal.ZERO); uPEmp.setVoteScore(BigDecimal.ZERO); uPEmp.setAvgScore(BigDecimal.ZERO); diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java index aa805cc..6484e4f 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/controller/KhVoteController.java @@ -46,7 +46,7 @@ public class KhVoteController extends BaseController { @Autowired private IKhTemItemService khTemItemService; - /*@Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次 监测时间修改评分状态 + @Scheduled(cron = "0 * * * * ?") // 每分钟的第0秒执行一次 监测时间修改评分状态 public void performTask() { System.out.println("进入定时任务-------------------------------------------------------------"); //获取所有未完成的评分任务 @@ -97,7 +97,7 @@ public class KhVoteController extends BaseController { } } - }*/ + } /** * 查询投票评测列表 diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java index 44cfc89..e4e214f 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java @@ -81,7 +81,7 @@ public class KhVoteEmp extends BaseEntity /** 乐观锁版本号 */ // @Excel(name = "乐观锁版本号") - private Long version; + private Integer version; //仅做参数 传递本次评分分数 private BigDecimal score; @@ -92,11 +92,11 @@ public class KhVoteEmp extends BaseEntity private BigDecimal c; private BigDecimal d; - public Long getVersion() { + public Integer getVersion() { return version; } - public void setVersion(Long version) { + public void setVersion(Integer version) { this.version = version; } 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 0471701..a91b0ea 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,7 +140,7 @@ public class KhKhrwResultServiceImpl implements IKhKhrwResultService //查询该考核任务下的所有评分任务 List votes = khVoteMapper.selectKhVoteList(khVote); for (KhVote vote : votes) { - //当前投票是否统计计算平均分和最终得分————去掉if 担心客户在评测结束前点击统计平均值及最终分 + //当前投票是否统计计算平均分和最终得分————去掉if 担心客户在评测结束前点击统计平均值及最终分,已统计但不是最终结果 //if(vote.getStatistical().equals("0")){ khVoteEmpService.statisticalResults(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 c37ab8c..0317835 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 @@ -116,12 +116,6 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { @Override @Transactional public AjaxResult statisticalResults(Long id) { - //修改未已统计计算 - KhVote vote = new KhVote(); - vote.setId(id); - vote.setStatistical("1"); - khVoteMapper.updateKhVote(vote); - //统计计算平均值、最终值 KhVoteEmp vEmp = new KhVoteEmp(); vEmp.setVoteId(id); @@ -168,6 +162,12 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { voteEmp.setEndScore(voteEmp.getAvgScore()); } } + + //修改为已统计计算 + KhVote vote = new KhVote(); + vote.setId(id); + vote.setStatistical("1"); + khVoteMapper.updateKhVote(vote); return khVoteEmpMapper.updateKhVoteEmp1(khVoteEmps)> 0 ? AjaxResult.success() : AjaxResult.error(); } diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml index 4de63d1..ac03bb0 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml @@ -162,13 +162,13 @@ update_by = #{updateBy}, update_time = #{updateTime}, remark = #{remark}, + version = #{version}, - WHERE id = #{id} - + UPDATE kh_vote_emp @@ -180,7 +180,7 @@ id = #{item.id} - + UPDATE kh_vote_emp diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml index 4c1b60e..9242956 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteMapper.xml @@ -76,7 +76,7 @@ and pingce_name like concat('%', #{pingceName}, '%') and vote_title like concat('%', #{voteTitle}, '%') - + and state != #{state} and v.id in From 8cfc2885c49a961baeea0cc08cbdbf2dfca7f151 Mon Sep 17 00:00:00 2001 From: hshansha Date: Mon, 17 Nov 2025 16:26:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=AF=84=E5=88=86=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E3=80=81=E8=A2=AB=E8=80=83=E6=A0=B8=E5=AF=B9=E8=B1=A1=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ruoyi/kaohe/domain/KhVoteEmp.java | 14 +++++++++++++- .../java/com/ruoyi/kaohe/domain/KhVoteRecard.java | 4 ++-- .../kaohe/service/impl/KhVoteEmpServiceImpl.java | 1 + .../resources/mapper/kaohe/KhVoteEmpMapper.xml | 8 +++++--- .../resources/mapper/kaohe/KhVoteRecardMapper.xml | 4 ++-- 5 files changed, 23 insertions(+), 8 deletions(-) diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java index e4e214f..57655ac 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteEmp.java @@ -24,9 +24,13 @@ public class KhVoteEmp extends BaseEntity private Long khitemTypeid; /** 投票id */ - @Excel(name = "投票id") + // @Excel(name = "投票id") private Long voteId; + /** 考核任务 */ + @Excel(name = "考核任务") + private String pcName; + /** 投票主题 */ @Excel(name = "投票主题") private String voteTitle; @@ -96,6 +100,14 @@ public class KhVoteEmp extends BaseEntity return version; } + public String getPcName() { + return pcName; + } + + public void setPcName(String pcName) { + this.pcName = pcName; + } + public void setVersion(Integer version) { this.version = version; } diff --git a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java index 92f3637..ebdfe73 100644 --- a/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java +++ b/ruoyi-kaohe/src/main/java/com/ruoyi/kaohe/domain/KhVoteRecard.java @@ -62,8 +62,8 @@ public class KhVoteRecard extends BaseEntity private String voteDetails; /** 投票时间 */ - @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @Excel(name = "投票时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss") private Date voteTime; /** IP */ 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 0317835..cb6ca5f 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 @@ -189,6 +189,7 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { recard.setVoteId(param.getVoteId()); recard.setUserId(param.getUserId()); recard.setUserName(param.getUserName()); + recard.setVoteTime(nowDate); //选项评分 if (typeid.equals(1L)) { diff --git a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml index ac03bb0..137ffc5 100644 --- a/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml +++ b/ruoyi-kaohe/src/main/resources/mapper/kaohe/KhVoteEmpMapper.xml @@ -9,6 +9,7 @@ + @@ -56,19 +57,20 @@