From 56dfc29e805614a5692190937608693060dc785f Mon Sep 17 00:00:00 2001
From: zhc077 <565291854@qq.com>
Date: Wed, 31 Jul 2024 08:25:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E7=A7=AF=E5=88=86=E6=B1=87?=
 =?UTF-8?q?=E6=80=BB=E9=83=A8=E9=97=A8=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20=E4=BF=AE=E6=94=B9=207.31?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/PersonalCompScoreServiceImpl.java | 14 +++++++++-----
 .../committee/AnnualCompPointList.vue              |  2 +-
 2 files changed, 10 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 d98e7fae..3e23cbd6 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
@@ -73,6 +73,9 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
     @Autowired
     private IAwardPersionService iAwardPersionService;
 
+    @Autowired
+    private ISysDepartService iSysDepartService;
+
     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;
@@ -98,7 +101,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
 
         //年度比赛项目，只有isPj为1时才能触发个人比赛积分汇总
         AnnualCompPoint annualCompPoint = iAnnualCompPointService.getOne(new LambdaQueryWrapper<AnnualCompPoint>()
-                .eq(AnnualCompPoint::getAnnualCompId, annualCompId)
+//                .eq(AnnualCompPoint::getAnnualCompId, annualCompId)
+                .eq(AnnualCompPoint::getId, personalCompScore.getAnnualCompP())
                 .eq(AnnualCompPoint::getIsPj, new Integer(1))
         );
 
@@ -176,8 +180,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
                         SysUser sysUser = iSysUserService.getById(e.getUserId());
                         bean.setWorkOn(sysUser.getWorkNo());
                         bean.setName(sysUser.getRealname());
-//                        SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
-                        bean.setDepet(sysUser.getDepartIds());
+                        SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,sysUser.getOrgCode()));
+                        bean.setDepet(sysDepart.getId());
                         bean.setScore(score.get());
                         saveList.add(bean);
                     });
@@ -191,8 +195,8 @@ public class PersonalCompScoreServiceImpl extends ServiceImpl<PersonalCompScoreM
                     SysUser sysUser = iSysUserService.getById(teamManagement.getUserId());
                     bean.setWorkOn(sysUser.getWorkNo());
                     bean.setName(sysUser.getRealname());
-//                    SysDepart sysDepart = iSysDepartService.getDepartByOrgCode(sysUser.getOrgCode());
-                    bean.setDepet(sysUser.getDepartIds());
+                    SysDepart sysDepart = iSysDepartService.getOne(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getOrgCode,sysUser.getOrgCode()));
+                    bean.setDepet(sysDepart.getId());
                     bean.setScore(score.get());
                     saveList.add(bean);
                 }
diff --git a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
index 16e1676f..c7a1a974 100644
--- a/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
+++ b/jeecgboot-vue3-master/src/views/annualCompPoint/committee/AnnualCompPointList.vue
@@ -255,7 +255,7 @@
    * 个人积分汇总
    */
   function handleCollectScoreApply(record: Recordable) {
-    collectScore({id: record.id, annualCompId: record.annualCompId}, handleSuccess);
+    collectScore({id: record.id, annualCompId: record.annualCompId, annualCompP: record.id}, handleSuccess);
   }
 
   /**