From 29839f5649aebbf4923b5d21c76fea7f8a9de2c6 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Tue, 30 Jul 2024 17:43:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E8=83=BD=E5=8A=9B=E9=87=8F?=
 =?UTF-8?q?=E5=8C=96=20=E4=BF=AE=E6=94=B9=207.30?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PersonalAbilityEvaluationServiceImpl.java   | 2 +-
 .../service/impl/PersonalCompScoreServiceImpl.java           | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java
index 8445b7da..58ec2db4 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/abilityEvaluation/service/impl/PersonalAbilityEvaluationServiceImpl.java
@@ -127,7 +127,7 @@ public class PersonalAbilityEvaluationServiceImpl extends ServiceImpl<PersonalAb
                 person.setCapacityName(basicsskill.getName());
 
                 //计算能力量化各类指标  能力量化值 = 直接按项目的能力权值和项目奖项得分算
-                //能力量化值 = 项目得分*项目的能力权值/100
+                //能力量化值 = 个人积分*项目的能力权值/100
                 this.convertScore(compskill.getWeight(), person, en.getScore());
                 saveList.add(person);
             });
diff --git a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java
index 6bed29f0..d98e7fae 100644
--- a/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java
+++ b/jeecg-boot-master/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/annualScore/service/impl/PersonalCompScoreServiceImpl.java
@@ -149,14 +149,15 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
                 if (ObjectUtils.isEmpty(managementList)) return;
 
                 //modify 7.12  新需求
-                //3、计算积分 项目分值*项目级别权得百分比*获奖奖项权重百分比
+                //3、计算积分 项目分值*项目层次权得百分比*获奖奖项权重百分比
 //                log.info("***************年度比赛项目-{},项目分值:{},奖项权重值:{}", annualCompPoint.getObjName(), compweight_val, weightVal);
                 Projectlevel projectlevel = iProjectlevelService.getById(annualCompPoint.getObjLevel());
                 double scale_ratio = ComputeUtils.div2(new Double(projectlevel.getScale()), ONE_HUNDRED);
                 double baseScore = ComputeUtils.mul2(ComputeUtils.mul2(compweight_val, ComputeUtils.div2(new Double(weightVal), ONE_HUNDRED)),scale_ratio);
                 log.info("***************年度比赛项目-{},项目分值:{}", annualCompPoint.getObjName(), compweight_val);
-                log.info("***************年度比赛项目-级别权重比值:{}", scale_ratio);
+                log.info("***************年度比赛项目-层次权重比值:{}", scale_ratio);
                 log.info("***************获奖奖项权重百分比:{}", weightVal);
+                log.info("***************基础积分:{}", baseScore);
                 AtomicReference<Double> score = new AtomicReference<>((double) 0);
                 if (StringUtils.equals("Y", entryForm)) { //团队赛
                     Optional.ofNullable(managementList).orElse(new ArrayList<>()).forEach(e -> {