评分提交选项评分得分问题修改

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:
                 # 从数据源开关/默认关闭

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