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 pLis = new ArrayList<>() {{ add("develop"); add("test"); @@ -1909,6 +1912,7 @@ public class ZtProjectServiceImpl extends ServiceImpl scoreMap=getAccountScoreMap(date,accountIds); for (String account :accountIds) { @@ -1921,7 +1925,12 @@ public class ZtProjectServiceImpl extends ServiceImpl getAccountScoreMap(Date date, List accountIds) { + List scoreList = monthScoreService.list(new QueryWrapper().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)); + } + } //修改项目集