|
|
@@ -1801,7 +1801,7 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
|
|
|
String fileName = registerBookPdfService.getPdfFileName(RegisterBookType.getEnums(planType), sysOrg);
|
|
|
Map<String, Object> data = new HashMap<>();
|
|
|
data.put("planType", planType);
|
|
|
- List<AppResumptionDataInfoVo> allDayInfo = getItems(allDayDataList);
|
|
|
+ List<AppResumptionDataInfoVo> allDayInfo = getItems(listMap.get(planType));
|
|
|
Map<Long, List<AppResumptionDataInfoVo>> afterf = allDayInfo.stream().collect(Collectors.groupingBy(AppResumptionDataInfoVo::getItemId));
|
|
|
data.put(DictUtils.getDictLabel(DictConstants.RESUMPTION_PLAN_EXEC, 1), getResult(afterf));
|
|
|
String tempSubmitNames = allDayDataList.stream().map(Resumption::getSubmitorName).distinct().filter(x -> ObjectUtil.isNotEmpty(x)).collect(Collectors.joining(","));
|