合并下代码

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

@@ -1575,7 +1575,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));