修改附件

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -1082,6 +1082,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 }
             } else if ("4".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
+                List<SysFileInfo> fileInfosAll =  new ArrayList<>();
                 //代理商信息
                 BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
                 pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
@@ -1096,7 +1097,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmReleaseAnnouncement, pmReleaseAnnouncementResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncement.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmReleaseAnnouncementResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
                     }
@@ -1119,7 +1120,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmBidWinningResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidWinningResVoList.add(pmBidWinningResVo);
                     }
@@ -1141,7 +1142,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                         BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmPurchaseExecutionResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidFailureResVoList.add(pmBidFailureResVo);
                     }
@@ -1150,8 +1151,9 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 //中标通知书
                 List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
                 if (!ObjectUtils.isEmpty(pmBidWinningNotificationFileInfos)) {
-                    pmPurchaseExecutionResVo.setPmBidWinningNotificationFileInfos(pmBidWinningNotificationFileInfos);
+                    fileInfosAll.addAll(pmBidWinningNotificationFileInfos);
                 }
+                pmPurchaseExecutionResVo.setFileInfos(fileInfosAll);
                 vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
             } else if ("5".equals(detailType)) { //合同信息
                 LambdaQueryWrapper<PmContractInfo> lambdaQueryWrapper = new LambdaQueryWrapper<>();

purchase-system/src/main/java/com/ozs/pm/doman/vo/responseVo/PmPurchaseExecutionResVo.java

@@ -62,12 +62,6 @@ public class PmPurchaseExecutionResVo {
     @ApiModelProperty("流标信息列表")
     private List<PmBidFailureResVo> pmBidFailureResVoList;
 
-    /**
-     * 中标通知书
-     */
-    @ApiModelProperty("中标通知书")
-    private List<SysFileInfo> pmBidWinningNotificationFileInfos;
-
     /**
      * 已上传的关联附件信息
      */

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

@@ -231,8 +231,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 }
             } else if ("4".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
-
-                //代理商信息
+                List<SysFileInfo> fileInfosAll =  new ArrayList<>();
+                        //代理商信息
                 BaseAgency baseAgency = this.baseAgencyService.getById(pmDemand.getAgencyId());
                 pmPurchaseExecutionResVo.setBaseAgency(baseAgency);
 
@@ -248,7 +248,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmReleaseAnnouncement.getId(), SysFileRefEnum.PM_ANNOUNCEMENT_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmReleaseAnnouncementResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmReleaseAnnouncementResVoList.add(pmReleaseAnnouncementResVo);
                     }
@@ -284,7 +284,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                                 List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
                                 if (!ObjectUtils.isEmpty(fileInfos)) {
-                                    pmBidWinningResVo.setFileInfos(fileInfos);
+                                    fileInfosAll.addAll(fileInfos);
                                 }
                                 pmBidWinningResVoList.add(pmBidWinningResVo);
                             }
@@ -313,7 +313,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                         BeanUtils.copyProperties(pmBidFailure, pmBidFailureResVo);
                         List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidFailure.getId(), SysFileRefEnum.PM_BID_FAILURE_FILE.getType());
                         if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmPurchaseExecutionResVo.setFileInfos(fileInfos);
+                            fileInfosAll.addAll(fileInfos);
                         }
                         pmBidFailureResVoList.add(pmBidFailureResVo);
                     }
@@ -323,9 +323,10 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 //中标通知书
                 List<SysFileInfo> pmBidWinningNotificationFileInfos = getSysFileInfoList(vo.getDemandId(), SysFileRefEnum.PM_BID_WINNING_NOTIFICATION.getType());
                 if (!ObjectUtils.isEmpty(pmBidWinningNotificationFileInfos)) {
-                    pmPurchaseExecutionResVo.setPmBidWinningNotificationFileInfos(pmBidWinningNotificationFileInfos);
+                    fileInfosAll.addAll(pmBidWinningNotificationFileInfos);
                 }
 
+                pmPurchaseExecutionResVo.setFileInfos(fileInfosAll);
                 vo.setPmPurchaseExecutionResVo(pmPurchaseExecutionResVo);
 
             } else if ("5".equals(detailType)) { //合同信息