历史表

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

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

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

@@ -702,37 +702,25 @@ public class PmDemandHisServiceImpl extends ServiceImpl<PmDemandHisMapper, PmDem
                 //评标结果公告列表
                 LambdaQueryWrapper<PmBidWinningHis> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper1.eq(PmBidWinningHis::getDemandId, demandId).eq(PmBidWinningHis::getReturnOrderNumber,returnOrderNumber)
-                        .eq(PmBidWinningHis::getStatus, BidWinningStatus.NORMAL.getCode());
-                PmBidWinningHis pmBidWinningHis = this.pmBidWinningHisService.getOne(lambdaQueryWrapper1);
-                if (!ObjectUtils.isEmpty(pmBidWinningHis)) {
-                    LambdaQueryWrapper<PmBidWinningOpeningRefHis> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
-                    lambdaQueryWrapper2.eq(PmBidWinningOpeningRefHis::getWinningId, pmBidWinningHis.getId()).eq(PmBidWinningOpeningRefHis::getReturnOrderNumber,returnOrderNumber)
-                            .eq(PmBidWinningOpeningRefHis::getStatus, BidWinningStatus.NORMAL.getCode());
-                    List<PmBidWinningOpeningRefHis> pmBidWinningOpeningRefHisList = this.pmBidWinningOpeningRefHisService.list(lambdaQueryWrapper2);
-                    if (!ObjectUtils.isEmpty(pmBidWinningOpeningRefHisList)) {
-                        List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
-                        List<SysFileInfo> fileInfosAll = new ArrayList<>();
-                        for (PmBidWinningOpeningRefHis pmBidWinningOpeningRefHis : pmBidWinningOpeningRefHisList) {
-                            LambdaQueryWrapper<PmBidOpeningHis> lambdaQueryWrapper3 = new LambdaQueryWrapper<>();
-                            lambdaQueryWrapper3.eq(PmBidOpeningHis::getId,pmBidWinningOpeningRefHis.getOpeningId()).eq(PmBidOpeningHis::getReturnOrderNumber,returnOrderNumber);
-                            PmBidOpeningHis pmBidOpeningHis = this.pmBidOpeningHisService.getOne(lambdaQueryWrapper3);
-                            if (pmBidOpeningHis != null) {
-                                PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
-                                BeanUtils.copyProperties(pmBidWinningHis, pmBidWinningResVo);
-                                pmBidWinningResVo.setBidWinningName(pmBidOpeningHis.getBidderName());
-
-                                List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "" + pmBidWinningHis.getReturnOrderNumber()));
-                                if (!ObjectUtils.isEmpty(fileInfos)) {
-                                    fileInfosAll.addAll(fileInfos);
-                                }
-                                pmBidWinningResVoList.add(pmBidWinningResVo);
-                            }
+                        .ne(PmBidWinningHis::getStatus, BidWinningStatus.BE_REPLACED.getCode())
+                        .orderByDesc(PmBidWinningHis::getBidAnnouncementTime);
+                List<PmBidWinningHis> pmBidWinningHisList = this.pmBidWinningHisService.list(lambdaQueryWrapper1);
+                if (!ObjectUtils.isEmpty(pmBidWinningHisList)) {
+                    List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
+                    List<SysFileInfo> fileInfosAll = new ArrayList<>();
+                    for (PmBidWinningHis pmBidWinningHis : pmBidWinningHisList) {
+                        PmBidWinningResVo pmBidWinningResVo = new PmBidWinningResVo();
+                        BeanUtils.copyProperties(pmBidWinningHis, pmBidWinningResVo);
+                        pmBidWinningResVoList.add(pmBidWinningResVo);
 
+                        List<SysFileInfo> fileInfos = getSysFileInfoList(pmBidWinningResVo.getId(), Integer.parseInt(SysFileRefEnum.PM_BID_WINNING_FILE.getType() + "" + pmBidWinningHis.getReturnOrderNumber()));
+                        if (!ObjectUtils.isEmpty(fileInfos)) {
+                            fileInfosAll.addAll(fileInfos);
                         }
-                        pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
-                        pmPurchaseExecutionResVo.setPmBidWinningFileInfos(fileInfosAll);
-                    }
 
+                    }
+                    pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
+                    pmPurchaseExecutionResVo.setPmBidWinningFileInfos(fileInfosAll);
                 }
 
                 //标后质疑

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

@@ -334,35 +334,24 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 //评标结果公告列表
                 LambdaQueryWrapper<PmBidWinning> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
                 lambdaQueryWrapper1.eq(PmBidWinning::getDemandId, demandId)
-                        .eq(PmBidWinning::getStatus, BidWinningStatus.NORMAL.getCode());
-                PmBidWinning pmBidWinning = this.pmBidWinningService.getOne(lambdaQueryWrapper1);
-                if (!ObjectUtils.isEmpty(pmBidWinning)) {
-                    LambdaQueryWrapper<PmBidWinningOpeningRef> lambdaQueryWrapper2 = new LambdaQueryWrapper<>();
-                    lambdaQueryWrapper2.eq(PmBidWinningOpeningRef::getWinningId, pmBidWinning.getId())
-                            .eq(PmBidWinningOpeningRef::getStatus, BidWinningStatus.NORMAL.getCode());
-                    List<PmBidWinningOpeningRef> pmBidWinningOpeningRefList = this.pmBidWinningOpeningRefService.list(lambdaQueryWrapper2);
-                    if (!ObjectUtils.isEmpty(pmBidWinningOpeningRefList)) {
-                        List<PmBidWinningResVo> pmBidWinningResVoList = new ArrayList<>();
-                        List<SysFileInfo> fileInfosAll = 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(pmBidWinningResVo.getId(), SysFileRefEnum.PM_BID_WINNING_FILE.getType());
-                                if (!ObjectUtils.isEmpty(fileInfos)) {
-                                    fileInfosAll.addAll(fileInfos);
-                                }
-                                pmBidWinningResVoList.add(pmBidWinningResVo);
-                            }
+                        .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);
-                    }
 
+                    }
+                    pmPurchaseExecutionResVo.setPmBidWinningResVoList(pmBidWinningResVoList);
+                    pmPurchaseExecutionResVo.setPmBidWinningFileInfos(fileInfosAll);
                 }
 
                 //标后质疑