From 590e6a152837bdc1074782339e16bc6d8d776859 Mon Sep 17 00:00:00 2001
From: zhc077 <565291854>
Date: Wed, 1 Nov 2023 11:37:35 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=AA=E4=BA=BA=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=8A=9F=E8=83=BD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/PersonalCompScoreServiceImpl.java    | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

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 74c443e2..8bab7b9f 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
@@ -57,6 +57,11 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
     @Autowired
     private ISysUserService iSysUserService;
 
+    private static final Integer ONE_HUNDRED = 100;
+    private static final Double ZERO_POINT_FIVE = 0.5;
+    private static final Double ZERO_POINT_TWO = 0.2;
+
+
     @Override
     public void collectScore(PersonalCompScore personalCompScore) {
 
@@ -91,6 +96,7 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
             AnnualCompAward annualCompAward = iAnnualCompAwardService.getById("获奖理理表id");
             if (ObjectUtils.isEmpty(annualCompAward)) return;
             Integer wardsort = 0;
+            //权重 百分比
             String weightVal;
             switch (wardsort) {
                 case 1:
@@ -117,16 +123,16 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
             );
             //参与形式 个人、团队，键值对 N-个人 Y-团队
             //3、计算积分
-            double baseScore = mul(compweight_val, new Double(weightVal));
+            double baseScore = mul(compweight_val, div(new Double(weightVal), ONE_HUNDRED));
             AtomicReference<Double> score = new AtomicReference<>((double) 0);
             if (StringUtils.equals("Y", entryForm)) { //团队赛
                 Optional.ofNullable(managementList).orElse(new ArrayList<>()).forEach(e -> {
                     // 参与形式是团队时，队长积分*0.5，职员积分*0.2
                     //captain 是否队长,自关联表如果是队长则是为0.如果不是存储队长学号
                     if (StringUtils.equals("0", e.getCaptain())) {
-                        score.set(mul(baseScore, new Double(0.5)));
+                        score.set(mul(baseScore, ZERO_POINT_FIVE));
                     } else {
-                        score.set(mul(baseScore, new Double(0.2)));
+                        score.set(mul(baseScore, ZERO_POINT_TWO));
                     }
 
                     PersonalCompScore bean = new PersonalCompScore();
@@ -161,9 +167,9 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
 
         this.saveBatch(saveList);
         iAnnualCompPointService.lambdaUpdate()
-                .eq(AnnualCompPoint::getId,personalCompScore.getId())
-                .eq(AnnualCompPoint::getIsPj,1)
-                .set(AnnualCompPoint::getAnnualCompState,10)
+                .eq(AnnualCompPoint::getId, personalCompScore.getId())
+                .eq(AnnualCompPoint::getIsPj, 1)
+                .set(AnnualCompPoint::getAnnualCompState, 10)
                 .update();
     }
 
@@ -179,4 +185,18 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
         BigDecimal b2 = BigDecimal.valueOf(v2);
         return b1.multiply(b2).doubleValue();
     }
+
+    /**
+     * @description: 提供（相对）精确的除法运算，当发生除不尽的情况时
+     * 精确到小数点后10位的数字四舍五入
+     * @param: [v1, v2]
+     * @return: double
+     * @author: z.h.c
+     * @date: 23/11/1 08:41
+     */
+    public static double div(double v1, double v2) {
+        BigDecimal b1 = BigDecimal.valueOf(v1);
+        BigDecimal b2 = BigDecimal.valueOf(v2);
+        return b1.divide(b2, 2, BigDecimal.ROUND_HALF_UP).doubleValue();
+    }
 }