From 1978a2687b298a69bc72d6eda0be8235bbca37d8 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 01 九月 2025 13:22:12 +0800
Subject: [PATCH] 修改了一些字段
---
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs | 18 ++++++++++++------
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 42 ++++++++++++++++++++++++++----------------
2 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
index 442c7d3..52ff946 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
@@ -253,18 +253,18 @@
/// <summary>
/// 鎶曟爣鎶ュ悕寮�濮嬫椂闂�
/// </summary>
- public DateTime ToubiaoStartDate { get; set; }
+ public DateTime? ToubiaoStartDate { get; set; }
/// <summary>
/// 鎶曟爣鎶ュ悕缁撴潫鏃堕棿
/// </summary>
- public DateTime ToubiaoEndDate { get; set; }
+ public DateTime? ToubiaoEndDate { get; set; }
/// <summary>
/// 寮�鏍囨椂闂�
/// </summary>
- public DateTime KaibiaoDate { get; set; }
+ public DateTime? KaibiaoDate { get; set; }
/// <summary>
/// 鍙戝竷鏃堕棿
@@ -470,18 +470,18 @@
/// <summary>
/// 鎶曟爣鎶ュ悕寮�濮嬫椂闂�
/// </summary>
- public DateTime ToubiaoStartDate { get; set; }
+ public DateTime? ToubiaoStartDate { get; set; }
/// <summary>
/// 鎶曟爣鎶ュ悕缁撴潫鏃堕棿
/// </summary>
- public DateTime ToubiaoEndDate { get; set; }
+ public DateTime? ToubiaoEndDate { get; set; }
/// <summary>
/// 寮�鏍囨椂闂�
/// </summary>
- public DateTime KaibiaoDate { get; set; }
+ public DateTime? KaibiaoDate { get; set; }
///// <summary>
///// 鍙戝竷鏃堕棿
@@ -632,6 +632,12 @@
public bool? IsDailiTransfer { get; set; }
/// <summary>
+ /// 鏄惁鏀粯浠ｇ悊璐�
+ /// </summary>
+ public string IsDailiTransferName { get; set; }
+
+
+ /// <summary>
/// 浠ｇ悊璐规敮浠樻椂闂�
/// </summary>
public DateTime? DailiTransferTime { get; set; }
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
index 2b1d6d4..5e5dc03 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
@@ -359,6 +359,16 @@
{
tenderOrderBiddingOutput.IsTransferName = "鍚�";
}
+
+ if (tenderOrderBiddingOutput.IsDailiTransfer.HasValue && tenderOrderBiddingOutput.IsDailiTransfer.Value)
+ {
+ tenderOrderBiddingOutput.IsDailiTransferName = "鏄�";
+ }
+ else
+ {
+ tenderOrderBiddingOutput.IsDailiTransferName = "鍚�";
+ }
+
var cusExtend = await _sqlSugarClient.Queryable<FBS_CusExtend>().Where(x => x.Id == tenderOrderBiddingOutput.CusExtendId).FirstAsync();
if (cusExtend != null)
{
@@ -397,7 +407,7 @@
var RealName = App.User?.FindFirstValue(ClaimConst.RealName);
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鑾峰彇鑱旂郴鏂瑰紡锛�");
}
@@ -408,7 +418,7 @@
.Where(x => x.Id == customerExId).FirstAsync();
if (fBS_CusExtend != null)
{
- if (CustomerLogoinType != "DLJG" )
+ if (CustomerLogoinType == "DLJG" )
{
tenderOrderOutput.Dailijigoumingcheng = fBS_CusExtend.EnterpriseName;
tenderOrderOutput.DailiLianxiren = fBS_CusExtend.OperatorName;
@@ -418,7 +428,7 @@
tenderOrderOutput.DailiXiangmujingli = "";
tenderOrderOutput.DailijingliLianxidianhua = "";
}
- else if (CustomerLogoinType != "CGR")
+ else if (CustomerLogoinType == "CGR")
{
tenderOrderOutput.Caigourenmingcheng = fBS_CusExtend.EnterpriseName;
tenderOrderOutput.Xingzhengquyu = "";
@@ -466,7 +476,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if(CustomerLogoinType!= "DLJG" || CustomerLogoinType != "CGR")
+ if(CustomerLogoinType!= "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鎷涙爣锛�");
}
@@ -506,7 +516,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊鎷涙爣锛�");
}
@@ -549,7 +559,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曡川鐤戯紒");
}
@@ -589,7 +599,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曟姇璇夛紒");
}
@@ -621,7 +631,7 @@
{
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍒犻櫎鎷涙爣锛�");
}
@@ -644,7 +654,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鎵归噺鍒犻櫎鎷涙爣锛�");
}
@@ -750,7 +760,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鎷涙爣锛�");
}
@@ -796,7 +806,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鏇存柊闈炴斂搴滆鍗曟爣棰橈紒");
}
@@ -836,7 +846,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷鍙樻洿鍏憡锛�");
}
@@ -935,7 +945,7 @@
{
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍒犻櫎鍙樻洿鍏憡锛�");
}
@@ -970,7 +980,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯鎶ュ悕璐癸紒");
}
@@ -1028,7 +1038,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘鍙戝竷涓爣鏂囦欢锛�");
}
@@ -1150,7 +1160,7 @@
string? CustomerLogoinType = App.User?.FindFirst(ClaimConst.CustomerLogoinType)?.Value;
- if (CustomerLogoinType != "DLJG" || CustomerLogoinType != "CGR")
+ if (CustomerLogoinType != "DLJG" && CustomerLogoinType != "CGR")
{
throw Oops.Oh("鍙湁鐧诲綍瑙掕壊鎷涙爣浠ｇ悊鏈烘瀯鎴栬�呴噰璐汉鎵嶈兘纭渚涘簲鍟嗗凡鏀粯浠ｇ悊璐癸紒");
}
--
Gitblit v1.9.1