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/ShouyeGonggao/ShouyeGonggaoService.cs | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 118 insertions(+), 1 deletions(-) diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs index 1bbb136..607d374 100644 --- a/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs +++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs @@ -30,6 +30,8 @@ using RazorEngine.Compilation.ImpromptuInterface; using MimeKit; using FZFCGDD.ORDER.Application.Service.Neirongfabu.Dto; +using FZCZTB.NET.MD.CutomerMd.Extend; +using static FZCZTB.TSCL.Application.ChangeTenderOrderOut; namespace FZCZTB.TSCL.Application; /// <summary> @@ -95,7 +97,7 @@ var query = _ChangeOrderRep.AsQueryable() .OrderByDescending(x => x.CreateTime) - .Select(x => new ChangeTenderOrderOut { Id = x.Id, TenderId = x.TenderId, ProjectName = x.ProjectName, ToubiaoStartDate = x.ToubiaoStartDate.Value, ToubiaoEndDate = x.ToubiaoEndDate.Value, KaibiaoDate = x.KaibiaoDate.Value, Biangengwenjian = x.Biangengwenjian, Kaibiaodidian = x.Kaibiaodidian, CreateTime = x.CreateTime }) + .Select(x => new ChangeTenderOrderOut { Id = x.Id, TenderId = x.TenderId, ProjectName = x.ProjectName, ToubiaoStartDate = x.ToubiaoStartDate.Value, ToubiaoEndDate = x.ToubiaoEndDate.Value, KaibiaoDate = x.KaibiaoDate.Value, Biangengwenjian = x.Biangengwenjian,BiangengwenjianName = x.BiangengwenjianName, Kaibiaodidian = x.Kaibiaodidian, CreateTime = x.CreateTime }) .Take(7); @@ -487,4 +489,119 @@ return neirongfabuOutput; } + + + + /// <summary> + /// 鑾峰彇闈炴斂搴滆鍗曞鐞嗚鎯� 鈩癸笍 + /// </summary> + /// <param name="input"></param> + /// <returns></returns> + [DisplayName("鑾峰彇闈炴斂搴滆鍗曞鐞嗚鎯�")] + [AllowAnonymous] + [ApiDescriptionSettings(Name = "Detail"), HttpGet] + public async Task<TenderOrderOutput> TenderDetail([FromQuery] QueryByIdTenderOrderInput input) + { + var Kaibiaofangshi = await GetDataListByCode("Kaibiaofangshi"); + var Caigoufangshi = await GetDataListByCode("Caigoufangshi"); + var Hangyepinmu = await GetDataListByCode("Hangyepingmu"); + var Fuhetitoubiao = await GetDataListByCode("Fuhetitoubiao"); + var Dingbiaoguize = await GetDataListByCode("Dingbiaoguize"); + var Daimaleixing = await GetDataListByCode("Daimaleixing"); + + var YesNoEnum = await GetDataListByCode("YesNoEnum"); + + + + + + + var OrderStatus = await GetDataListByCode("OrderStatus"); + var tenderOrderOutput = await _TenderOrderRep.AsQueryable().Where(x => x.Id == input.Id).Select<TenderOrderOutput>().FirstAsync(); + if (tenderOrderOutput != null) + { + if (!string.IsNullOrEmpty(tenderOrderOutput.Kaibiaofangshi)) + { + tenderOrderOutput.KaibiaofangshiName = Kaibiaofangshi.Where(x => x.Value == tenderOrderOutput.Kaibiaofangshi).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Caigoufangshi)) + { + tenderOrderOutput.CaigoufangshiName = Caigoufangshi.Where(x => x.Value == tenderOrderOutput.Caigoufangshi).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Hangyepinmu)) + { + tenderOrderOutput.HangyepinmuName = Hangyepinmu.Where(x => x.Value == tenderOrderOutput.Hangyepinmu).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Lianhetitoubiao)) + { + tenderOrderOutput.LianhetitoubiaoName = Fuhetitoubiao.Where(x => x.Value == tenderOrderOutput.Lianhetitoubiao).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Dingbiaoguize)) + { + tenderOrderOutput.DingbiaoguizeName = Dingbiaoguize.Where(x => x.Value == tenderOrderOutput.Dingbiaoguize).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Daimaleixing)) + { + tenderOrderOutput.DaimaleixingName = Daimaleixing.Where(x => x.Value == tenderOrderOutput.Daimaleixing).Select(x => x.Label).FirstOrDefault() ?? ""; + } + + if (!string.IsNullOrEmpty(tenderOrderOutput.Shifoufenbao)) + { + tenderOrderOutput.ShifoufenbaoName = YesNoEnum.Where(x => x.Value == tenderOrderOutput.Shifoufenbao).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (!string.IsNullOrEmpty(tenderOrderOutput.Shifoutuisongxuanchuan)) + { + tenderOrderOutput.ShifoutuisongxuanchuanName = YesNoEnum.Where(x => x.Value == tenderOrderOutput.Shifoutuisongxuanchuan).Select(x => x.Label).FirstOrDefault() ?? ""; + } + if (tenderOrderOutput.OrderStatus.HasValue) + { + tenderOrderOutput.OrderStatusName = OrderStatus.Where(x => x.Value == tenderOrderOutput.OrderStatus.Value.ToString()).Select(x => x.Label).FirstOrDefault() ?? ""; + } + + } + + var changeOrder = await _ChangeOrderRep.AsQueryable().Where(x => x.TenderId == input.Id).FirstAsync(); + tenderOrderOutput.changeOrder = changeOrder; + + + var tenderOrderBiddings = await _sqlSugarClient.Queryable<TenderOrderBidding>() + .Where(x => x.TenderId == input.Id) + .Where(x => x.IsTransfer == true) + .Select<TenderOrderBiddingOutput>().ToListAsync(); + + if (tenderOrderBiddings != null) + { + foreach (var tenderOrderBiddingOutput in tenderOrderBiddings) + { + if (tenderOrderBiddingOutput.IsSelected.HasValue && tenderOrderBiddingOutput.IsSelected.Value) + { + tenderOrderBiddingOutput.IsSelectedName = "鏄�"; + } + else + { + tenderOrderBiddingOutput.IsSelectedName = "鍚�"; + } + + if (tenderOrderBiddingOutput.IsTransfer.HasValue && tenderOrderBiddingOutput.IsTransfer.Value) + { + tenderOrderBiddingOutput.IsTransferName = "鏄�"; + } + else + { + tenderOrderBiddingOutput.IsTransferName = "鍚�"; + } + var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.CustomerId == tenderOrderBiddingOutput.CreateUserId && x.TransactionCode == "GYS" && x.steps == CusExtendStep.Pass).FirstAsync(); + if (cusExtend != null) + { + tenderOrderBiddingOutput.ChangshangName = cusExtend.EnterpriseName; + } + + } + } + tenderOrderOutput.tenderOrderBiddings = tenderOrderBiddings; + + + + return tenderOrderOutput; + } } -- Gitblit v1.9.1