解决 110 、备用电源履职登记簿 检查人混合、检查问题混合

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/resumption/service/impl/AppPlanServiceImpl.java

@@ -1804,14 +1804,14 @@ public class AppPlanServiceImpl extends ServiceImpl<AppPlanMapper, AppPlan> impl
             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(","));
+            String tempSubmitNames = listMap.get(planType).stream().map(Resumption::getSubmitorName).distinct().filter(x -> ObjectUtil.isNotEmpty(x)).collect(Collectors.joining(","));
             if ("null".equals(tempSubmitNames)) {
                 tempSubmitNames = StringUtils.EMPTY;
             }
             // 提交人
             data.put("submiterNames", tempSubmitNames);
             // 获取任务相关问题
-            data.put("questions", getListQuestionPdfVo(allDayDataList.stream().map(Resumption::getId).collect(Collectors.toList())));
+            data.put("questions", getListQuestionPdfVo(listMap.get(planType).stream().map(Resumption::getId).collect(Collectors.toList())));
             data.put("title", RegisterBookType.getEnums(planType).getText());
             data.put("fileName", fileName);
             data.put("orgName", sysOrg.getShortName());