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/FZCZTB.NET.MD/TenderOrderBidding.cs | 6 +++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs | 25 ++++++++++++
Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs | 2
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs | 39 ++++++++++++++++++-
Admin.NET/FZCZTB.NET.MD/ChangeOrder.cs | 6 +++
Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs | 4 +
Admin.NET/FZCZTB.NET.MD/TenderOrder.cs | 22 ++++++++++-
Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs | 2 +
8 files changed, 99 insertions(+), 7 deletions(-)
diff --git a/Admin.NET/FZCZTB.NET.MD/ChangeOrder.cs b/Admin.NET/FZCZTB.NET.MD/ChangeOrder.cs
index 4aab47d..b2c2d61 100644
--- a/Admin.NET/FZCZTB.NET.MD/ChangeOrder.cs
+++ b/Admin.NET/FZCZTB.NET.MD/ChangeOrder.cs
@@ -41,6 +41,12 @@
public string Biangengwenjian { get; set; }
/// <summary>
+ /// 鍙樻洿鏂囦欢Name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "鍙樻洿鏂囦欢Name")]
+ public string BiangengwenjianName { get; set; }
+
+ /// <summary>
/// 鎶曟爣鎶ュ悕寮�濮嬫椂闂�
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "鎶曟爣鎶ュ悕寮�濮嬫椂闂�")]
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
index c73065e..921d258 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrder.cs
@@ -267,10 +267,22 @@
public string Zhaobiaowenjian { get; set; }
/// <summary>
+ /// 鎷涙爣鏂囦欢Name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "鎷涙爣鏂囦欢Name")]
+ public string ZhaobiaowenjianName { get; set; }
+
+ /// <summary>
/// 闄勪欢
/// </summary>
[SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "闄勪欢")]
public string Fujian { get; set; }
+
+ /// <summary>
+ /// 闄勪欢Name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "闄勪欢Name")]
+ public string FujianName { get; set; }
/// <summary>
/// 寮�鏍囧湴鐐�
@@ -288,7 +300,7 @@
/// <summary>
/// 涓爣渚涘簲鍟嗗鍚�
/// </summary>
- [SugarColumn(IsNullable = true, ColumnDescription = "涓爣渚涘簲鍟嗗鍚�", Length = 100)]
+ [SugarColumn(IsNullable = true, ColumnDescription = "涓爣渚涘簲鍟嗗鍚�", Length = 2000)]
public string ZhongbiaoName { get; set; }
/// <summary>
@@ -307,10 +319,16 @@
/// <summary>
/// 涓爣鏂囦欢
/// </summary>
- [SugarColumn(Length = 2000, IsNullable = true, ColumnDescription = "涓爣鏂囦欢")]
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "涓爣鏂囦欢")]
public string Zhongbiaowenjian { get; set; }
/// <summary>
+ /// 涓爣鏂囦欢Name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "涓爣鏂囦欢涓爣鏂囦欢Name")]
+ public string ZhongbiaowenjianName { get; set; }
+
+ /// <summary>
/// 涓爣鏃堕棿
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "涓爣鏃堕棿")]
diff --git a/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs b/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
index 71747ad..ffd92ac 100644
--- a/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
+++ b/Admin.NET/FZCZTB.NET.MD/TenderOrderBidding.cs
@@ -35,6 +35,12 @@
[SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "鎶曟爣鏂囦欢")]
public string Touboaowenjian { get; set; }
+ /// <summary>
+ /// 鎶曟爣鏂囦欢name
+ /// </summary>
+ [SugarColumn(Length = 512, IsNullable = true, ColumnDescription = "鎶曟爣鏂囦欢Name")]
+ public string TouboaowenjianName { get; set; }
+
/// <summary>
/// 鏄惁涓爣
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs
index a538d6f..607d374 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/ShouyeGonggao/ShouyeGonggaoService.cs
@@ -97,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);
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
index 8408896..84eb371 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/SuplierTendOrder/SuplierTendOrderService.cs
@@ -316,6 +316,7 @@
tenderOrderBidding.Id = Guid.NewGuid();
tenderOrderBidding.TenderId = input.TenderOrderId;
tenderOrderBidding.Touboaowenjian = input.Touboaowenjian;
+ tenderOrderBidding.TouboaowenjianName = input.TouboaowenjianName;
tenderOrderBidding.IsTransfer = true;
tenderOrderBidding.Zhifujine = 0;
tenderOrderBidding.CreateTime = DateTime.Now;
@@ -328,6 +329,7 @@
}
tenderOrderBidding.Touboaowenjian = input.Touboaowenjian;
+ tenderOrderBidding.TouboaowenjianName = input.TouboaowenjianName;
tenderOrderBidding.UpdateTime = DateTime.Now;
tenderOrderBidding.UpdateUserId = usertrueId;
tenderOrderBidding.UpdateUserName = RealName;
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 c5f0289..243d096 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderInput.cs
@@ -818,10 +818,23 @@
public string Zhaobiaowenjian { get; set; }
/// <summary>
+ /// 鎷涙爣鏂囦欢Name
+ /// </summary>
+ [MaxLength(512, ErrorMessage = "鎷涙爣鏂囦欢Name瀛楃闀垮害涓嶈兘瓒呰繃512")]
+ [Required(ErrorMessage = "鎷涙爣鏂囦欢Name涓嶈兘涓虹┖")]
+ public string ZhaobiaowenjianName { get; set; }
+
+ /// <summary>
/// 闄勪欢
/// </summary>
[MaxLength(512, ErrorMessage = "闄勪欢瀛楃闀垮害涓嶈兘瓒呰繃512")]
public string Fujian { get; set; }
+
+ /// <summary>
+ /// 闄勪欢Name
+ /// </summary>
+ [MaxLength(512, ErrorMessage = "闄勪欢瀛楃Name闀垮害涓嶈兘瓒呰繃512")]
+ public string FujianName { get; set; }
/// <summary>
/// 寮�鏍囧湴鐐�
@@ -883,11 +896,18 @@
//public DateTime? FabuDate { get; set; }
/// <summary>
- /// 鎷涙爣鏂囦欢
+ /// 鍙樻洿鏂囦欢
/// </summary>
- [MaxLength(512, ErrorMessage = "鎷涙爣鏂囦欢瀛楃闀垮害涓嶈兘瓒呰繃512")]
- [Required(ErrorMessage = "鎷涙爣鏂囦欢涓嶈兘涓虹┖")]
+ [MaxLength(512, ErrorMessage = "鍙樻洿鏂囦欢瀛楃闀垮害涓嶈兘瓒呰繃512")]
+ [Required(ErrorMessage = "鍙樻洿鏂囦欢涓嶈兘涓虹┖")]
public string Biangengwenjian { get; set; }
+
+ /// <summary>
+ /// 鍙樻洿鏂囦欢Name
+ /// </summary>
+ [MaxLength(512, ErrorMessage = "鍙樻洿鏂囦欢Name瀛楃闀垮害涓嶈兘瓒呰繃512")]
+ [Required(ErrorMessage = "鍙樻洿鏂囦欢Name涓嶈兘涓虹┖")]
+ public string BiangengwenjianName { get; set; }
/// <summary>
@@ -941,6 +961,13 @@
[Required(ErrorMessage = "鎶曟爣鏂囦欢涓嶈兘涓虹┖")]
public string Touboaowenjian { get; set; }
+
+ /// <summary>
+ /// 鎶曟爣鏂囦欢Name
+ /// </summary>
+ [Required(ErrorMessage = "鎶曟爣鏂囦欢Name涓嶈兘涓虹┖")]
+ public string TouboaowenjianName { get; set; }
+
}
@@ -963,6 +990,12 @@
[Required(ErrorMessage = "涓爣鏂囦欢涓嶈兘涓虹┖")]
public string Zhongbiaowenjian { get; set; }
+ /// <summary>
+ /// 涓爣鏂囦欢Name
+ /// </summary>
+ [Required(ErrorMessage = "涓爣鏂囦欢Name涓嶈兘涓虹┖")]
+ public string ZhongbiaowenjianName { get; set; }
+
/// <summary>
/// 涓爣渚涘簲鍟唅d 閫楀彿鍒嗛殧锛� 12121212,232323,232323,232323
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 19c5544..159c2e5 100644
--- a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
+++ b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/Dto/TenderOrderOutput.cs
@@ -277,9 +277,20 @@
public string Zhaobiaowenjian { get; set; }
/// <summary>
+ /// 鎷涙爣鏂囦欢
+ /// </summary>
+ public string ZhaobiaowenjianName{ get; set; }
+
+ /// <summary>
/// 闄勪欢
/// </summary>
public string Fujian { get; set; }
+
+
+ /// <summary>
+ /// 闄勪欢
+ /// </summary>
+ public string FujianName { get; set; }
/// <summary>
/// 寮�鏍囧湴鐐�
@@ -342,6 +353,11 @@
/// 涓爣鏂囦欢
/// </summary>
public string Zhongbiaowenjian { get; set; }
+
+ /// <summary>
+ /// 涓爣鏂囦欢
+ /// </summary>
+ public string ZhongbiaowenjianName { get; set; }
/// <summary>
/// 涓爣鏃堕棿
@@ -468,6 +484,11 @@
/// </summary>
public string Biangengwenjian { get; set; }
+ /// <summary>
+ /// 鍙樻洿鏂囦欢Name
+ /// </summary>
+ public string BiangengwenjianName { get; set; }
+
/// <summary>
/// 寮�鏍囧湴鐐�
@@ -502,6 +523,10 @@
/// 鎶曟爣鏂囦欢
public string Touboaowenjian { get; set; }
+ /// <summary>
+ /// 鎶曟爣鏂囦欢
+ public string TouboaowenjianName { get; set; }
+
/// <summary>
/// 鏄惁涓爣
diff --git a/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs b/Admin.NET/FZFCGDD.ORDER.Application/Service/TenderOrder/TenderOrderService.cs
index 5d5d3a4..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;
@@ -861,6 +862,7 @@
tenderOrder.Zhongbiaowenjian = input.Zhongbiaowenjian;
+ tenderOrder.ZhongbiaowenjianName = input.ZhongbiaowenjianName;
tenderOrder.ZhongbiaoDate = DateTime.Now;
tenderOrder.UpdateTime = DateTime.Now;
tenderOrder.UpdateUserId = usertrueId;
--
Gitblit v1.9.1