From acb8eb9532587973244a951e6049679164a20aeb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=83=AD=E5=85=B6=E5=85=B5?=
 <guoqibing@sino-assistance.com>
Date: Mon, 19 May 2025 13:24:42 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=88=E6=8A=A5=E5=8A=A0=E7=BB=A9=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/sa/zentao/dao/WorkDetailsDTO.java     |  3 +++
 .../service/impl/ZtProjectServiceImpl.java    | 19 ++++++++++++++++++-
 2 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/sa/zentao/dao/WorkDetailsDTO.java b/src/main/java/com/sa/zentao/dao/WorkDetailsDTO.java
index f081073..d4aa567 100644
--- a/src/main/java/com/sa/zentao/dao/WorkDetailsDTO.java
+++ b/src/main/java/com/sa/zentao/dao/WorkDetailsDTO.java
@@ -2,6 +2,7 @@ package com.sa.zentao.dao;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
+import com.sa.zentao.entity.ZtMonthScore;
 import com.sa.zentao.enums.UserType;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -51,4 +52,6 @@ public class WorkDetailsDTO implements Serializable {
     private UserType userType;
     @ExcelIgnore
     private String account;
+
+    private ZtMonthScopeDTO monthScoreDto;
 }
diff --git a/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java b/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java
index f78d16f..623ecee 100644
--- a/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java
+++ b/src/main/java/com/sa/zentao/service/impl/ZtProjectServiceImpl.java
@@ -92,6 +92,9 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
     @Autowired
     private IZtEffortService effortService;
 
+    @Autowired
+    private IZtMonthScoreService monthScoreService;
+
     List<String> pLis = new ArrayList<>() {{
         add("develop");
         add("test");
@@ -1909,6 +1912,7 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
         }
 
         List result =new ArrayList();
+        Map<String,ZtMonthScore> scoreMap=getAccountScoreMap(date,accountIds);
 
 
         for (String account :accountIds) {
@@ -1921,7 +1925,12 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
             }
 
             var d=new WorkDetailsDTO();
-
+            ZtMonthScore ztMonthScore = scoreMap.get(account);
+            if(ztMonthScore!=null){
+                ZtMonthScopeDTO ztMonthScopeDTO = new ZtMonthScopeDTO();
+                BeanUtils.copyProperties(ztMonthScore,ztMonthScopeDTO);
+                d.setMonthScoreDto(ztMonthScopeDTO);
+            }
             d.setUserType(ztUser.getUserType());
             d.setUserName(ztUser.getNickname());
             d.setAccount(account);
@@ -1976,6 +1985,14 @@ public class ZtProjectServiceImpl extends ServiceImpl<ZtProjectMapper, ZtProject
         return new PageInfo(result);
     }
 
+    private Map<String, ZtMonthScore> getAccountScoreMap(Date date, List<String> accountIds) {
+        List<ZtMonthScore> scoreList = monthScoreService.list(new QueryWrapper<ZtMonthScore>().lambda().eq(ZtMonthScore::getDateStr, DateUtils.formatDate(date, "yyyy-MM")).in(ZtMonthScore::getAccount, accountIds));
+        if(CollectionUtils.isEmpty(scoreList)){
+            return new HashMap<>();
+        }else{
+            return scoreList.stream().collect(Collectors.toMap(ZtMonthScore::getAccount,o->o));
+        }
+    }
 
 
     //修改项目集