From abe24f3ad638e033c0d13d6332ccae425d7d1ada Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期五, 25 十月 2024 10:07:31 +0800 Subject: [PATCH] 小修改 --- cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs | 174 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 173 insertions(+), 1 deletions(-) diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs index 93cef3f..d041cfe 100644 --- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs +++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs @@ -24,6 +24,11 @@ public int OrderUserId { get; set; } /// <summary> + /// 鎷涘伐鍏徃鍚嶇О + /// </summary> + public string OrderComName { get; set; } + + /// <summary> /// 鎷涘伐鍚嶇О /// </summary> public string OrderName { get; set; } @@ -146,6 +151,16 @@ public int WorderCounted { get; set; } /// <summary> + /// 鎶ュ悕浜烘暟 + /// </summary> + public int BaoMingCount { get; set; } + + /// <summary> + /// 寰呭鏍镐汉鏁� + /// </summary> + public int WorkerDaiCount { get; set; } + + /// <summary> /// 宸ヤ綔鍦扮偣 /// </summary> public string WorderAddress { get; set; } @@ -168,6 +183,11 @@ /// </summary> public decimal? WorkPrice { get; set; } + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPriceMax { get; set; } + /// <summary> /// 鎷涘伐鐘舵�� @@ -189,9 +209,76 @@ public string IsSelectedName { get; set; } /// <summary> + /// 褰撳墠宸ヤ环 + /// </summary> + public decimal? WorkPriceDangqian { get; set; } + + /// <summary> /// 鎷涘伐鏄庣粏 /// </summary> public List<OrderBiddingDto> orderBidding { get; set; } + + /// <summary> + /// 鍘嗗彶宸ヤ环 + /// </summary> + public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; } + + + + /// <summary> + /// 鑷瀹夋帓宸ヤ綔鏃堕棿 + /// </summary> + public bool? Zixinganpai { get; set; } + + + /// <summary> + /// 宸ヤ綔寮�濮嬫棩鏈熷悕绉� + /// </summary> + public string ZixinganpaiName + { + get + { + if (this.Zixinganpai.HasValue) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return "鑷瀹夋帓宸ヤ綔鏃堕棿"; + } + else + { + return ""; + } + + + } + } + + + /// <summary> + /// 鏄惁鏈夋晥 + /// </summary> + public bool IsEn { get; set; } + + + /// <summary> + /// 宸ヤ綔寮�濮嬫棩鏈熷悕绉� + /// </summary> + public string IsEnName + { + get + { + if (this.IsEn) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return "宸蹭笂鏋�"; + } + else + { + return "宸蹭笅鏋�"; + } + + + } + } } @@ -253,6 +340,16 @@ /// </summary> public decimal? Salary { get; set; } + + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPrice { get; set; } + + /// <summary> + /// 鍘嗗彶宸ヤ环 + /// </summary> + public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; } } @@ -283,6 +380,24 @@ + + + } + + + public class WorkPriceDto + { + + /// <summary> + /// 鎷涘伐鏄庣粏OrderBiddingId + /// </summary> + public int OrderBiddingId { get; set; } + + + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPrice { get; set; } } @@ -437,7 +552,13 @@ /// </summary> public int OrderBiddingDetailId { get; set; } - + + /// <summary> + /// 鎷涘伐Id + /// </summary> + public int OrderBiddingId { get; set; } + + /// <summary> /// 鎷涘伐鍚嶇О @@ -477,6 +598,16 @@ public decimal? WorkCount { get; set; } /// <summary> + /// 鐢ㄦ埛id + /// </summary> + public int WorkerUserId { get; set; } + + /// <summary> + /// 鐢ㄦ埛id + /// </summary> + public string WorkerUserName { get; set; } + + /// <summary> /// 褰撴棩宸ヨ祫 /// </summary> public decimal? TodaySalary { get; set; } @@ -494,9 +625,21 @@ public string IsShenPiName { get; set; } /// <summary> + /// 瀹℃壒鏃堕棿 + /// </summary> + public DateTime? ShenPitime { get; set; } + + /// <summary> /// 鎵撳崱鏄庣粏 /// </summary> public string DakaMingxi { get; set; } + + + /// <summary> + /// 鎷涘伐鍏徃鍚嶇О + /// </summary> + public string Suppliername { get; set; } + } @@ -559,6 +702,11 @@ /// 瀹℃壒鐘舵�� /// </summary> public int? IsShenPi { get; set; } + + /// <summary> + /// 瀹℃壒鏃堕棿 + /// </summary> + public DateTime? ShenPitime { get; set; } /// <summary> @@ -660,4 +808,28 @@ } + + + + + /// <summary> + /// 淇敼鍏徃绠$悊鍛� + /// </summary> + public class StaffAdminDto + { + + + + /// <summary> + /// 鐢ㄦ埛鍏徃id + /// </summary> + public int ComId { get; set; } + + /// <summary> + /// 鏄惁绠$悊鍛� + /// </summary> + public bool IsAdmin { get; set; } + + + } } -- Gitblit v1.9.1