From ed76eb5fe78b4f5d7d9b9bfba47a01faa1d44a07 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期三, 13 八月 2025 13:47:58 +0800
Subject: [PATCH] 一些修改
---
Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs | 117 +++++++++++++++++++++++++++++++++++++++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs | 5 -
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 15 ++++
3 files changed, 131 insertions(+), 6 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..a538d6f 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>
@@ -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;
+ }
}
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
index b2a896a..92c3cc6 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -970,11 +970,6 @@
[Required(ErrorMessage = "涓爣渚涘簲鍟唅d涓嶈兘涓虹┖")]
public long SupplierUserId { get; set; }
- /// <summary>
- /// 涓爣渚涘簲鍟哊ame
- /// </summary>
- [Required(ErrorMessage = "涓爣渚涘簲鍟哊ame涓嶈兘涓虹┖")]
- public string SupplierUserName { get; set; }
/// <summary>
/// 涓爣tittle
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
index 806d874..5ce9d3c 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -30,6 +30,7 @@
using RazorEngine.Compilation.ImpromptuInterface;
using MimeKit;
using static FZCZTB.TSCL.Application.ChangeTenderOrderOut;
+using FZCZTB.NET.MD.CutomerMd.Extend;
namespace FZCZTB.TSCL.Application;
/// <summary>
@@ -353,6 +354,12 @@
{
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;
@@ -830,7 +837,13 @@
}
tenderOrder.ZhongbiaoId = input.SupplierUserId;
- tenderOrder.ZhongbiaoName = input.SupplierUserName;
+ //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 = cusExtend.EnterpriseName;
+ }
+
tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
tenderOrder.ZhongbiaoDate = DateTime.Now;
tenderOrder.UpdateTime = DateTime.Now;
--
Gitblit v1.9.1