From e4e3dea677b60b665518459f3e70bb2703a33f33 Mon Sep 17 00:00:00 2001 From: hshansha Date: Mon, 14 Jul 2025 08:23:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=84=E5=88=86=E6=8F=90=E4=BA=A4=E9=80=89?= =?UTF-8?q?=E9=A1=B9=E8=AF=84=E5=88=86=E5=BE=97=E5=88=86=E9=97=AE=E9=A2=98?= =?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-admin/src/main/resources/application-hs.yml | 3 ++- .../com/ruoyi/kaohe/service/impl/KhVoteEmpServiceImpl.java | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/application-hs.yml b/ruoyi-admin/src/main/resources/application-hs.yml index 2b3426c..712e10b 100644 --- a/ruoyi-admin/src/main/resources/application-hs.yml +++ b/ruoyi-admin/src/main/resources/application-hs.yml @@ -6,10 +6,11 @@ spring: druid: # 主库数据源 master: - #url: jdbc:mysql://localhost:3306/ry-vue?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + #url: jdbc:mysql://localhost:3307/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 url: jdbc:mysql://172.16.9.9:3306/kaohe?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 username: root password: ruanfa + #password: hs123456 # 从库数据源 slave: # 从数据源开关/默认关闭 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 1eefc81..0c9eb2d 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 @@ -159,8 +159,10 @@ public class KhVoteEmpServiceImpl implements IKhVoteEmpService { optionB.multiply(b).add(optionC.multiply(c).add(optionD.multiply(d))) ).divide(voteEmp.getVoteNum()); voteEmp.setAvgScore(avgScore);//投票后计算平均分 - if (voteEmp.getPercentage() != null) { //计算最后得分 + if (oldvoteEmp.getPercentage() != null) { //计算最后得分 voteEmp.setEndScore(avgScore.multiply(voteEmp.getPercentage())); + }else{ + voteEmp.setEndScore(avgScore); } } else if (typeid.equals(2L)) {//占比评分 BigDecimal sumScore = voteEmp.getScore().add(oldvoteEmp.getVoteScore());