bug

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -332,187 +332,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 if (!ObjectUtils.isEmpty(taskReleaseFileInfos)) {
                     vo.setTaskReleaseFileInfos(taskReleaseFileInfos);
                 }
-            } else if ("4".equals(detailType) || "5".equals(detailType)) { //中标信息
-                PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
-
-                //代理商信息
-                BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
-                pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
-                vo.setPurchaseTaskDocumentNumber(pmDemand.getPurchaseTaskDocumentNumber());
-                //专家意见反馈
-                LambdaQueryWrapper<PmExpertFeedback> pmExpertFeedbackLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                pmExpertFeedbackLambdaQueryWrapper.eq(PmExpertFeedback::getDemandId, demandId);
-                PmExpertFeedback pmExpertFeedback = pmExpertFeedbackService.getOne(pmExpertFeedbackLambdaQueryWrapper);
-                if (!ObjectUtils.isEmpty(pmExpertFeedback)) {
-                    PmExpertFeedbackResVo pmExpertFeedbackResVo = new PmExpertFeedbackResVo();
-                    BeanUtils.copyProperties(pmExpertFeedback, pmExpertFeedbackResVo);
-
-                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmExpertFeedbackResVo.getId(), SysFileRefEnum.PM_EXPERT_FEEDBACK.getType());
-                    if (!ObjectUtils.isEmpty(fileInfos)) {
-                        pmExpertFeedbackResVo.setFileInfos(fileInfos);
-                    }
-                    pmPurchaseExecutionResVo.setPmExpertFeedbackResVo(pmExpertFeedbackResVo);
-                }
-
-                //采购文件编制审核
-                LambdaQueryWrapper<PmProcurementDocumentsReview> pmProcurementDocumentsReviewLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                pmProcurementDocumentsReviewLambdaQueryWrapper.eq(PmProcurementDocumentsReview::getDemandId, demandId);
-                PmProcurementDocumentsReview pmProcurementDocumentsReview = pmProcurementDocumentsReviewService.getOne(pmProcurementDocumentsReviewLambdaQueryWrapper);
-                if (!ObjectUtils.isEmpty(pmProcurementDocumentsReview)) {
-                    PmProcurementDocumentsReviewResVo pmProcurementDocumentsReviewResVo = new PmProcurementDocumentsReviewResVo();
-                    BeanUtils.copyProperties(pmProcurementDocumentsReview, pmProcurementDocumentsReviewResVo);
-
-                    List<SysFileInfo> fileInfos = getSysFileInfoList(pmProcurementDocumentsReviewResVo.getId(), SysFileRefEnum.PM_BID_FILE.getType());
-                    if (!ObjectUtils.isEmpty(fileInfos)) {
-                        pmProcurementDocumentsReviewResVo.setFileInfos(fileInfos);
-                    }
-                    pmPurchaseExecutionResVo.setPmProcurementDocumentsReviewResVo(pmProcurementDocumentsReviewResVo);
-                }
-
-                //采购公告列表
-                LambdaQueryWrapper<PmReleaseAnnouncement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.eq(PmReleaseAnnouncement::getDemandId, demandId).orderByDesc(PmReleaseAnnouncement::getReleaseTime);
-                List<PmReleaseAnnouncement> pmReleaseAnnouncementList = this.pmReleaseAnnouncementService.list(lambdaQueryWrapper);
-                if (!ObjectUtils.isEmpty(pmReleaseAnnouncementList)) {
-                    List<PmReleaseAnnouncementResVo> pmReleaseAnnouncementResVoList = new ArrayList<>();
-                    List<SysFileInfo> fileInfosAll = new ArrayList<>();
-                    for (PmReleaseAnnouncement pmReleaseAnnouncement : pmReleaseAnnouncementList) {
-                        PmReleaseAnnouncementResVo pmReleaseAnnouncementResVo = new PmReleaseAnnouncementResVo();
-                        BeanUtils.copyProperties(pmReleaseAnnouncement, pmReleaseAnnouncementResVo);
-
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncementResVo.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            fileInfosAll.addAll(fileInfos);
-                        }
-                        pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
-                    }
-                    pmPurchaseExecutionResVo.setPmReleaseAnnouncementFileInfos(fileInfosAll);
-                    pmPurchaseExecutionResVo.setPmReleaseAnnouncementResVoList(pmReleaseAnnouncementResVoList);
-                }
-
-                //标前质疑投诉
-                LambdaQueryWrapper<PmCallQuestion> pmCallQuestionLambdaQueryWrapper = new LambdaQueryWrapper<>();
-                pmCallQuestionLambdaQueryWrapper.eq(PmCallQuestion::getDemandId, demandId)
-                        .eq(PmCallQuestion::getType, '0').orderByDesc(PmCallQuestion::getCallQuestionTime);
-                List<PmCallQuestion> pmCallQuestionList = pmCallQuestionService.list(pmCallQuestionLambdaQueryWrapper);
-                if (!ObjectUtils.isEmpty(pmCallQuestionList)) {
-                    List<PmCallQuestionResVo> pmCallQuestionResVoList = new ArrayList<>();
-                    List<SysFileInfo> fileInfosAll = new ArrayList<>();
-                    for (PmCallQuestion pmCallQuestion : pmCallQuestionList) {
-                        PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
-                        BeanUtils.copyProperties(pmCallQuestion, pmCallQuestionResVo);
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), SysFileRefEnum.PM_PRE_BID_CALL_QUESTION.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            fileInfosAll.addAll(fileInfos);
-                        }
-                        pmCallQuestionResVoList.add(pmCallQuestionResVo);
-                    }
-                    pmPurchaseExecutionResVo.setPmCallQuestionPreResVoList(pmCallQuestionResVoList);
-                    pmPurchaseExecutionResVo.setPmCallQuestionPreFileInfos(fileInfosAll);
-                }
-
-                //专家信息列表
-                List<PmBaseExpertResVo> pmBaseExpertResVoList = this.pmDemandExpertRefService.getPmBaseExpertResVoList(demandId);
-                pmPurchaseExecutionResVo.setPmBaseExpertResVoList(pmBaseExpertResVoList);
-
-                //开标信息列表
-                List<PmBidOpeningResVo> pmBidOpeningResVoList = this.pmBidOpeningService.getPmBidOpeningResVoList(demandId);
-                pmPurchaseExecutionResVo.setPmBidOpeningResVoList(pmBidOpeningResVoList);
-
-                //评标结果公告列表
-                LambdaQueryWrapper<PmBidWinning> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper1.eq(PmBidWinning::getDemandId, demandId)
-                        .ne(PmBidWinning::getStatus, BidWinningStatus.BE_REPLACED.getCode()).orderByDesc(PmBidWinning::getBidAnnouncementTime);
-                List<PmBidWinning> pmBidWinningList = this.pmBidWinningService.list(lambdaQueryWrapper1);
-                if (!ObjectUtils.isEmpty(pmBidWinningList)) {
-                    List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
-                    List<SysFileInfo> fileInfosAll = new ArrayList<>();
-                    for (PmBidWinning pmBidWinning : pmBidWinningList) {
-                        PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
-                        BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
-                        pmBidWinningResVoList.add(pmBidWinningResVo);
-
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            fileInfosAll.addAll(fileInfos);
-                        }
-
-                    }
-                    pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
-                    pmPurchaseExecutionResVo.setPmBidWinningFileInfos(fileInfosAll);
-                }
-
-                //标后质疑
-                LambdaQueryWrapper<PmCallQuestion> pmCallQuestionLambdaQueryWrapper2 = new LambdaQueryWrapper<>();
-                pmCallQuestionLambdaQueryWrapper2.eq(PmCallQuestion::getDemandId, demandId)
-                        .eq(PmCallQuestion::getType, '1').orderByDesc(PmCallQuestion::getCallQuestionTime);
-                List<PmCallQuestion> pmCallQuestionList2 = pmCallQuestionService.list(pmCallQuestionLambdaQueryWrapper2);
-                if (!ObjectUtils.isEmpty(pmCallQuestionList2)) {
-                    List<PmCallQuestionResVo> pmCallQuestionResVoList = new ArrayList<>();
-                    List<SysFileInfo> fileInfosAll = new ArrayList<>();
-                    for (PmCallQuestion pmCallQuestion : pmCallQuestionList2) {
-                        PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
-                        BeanUtils.copyProperties(pmCallQuestion, pmCallQuestionResVo);
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            fileInfosAll.addAll(fileInfos);
-                        }
-                        pmCallQuestionResVoList.add(pmCallQuestionResVo);
-                    }
-                    pmPurchaseExecutionResVo.setPmCallQuestionPostResVoList(pmCallQuestionResVoList);
-                    pmPurchaseExecutionResVo.setPmCallRequestPostFileInfos(fileInfosAll);
-                }
-
-                //流标情况
-                LambdaQueryWrapper<PmBidFailure> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper2.eq(PmBidFailure::getDemandId, demandId).orderByDesc(PmBidFailure::getBidFailureTime);
-                List<PmBidFailure> pmBidFailureList = this.pmBidFailureService.list(lambdaQueryWrapper2);
-                if (!ObjectUtils.isEmpty(pmBidFailureList)) {
-                    List<PmBidFailureResVo> pmBidFailureResVoList = new ArrayList<>();
-                    List<PmCallQuestionResVo> pmCallQuestionBidFailureResVoList = new ArrayList<>();
-                    List<SysFileInfo> pmBidFailureFileInfos = new ArrayList<>();
-                    List<SysFileInfo> pmCallRequestBidFailureFileInfos = new ArrayList<>();
-                    for (PmBidFailure pmBidFailure : pmBidFailureList) {
-                        PmBidFailureResVo pmBidFailureResVo = new PmBidFailureResVo();
-                        BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
-                        pmBidFailureResVoList.add(pmBidFailureResVo);
-
-                        //流标文件
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmBidFailureFileInfos.addAll(fileInfos);
-                        }
-
-
-                        if ("1".equals(pmBidFailure.getCallQuestion())) { //有质疑
-                            PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
-                            pmCallQuestionResVo.setCallQuestion(pmBidFailure.getCallQuestion());
-                            pmCallQuestionResVo.setCallQuestionTime(pmBidFailure.getCallQuestionTime());
-                            pmCallQuestionBidFailureResVoList.add(pmCallQuestionResVo);
-
-                            //流废标质疑文件
-                            List<SysFileInfo> fileInfos2 = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType());
-                            if (!ObjectUtils.isEmpty(fileInfos2)) {
-                                pmCallRequestBidFailureFileInfos.addAll(fileInfos2);
-                            }
-                        }
-                    }
-
-                    pmPurchaseExecutionResVo.setPmBidFailureResVoList(pmBidFailureResVoList);
-                    pmPurchaseExecutionResVo.setPmBidFailureFileInfos(pmBidFailureFileInfos);
-
-                    //流废标处置
-                    pmPurchaseExecutionResVo.setPmCallQuestionBidFailureResVoList(pmCallQuestionBidFailureResVoList);
-                    pmPurchaseExecutionResVo.setPmCallRequestBidFailureFileInfos(pmCallRequestBidFailureFileInfos);
-                }
-
-                //中标通知书
-                List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
-                pmPurchaseExecutionResVo.setFileInfos(pmBidWinningNotificationFileInfos);
-
-                vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
-
+            } else if ("4".equals(detailType)) { //中标信息
+                setPmPurchaseExecutionResVo(vo,pmDemand);
             } else if ("5".equals(detailType)) { //合同信息
+                setPmPurchaseExecutionResVo(vo,pmDemand);
                 LambdaQueryWrapper<PmContractInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper.eq(PmContractInfo::getDemandId, demandId);
                 PmContractInfo pmContractInfo = pmContractInfoService.getOne(lambdaQueryWrapper);
@@ -551,6 +374,188 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         }
     }
 
+    private void setPmPurchaseExecutionResVo(PmDemandResVo vo, PmDemand pmDemand) {
+        Long demandId = pmDemand.getDemandId();
+        PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
+
+        //代理商信息
+        BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
+        pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
+        vo.setPurchaseTaskDocumentNumber(pmDemand.getPurchaseTaskDocumentNumber());
+        //专家意见反馈
+        LambdaQueryWrapper<PmExpertFeedback> pmExpertFeedbackLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmExpertFeedbackLambdaQueryWrapper.eq(PmExpertFeedback::getDemandId,demandId);
+        PmExpertFeedback pmExpertFeedback = pmExpertFeedbackService.getOne(pmExpertFeedbackLambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(pmExpertFeedback)) {
+            PmExpertFeedbackResVo pmExpertFeedbackResVo = new PmExpertFeedbackResVo();
+            BeanUtils.copyProperties(pmExpertFeedback, pmExpertFeedbackResVo);
+
+            List<SysFileInfo> fileInfos = getSysFileInfoList(pmExpertFeedbackResVo.getId(), SysFileRefEnum.PM_EXPERT_FEEDBACK.getType());
+            if (!ObjectUtils.isEmpty(fileInfos)) {
+                pmExpertFeedbackResVo.setFileInfos(fileInfos);
+            }
+            pmPurchaseExecutionResVo.setPmExpertFeedbackResVo(pmExpertFeedbackResVo);
+        }
+
+        //采购文件编制审核
+        LambdaQueryWrapper<PmProcurementDocumentsReview> pmProcurementDocumentsReviewLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmProcurementDocumentsReviewLambdaQueryWrapper.eq(PmProcurementDocumentsReview::getDemandId, demandId);
+        PmProcurementDocumentsReview pmProcurementDocumentsReview = pmProcurementDocumentsReviewService.getOne(pmProcurementDocumentsReviewLambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(pmProcurementDocumentsReview)) {
+            PmProcurementDocumentsReviewResVo pmProcurementDocumentsReviewResVo = new PmProcurementDocumentsReviewResVo();
+            BeanUtils.copyProperties(pmProcurementDocumentsReview, pmProcurementDocumentsReviewResVo);
+
+            List<SysFileInfo> fileInfos = getSysFileInfoList(pmProcurementDocumentsReviewResVo.getId(), SysFileRefEnum.PM_BID_FILE.getType());
+            if (!ObjectUtils.isEmpty(fileInfos)) {
+                pmProcurementDocumentsReviewResVo.setFileInfos(fileInfos);
+            }
+            pmPurchaseExecutionResVo.setPmProcurementDocumentsReviewResVo(pmProcurementDocumentsReviewResVo);
+        }
+
+        //采购公告列表
+        LambdaQueryWrapper<PmReleaseAnnouncement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.eq(PmReleaseAnnouncement::getDemandId, demandId).orderByDesc(PmReleaseAnnouncement::getReleaseTime);
+        List<PmReleaseAnnouncement> pmReleaseAnnouncementList = this.pmReleaseAnnouncementService.list(lambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(pmReleaseAnnouncementList)) {
+            List<PmReleaseAnnouncementResVo> pmReleaseAnnouncementResVoList = new ArrayList<>();
+            List<SysFileInfo> fileInfosAll = new ArrayList<>();
+            for (PmReleaseAnnouncement pmReleaseAnnouncement : pmReleaseAnnouncementList) {
+                PmReleaseAnnouncementResVo pmReleaseAnnouncementResVo = new PmReleaseAnnouncementResVo();
+                BeanUtils.copyProperties(pmReleaseAnnouncement, pmReleaseAnnouncementResVo);
+
+                List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncementResVo.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
+                if (!ObjectUtils.isEmpty(fileInfos)) {
+                    fileInfosAll.addAll(fileInfos);
+                }
+                pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
+            }
+            pmPurchaseExecutionResVo.setPmReleaseAnnouncementFileInfos(fileInfosAll);
+            pmPurchaseExecutionResVo.setPmReleaseAnnouncementResVoList(pmReleaseAnnouncementResVoList);
+        }
+
+        //标前质疑投诉
+        LambdaQueryWrapper<PmCallQuestion> pmCallQuestionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        pmCallQuestionLambdaQueryWrapper.eq(PmCallQuestion::getDemandId, demandId)
+                .eq(PmCallQuestion::getType, '0').orderByDesc(PmCallQuestion::getCallQuestionTime);
+        List<PmCallQuestion> pmCallQuestionList = pmCallQuestionService.list(pmCallQuestionLambdaQueryWrapper);
+        if (!ObjectUtils.isEmpty(pmCallQuestionList)) {
+            List<PmCallQuestionResVo> pmCallQuestionResVoList = new ArrayList<>();
+            List<SysFileInfo> fileInfosAll = new ArrayList<>();
+            for (PmCallQuestion pmCallQuestion : pmCallQuestionList) {
+                PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
+                BeanUtils.copyProperties(pmCallQuestion, pmCallQuestionResVo);
+                List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), SysFileRefEnum.PM_PRE_BID_CALL_QUESTION.getType());
+                if (!ObjectUtils.isEmpty(fileInfos)) {
+                    fileInfosAll.addAll(fileInfos);
+                }
+                pmCallQuestionResVoList.add(pmCallQuestionResVo);
+            }
+            pmPurchaseExecutionResVo.setPmCallQuestionPreResVoList(pmCallQuestionResVoList);
+            pmPurchaseExecutionResVo.setPmCallQuestionPreFileInfos(fileInfosAll);
+        }
+
+        //专家信息列表
+        List<PmBaseExpertResVo> pmBaseExpertResVoList = this.pmDemandExpertRefService.getPmBaseExpertResVoList(demandId);
+        pmPurchaseExecutionResVo.setPmBaseExpertResVoList(pmBaseExpertResVoList);
+
+        //开标信息列表
+        List<PmBidOpeningResVo> pmBidOpeningResVoList = this.pmBidOpeningService.getPmBidOpeningResVoList(demandId);
+        pmPurchaseExecutionResVo.setPmBidOpeningResVoList(pmBidOpeningResVoList);
+
+        //评标结果公告列表
+        LambdaQueryWrapper<PmBidWinning> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper1.eq(PmBidWinning::getDemandId, demandId)
+                .ne(PmBidWinning::getStatus, BidWinningStatus.BE_REPLACED.getCode()).orderByDesc(PmBidWinning::getBidAnnouncementTime);
+        List<PmBidWinning> pmBidWinningList = this.pmBidWinningService.list(lambdaQueryWrapper1);
+        if (!ObjectUtils.isEmpty(pmBidWinningList)) {
+            List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
+            List<SysFileInfo> fileInfosAll = new ArrayList<>();
+            for (PmBidWinning pmBidWinning : pmBidWinningList) {
+                PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
+                BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
+                pmBidWinningResVoList.add(pmBidWinningResVo);
+
+                List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
+                if (!ObjectUtils.isEmpty(fileInfos)) {
+                    fileInfosAll.addAll(fileInfos);
+                }
+
+            }
+            pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
+            pmPurchaseExecutionResVo.setPmBidWinningFileInfos(fileInfosAll);
+        }
+
+        //标后质疑
+        LambdaQueryWrapper<PmCallQuestion> pmCallQuestionLambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        pmCallQuestionLambdaQueryWrapper2.eq(PmCallQuestion::getDemandId, demandId)
+                .eq(PmCallQuestion::getType, '1').orderByDesc(PmCallQuestion::getCallQuestionTime);
+        List<PmCallQuestion> pmCallQuestionList2 = pmCallQuestionService.list(pmCallQuestionLambdaQueryWrapper2);
+        if (!ObjectUtils.isEmpty(pmCallQuestionList2)) {
+            List<PmCallQuestionResVo> pmCallQuestionResVoList = new ArrayList<>();
+            List<SysFileInfo> fileInfosAll = new ArrayList<>();
+            for (PmCallQuestion pmCallQuestion : pmCallQuestionList2) {
+                PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
+                BeanUtils.copyProperties(pmCallQuestion, pmCallQuestionResVo);
+                List<SysFileInfo> fileInfos = getSysFileInfoList(pmCallQuestionResVo.getId(), SysFileRefEnum.PM_BID_CALL_QEUSTION_FILE.getType());
+                if (!ObjectUtils.isEmpty(fileInfos)) {
+                    fileInfosAll.addAll(fileInfos);
+                }
+                pmCallQuestionResVoList.add(pmCallQuestionResVo);
+            }
+            pmPurchaseExecutionResVo.setPmCallQuestionPostResVoList(pmCallQuestionResVoList);
+            pmPurchaseExecutionResVo.setPmCallRequestPostFileInfos(fileInfosAll);
+        }
+
+        //流标情况
+        LambdaQueryWrapper<PmBidFailure> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper2.eq(PmBidFailure::getDemandId, demandId).orderByDesc(PmBidFailure::getBidFailureTime);
+        List<PmBidFailure> pmBidFailureList = this.pmBidFailureService.list(lambdaQueryWrapper2);
+        if (!ObjectUtils.isEmpty(pmBidFailureList)) {
+            List<PmBidFailureResVo> pmBidFailureResVoList = new ArrayList<>();
+            List<PmCallQuestionResVo> pmCallQuestionBidFailureResVoList = new ArrayList<>();
+            List<SysFileInfo> pmBidFailureFileInfos = new ArrayList<>();
+            List<SysFileInfo> pmCallRequestBidFailureFileInfos = new ArrayList<>();
+            for (PmBidFailure pmBidFailure : pmBidFailureList) {
+                PmBidFailureResVo pmBidFailureResVo = new PmBidFailureResVo();
+                BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
+                pmBidFailureResVoList.add(pmBidFailureResVo);
+
+                //流标文件
+                List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
+                if (!ObjectUtils.isEmpty(fileInfos)) {
+                    pmBidFailureFileInfos.addAll(fileInfos);
+                }
+
+
+                if ("1".equals(pmBidFailure.getCallQuestion())) { //有质疑
+                    PmCallQuestionResVo pmCallQuestionResVo = new PmCallQuestionResVo();
+                    pmCallQuestionResVo.setCallQuestion(pmBidFailure.getCallQuestion());
+                    pmCallQuestionResVo.setCallQuestionTime(pmBidFailure.getCallQuestionTime());
+                    pmCallQuestionBidFailureResVoList.add(pmCallQuestionResVo);
+
+                    //流废标质疑文件
+                    List<SysFileInfo> fileInfos2 = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_CALL_QUESTION.getType());
+                    if (!ObjectUtils.isEmpty(fileInfos2)) {
+                        pmCallRequestBidFailureFileInfos.addAll(fileInfos2);
+                    }
+                }
+            }
+
+            pmPurchaseExecutionResVo.setPmBidFailureResVoList(pmBidFailureResVoList);
+            pmPurchaseExecutionResVo.setPmBidFailureFileInfos(pmBidFailureFileInfos);
+
+            //流废标处置
+            pmPurchaseExecutionResVo.setPmCallQuestionBidFailureResVoList(pmCallQuestionBidFailureResVoList);
+            pmPurchaseExecutionResVo.setPmCallRequestBidFailureFileInfos(pmCallRequestBidFailureFileInfos);
+        }
+
+        //中标通知书
+        List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
+        pmPurchaseExecutionResVo.setFileInfos(pmBidWinningNotificationFileInfos);
+
+        vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
+
+    }
     /**
      * 查询采购需求列表
      *