HC_YFZX
/
xinyimengzhaocaipingtai
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改

master
洁 任 2026-03-03 08:38:03 +08:00
parent de62011502
commit 6d7450556d
3 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
OpenAuth.App/ServiceApp/BidAnnouncementManager/BidAnnouncementApp.cs
View File

@ -210,8 +210,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
.LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id) .LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id)
.WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype)
.Where((r, b) => companyids.Contains(b.BiddingCompanyId)) .Where((r, b) => companyids.Contains(b.BiddingCompanyId))
.OrderByDescending((r, b) => r.CreateTime) .LeftJoin<PpBiddingcompany>((r, b, p) => b.BiddingCompanyId == p.Id)
.Select<dynamic>((r, b) => new .OrderByDescending((r, b, p) => r.CreateTime)
.Select<dynamic>((r, b, p) => new
{ {
r.Id, r.Id,
r.BidingInfoId, r.BidingInfoId,
@ -224,7 +225,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
b.ProjectNum, b.ProjectNum,
b.BiddingType, b.BiddingType,
r.Files, r.Files,
r.IsReview r.IsReview,
p.Name
}) })
.ToPageListAsync(page, limit, totalNumber); .ToPageListAsync(page, limit, totalNumber);
} }
@ -240,8 +242,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
.LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id) .LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id)
.WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype)
.Where((r, b) => companyids.Contains(b.BidAgent)) .Where((r, b) => companyids.Contains(b.BidAgent))
.OrderByDescending((r, b) => r.CreateTime) .LeftJoin<PpBiddingcompany>((r, b, p) => b.BiddingCompanyId == p.Id)
.Select<dynamic>((r, b) => new .OrderByDescending((r, b, p) => r.CreateTime)
.Select<dynamic>((r, b, p) => new
{ {
r.Id, r.Id,
r.BidingInfoId, r.BidingInfoId,
@ -254,7 +257,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
b.ProjectNum, b.ProjectNum,
b.BiddingType, b.BiddingType,
r.Files, r.Files,
r.IsReview r.IsReview,
p.Name
}) })
.ToPageListAsync(page, limit, totalNumber); .ToPageListAsync(page, limit, totalNumber);
} }
@ -277,8 +281,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
.LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id) .LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id)
.WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype)
.Where((r, b) => biddingcomid.Contains(b.BiddingCompanyId)) .Where((r, b) => biddingcomid.Contains(b.BiddingCompanyId))
.OrderByDescending((r, b) => r.CreateTime) .LeftJoin<PpBiddingcompany>((r, b, p) => b.BiddingCompanyId == p.Id)
.Select<dynamic>((r, b) => new .OrderByDescending((r, b, p) => r.CreateTime)
.Select<dynamic>((r, b, p) => new
{ {
r.Id, r.Id,
r.BidingInfoId, r.BidingInfoId,
@ -291,7 +296,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
b.ProjectNum, b.ProjectNum,
b.BiddingType, b.BiddingType,
r.Files, r.Files,
r.IsReview r.IsReview,
p.Name
}) })
.ToPageListAsync(page, limit, totalNumber); .ToPageListAsync(page, limit, totalNumber);
} }
@ -304,8 +310,9 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
.WhereIF(type != null, r => r.Type == type) .WhereIF(type != null, r => r.Type == type)
.LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id) .LeftJoin<PpBiddinginfo>((r, b) => r.BidingInfoId == b.Id)
.WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype) .WhereIF(!string.IsNullOrEmpty(bidtype), (r, b) => b.BiddingType == bidtype)
.OrderByDescending((r, b) => r.CreateTime) .LeftJoin<PpBiddingcompany>((r, b, p) => b.BiddingCompanyId == p.Id)
.Select<dynamic>((r, b) => new .OrderByDescending((r, b, p) => r.CreateTime)
.Select<dynamic>((r, b, p) => new
{ {
r.Id, r.Id,
r.BidingInfoId, r.BidingInfoId,
@ -318,7 +325,8 @@ namespace OpenAuth.App.ServiceApp.BidAnnouncementManager
b.ProjectNum, b.ProjectNum,
b.BiddingType, b.BiddingType,
r.Files, r.Files,
r.IsReview r.IsReview,
p.Name
}) })
.ToPageListAsync(page, limit, totalNumber); .ToPageListAsync(page, limit, totalNumber);
} }

2
OpenAuth.Repository/Domain/PpAnnouncement.cs
View File

@ -83,6 +83,6 @@ namespace OpenAuth.Repository.Domain
/// <summary> /// <summary>
/// 审核是否通过 /// 审核是否通过
/// </summary> /// </summary>
public bool IsReview { get; set; } public bool? IsReview { get; set; }
} }
} }

2
OpenAuth.Repository/Domain/PpBiddinginfo.cs
View File

@ -135,6 +135,6 @@ namespace OpenAuth.Repository.Domain
/// <summary> /// <summary>
/// 审核是否通过 /// 审核是否通过
/// </summary> /// </summary>
public bool IsReview { get;set;} public bool? IsReview { get;set;}
} }
} }