项目管理

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

@@ -30,6 +30,9 @@ public class PmBidWinningResVo implements Serializable {
     private Long demandId;
 
 
+    @ApiModelProperty("中标单位信息")
+    private String bidWinningName;
+
     @ApiModelProperty("中标金额(万元)")
     private Double bidWinningAmount;
 

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

@@ -76,6 +76,8 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
     @Autowired
     private PmBidWinningService pmBidWinningService;
+
+
     @Autowired
     private PmBidFailureService pmBidFailureService;
     @Autowired
@@ -242,20 +244,32 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                 //中标信息列表
                 LambdaQueryWrapper<PmBidWinning> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper1.eq(PmBidWinning::getDemandId, demandId).orderByDesc(PmBidWinning::getBidAnnouncementTime);
-                List<PmBidWinning> pmBidWinningList = this.pmBidWinningService.list(lambdaQueryWrapper1);
-                if (!ObjectUtils.isEmpty(pmBidWinningList)) {
-                    List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
-                    for (PmBidWinning pmBidWinning : pmBidWinningList) {
-                        PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
-                        BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
-                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
-                        if (!ObjectUtils.isEmpty(fileInfos)) {
-                            pmBidWinningResVo.setFileInfos(fileInfos);
+                lambdaQueryWrapper1.eq(PmBidWinning::getDemandId, demandId);
+                PmBidWinning pmBidWinning = this.pmBidWinningService.getOne(lambdaQueryWrapper1);
+                if (!ObjectUtils.isEmpty(pmBidWinning)) {
+                    LambdaQueryWrapper<PmBidWinningOpeningRef> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
+                    lambdaQueryWrapper2.eq(PmBidWinningOpeningRef::getWinningId,pmBidWinning.getId());
+                    List<PmBidWinningOpeningRef> pmBidWinningOpeningRefList = this.pmBidWinningOpeningRefService.list(lambdaQueryWrapper2);
+                    if(!ObjectUtils.isEmpty(pmBidWinningOpeningRefList)){
+                        List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
+                        for (PmBidWinningOpeningRef pmBidWinningOpeningRef : pmBidWinningOpeningRefList) {
+                            PmBidOpening pmBidOpening = this.pmBidOpeningService.getById(pmBidWinningOpeningRef.getOpeningId());
+                            if(pmBidOpening != null){
+                                PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
+                                BeanUtils.copyProperties(pmBidWinning, pmBidWinningResVo);
+                                pmBidWinningResVo.setBidWinningName(pmBidOpening.getBidderName());
+
+                                List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinning.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
+                                if (!ObjectUtils.isEmpty(fileInfos)) {
+                                    pmBidWinningResVo.setFileInfos(fileInfos);
+                                }
+                                pmBidWinningResVoList.add(pmBidWinningResVo);
+                            }
+
                         }
-                        pmBidWinningResVoList.add(pmBidWinningResVo);
+                        pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
                     }
-                    pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
+
                 }
 
                 pmPurchaseExecutionResVo.setCallQuestion(pmDemand.getCallQuestion());