Merge remote-tracking branch 'origin/master'

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

@@ -332,7 +332,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
                 if (!ObjectUtils.isEmpty(taskReleaseFileInfos)) {
                     vo.setTaskReleaseFileInfos(taskReleaseFileInfos);
                 }
-            } else if ("4".equals(detailType)) { //中标信息
+            } else if ("4".equals(detailType) || "5".equals(detailType)) { //中标信息
                 PmPurchaseExecutionResVo pmPurchaseExecutionResVo = new PmPurchaseExecutionResVo();
 
                 //代理商信息
@@ -371,7 +371,7 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
 
                 //采购公告列表
                 LambdaQueryWrapper<PmReleaseAnnouncement> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-                lambdaQueryWrapper.eq(PmReleaseAnnouncement::getDemandId, demandId);
+                lambdaQueryWrapper.eq(PmReleaseAnnouncement::getDemandId, demandId).orderByDesc(PmReleaseAnnouncement::getReleaseTime);
                 List<PmReleaseAnnouncement> pmReleaseAnnouncementList = this.pmReleaseAnnouncementService.list(lambdaQueryWrapper);
                 if (!ObjectUtils.isEmpty(pmReleaseAnnouncementList)) {
                     List<PmReleaseAnnouncementResVo> pmReleaseAnnouncementResVoList = new ArrayList<>();