From 6ab0870590763e83181a47d0e42039be4287329f Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期四, 14 八月 2025 14:05:57 +0800 Subject: [PATCH] 修改附件 --- Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 73 +++++++++++++++++++++++++----------- 1 files changed, 50 insertions(+), 23 deletions(-) diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs index 5ce9d3c..703035d 100644 --- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs +++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs @@ -636,7 +636,7 @@ entity.UpdateUserName = RealName; entity.FabuDate = entity.UpdateTime; entity.OrderStatus = 2; - await _sqlSugarClient.Updateable(entity).UpdateColumns(x => new { x.ToubiaoStartDate, x.ToubiaoEndDate, x.KaibiaoDate, x.FabuDate, x.Zhaobiaowenjian, x.Fujian, x.Kaibiaodidian, x.UpdateTime, x.UpdateUserId, x.UpdateUserName,x.OrderStatus }).ExecuteCommandAsync(); + await _sqlSugarClient.Updateable(entity).UpdateColumns(x => new { x.ToubiaoStartDate, x.ToubiaoEndDate, x.KaibiaoDate, x.FabuDate, x.Zhaobiaowenjian,x.ZhaobiaowenjianName, x.Fujian,x.FujianName, x.Kaibiaodidian, x.UpdateTime, x.UpdateUserId, x.UpdateUserName,x.OrderStatus }).ExecuteCommandAsync(); //await _TenderOrderRep.UpdateAsync(entity); } @@ -713,6 +713,7 @@ changeOrder.TenderId = input.TenderId; changeOrder.ProjectName = input.ProjectName; changeOrder.Biangengwenjian = input.Biangengwenjian; + changeOrder.BiangengwenjianName = input.BiangengwenjianName; changeOrder.CreateTime = DateTime.Now; changeOrder.CreateUserId = usertrueId; changeOrder.CreateUserName = RealName; @@ -821,30 +822,47 @@ throw Oops.Oh("宸茬粡涓爣鐨勯」鐩笉鑳藉啀娆′腑鏍囷紒"); } - - var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == input.SupplierUserId).FirstAsync(); - if (tenderOrderBidding == null) + var ssss = input.SupplierUserIds.Split(','); + if (string.IsNullOrEmpty(input.SupplierUserIds)) { - throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�"); + throw Oops.Oh("娌℃湁閫変腑涓爣渚涘簲鍟嗭紒"); } - if (tenderOrderBidding.IsTransfer != true ) + foreach ( var sss in ssss) { - throw Oops.Oh("娌℃湁鏀粯鎶ュ悕璐广�備笉鑳戒腑鏍囷紒"); - } - if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian) ) - { - throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒"); + var SupplierUserId = long.Parse(sss); + var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == SupplierUserId).FirstAsync(); + if (tenderOrderBidding == null) + { + throw Oops.Oh("涓嶅瓨鍦ㄧ殑鎶曟爣锛�"); + } + if (tenderOrderBidding.IsTransfer != true) + { + throw Oops.Oh("娌℃湁鏀粯鎶ュ悕璐广�備笉鑳戒腑鏍囷紒"); + } + if (string.IsNullOrEmpty(tenderOrderBidding.Touboaowenjian)) + { + throw Oops.Oh("娌℃湁鎶曟爣鏂囦欢銆備笉鑳戒腑鏍囷紒"); + } } - tenderOrder.ZhongbiaoId = input.SupplierUserId; + + + tenderOrder.ZhongbiaoId = null; //tenderOrder.ZhongbiaoName = input.SupplierUserName; - var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == input.SupplierUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass ).FirstAsync(); - if (cusExtend != null) + tenderOrder.ZhongbiaoName = ""; + foreach (var sss in ssss) { - tenderOrder.ZhongbiaoName = cusExtend.EnterpriseName; + var SupplierUserId = long.Parse(sss); + var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == SupplierUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync(); + if (cusExtend != null) + { + tenderOrder.ZhongbiaoName += cusExtend.EnterpriseName+","; + } } + tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian; + tenderOrder.ZhongbiaowenjianName = input.ZhongbiaowenjianName; tenderOrder.ZhongbiaoDate = DateTime.Now; tenderOrder.UpdateTime = DateTime.Now; tenderOrder.UpdateUserId = usertrueId; @@ -854,17 +872,26 @@ await _TenderOrderRep.UpdateAsync(tenderOrder); - tenderOrderBidding.IsSelected = true; - tenderOrderBidding.SelectedTime = tenderOrder.ZhongbiaoDate; - tenderOrderBidding.UpdateTime = DateTime.Now; - tenderOrderBidding.UpdateUserId = usertrueId; - tenderOrderBidding.UpdateUserName = RealName; + foreach (var sss in ssss) + { + var SupplierUserId = long.Parse(sss); + var tenderOrderBidding = await _TenderOrderBiddingRep.AsQueryable().Where(x => x.TenderId == input.TenderOrderId).Where(x => x.CreateUserId == SupplierUserId).FirstAsync(); + tenderOrderBidding.IsSelected = true; + tenderOrderBidding.SelectedTime = tenderOrder.ZhongbiaoDate; + tenderOrderBidding.UpdateTime = DateTime.Now; + tenderOrderBidding.UpdateUserId = usertrueId; + tenderOrderBidding.UpdateUserName = RealName; + await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding); + } + + return true; - - - return await _TenderOrderBiddingRep.UpdateAsync(tenderOrderBidding); + + + + } -- Gitblit v1.9.1