From 6d7450556d93c6e607df55b3d43a63650f0ed740 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B4=81=20=E4=BB=BB?= Date: Tue, 3 Mar 2026 08:38:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BidAnnouncementApp.cs | 32 ++++++++++++------- OpenAuth.Repository/Domain/PpAnnouncement.cs | 2 +- OpenAuth.Repository/Domain/PpBiddinginfo.cs | 2 +- 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/OpenAuth.App/ServiceApp/BidAnnouncementManager/BidAnnouncementApp.cs b/OpenAuth.App/ServiceApp/BidAnnouncementManager/BidAnnouncementApp.cs index cb3758c..f526fe7 100644 --- a/OpenAuth.App/ServiceApp/BidAnnouncementManager/BidAnnouncementApp.cs +++ b/OpenAuth.App/ServiceApp/BidAnnouncementManager/BidAnnouncementApp.cs @@ -210,8 +210,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager .LeftJoin((r, b) => r.BidingInfoId == b.Id) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .Where((r, b) => companyids.Contains(b.BiddingCompanyId)) - .OrderByDescending((r, b) => r.CreateTime) - .Select((r, b) => new + .LeftJoin((r, b, p) => b.BiddingCompanyId == p.Id) + .OrderByDescending((r, b, p) => r.CreateTime) + .Select((r, b, p) => new { r.Id, r.BidingInfoId, @@ -224,7 +225,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager b.ProjectNum, b.BiddingType, r.Files, - r.IsReview + r.IsReview, + p.Name }) .ToPageListAsync(page, limit, totalNumber); } @@ -240,8 +242,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager .LeftJoin((r, b) => r.BidingInfoId == b.Id) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .Where((r, b) => companyids.Contains(b.BidAgent)) - .OrderByDescending((r, b) => r.CreateTime) - .Select((r, b) => new + .LeftJoin((r, b, p) => b.BiddingCompanyId == p.Id) + .OrderByDescending((r, b, p) => r.CreateTime) + .Select((r, b, p) => new { r.Id, r.BidingInfoId, @@ -254,7 +257,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager b.ProjectNum, b.BiddingType, r.Files, - r.IsReview + r.IsReview, + p.Name }) .ToPageListAsync(page, limit, totalNumber); } @@ -277,8 +281,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager .LeftJoin((r, b) => r.BidingInfoId == b.Id) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .Where((r, b) => biddingcomid.Contains(b.BiddingCompanyId)) - .OrderByDescending((r, b) => r.CreateTime) - .Select((r, b) => new + .LeftJoin((r, b, p) => b.BiddingCompanyId == p.Id) + .OrderByDescending((r, b, p) => r.CreateTime) + .Select((r, b, p) => new { r.Id, r.BidingInfoId, @@ -291,7 +296,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager b.ProjectNum, b.BiddingType, r.Files, - r.IsReview + r.IsReview, + p.Name }) .ToPageListAsync(page, limit, totalNumber); } @@ -304,8 +310,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager .WhereIF(type != null, r => r.Type == type) .LeftJoin((r, b) => r.BidingInfoId == b.Id) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) - .OrderByDescending((r, b) => r.CreateTime) - .Select((r, b) => new + .LeftJoin((r, b, p) => b.BiddingCompanyId == p.Id) + .OrderByDescending((r, b, p) => r.CreateTime) + .Select((r, b, p) => new { r.Id, r.BidingInfoId, @@ -318,7 +325,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager b.ProjectNum, b.BiddingType, r.Files, - r.IsReview + r.IsReview, + p.Name }) .ToPageListAsync(page, limit, totalNumber); } diff --git a/OpenAuth.Repository/Domain/PpAnnouncement.cs b/OpenAuth.Repository/Domain/PpAnnouncement.cs index ad72975..40010b4 100644 --- a/OpenAuth.Repository/Domain/PpAnnouncement.cs +++ b/OpenAuth.Repository/Domain/PpAnnouncement.cs @@ -83,6 +83,6 @@ namespace OpenAuth.Repository.Domain /// /// 审核是否通过 /// - public bool IsReview { get; set; } + public bool? IsReview { get; set; } } } diff --git a/OpenAuth.Repository/Domain/PpBiddinginfo.cs b/OpenAuth.Repository/Domain/PpBiddinginfo.cs index 62f89af..6df954a 100644 --- a/OpenAuth.Repository/Domain/PpBiddinginfo.cs +++ b/OpenAuth.Repository/Domain/PpBiddinginfo.cs @@ -135,6 +135,6 @@ namespace OpenAuth.Repository.Domain /// /// 审核是否通过 /// - public bool IsReview { get;set;} + public bool? IsReview { get;set;} } }