2 Commits 32f7a796bf ... e9a9c75a9c

Author SHA1 Message Date
  Pojun e9a9c75a9c Merge branch 'master' of http://www.kingtomtech.com:10101/kingtom/rkz_fy-master 7 months ago
  Pojun 70ef973329 合并下代码 7 months ago

+ 2 - 1
tc-service/tap-task/src/main/java/com/minto/app/task/manager/TaskAnalysisManagerImpl.java

@@ -1580,7 +1580,8 @@ public class TaskAnalysisManagerImpl implements ITaskAnalysisManager{
         List<TipEnumBean> tipEnumsByType = tipEnumManager.findTipEnumsByType(String.valueOf(parent.getId()));
         //查询当年的分数
         ITypeSettingScoreDao typeSettingScoreDao = AppContext.getBean(ITypeSettingScoreDao.class);
-        List<TypeSettingScoreBean> listByYear = typeSettingScoreDao.findListByYear(DateUtil.getYear());
+        Integer year = ParameterUtil.getInteger(param, "year", DateUtil.getYear());
+        List<TypeSettingScoreBean> listByYear = typeSettingScoreDao.findListByYear(year);
         Map<Long, TypeSettingScoreBean> collect = listByYear.stream()
                 .collect(Collectors.toMap(TypeSettingScoreBean::getEnumId, e -> e));