From 039469c9070ffd15b6889d33f56e6af98a6f7739 Mon Sep 17 00:00:00 2001 From: username@email.com <yzy2002yzy@163.com> Date: 星期四, 10 十月 2024 12:01:12 +0800 Subject: [PATCH] 报名人数,待审核人数 --- cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs | 281 +++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 276 insertions(+), 5 deletions(-) diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs index 918d253..1ddcab4 100644 --- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs +++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs @@ -24,19 +24,116 @@ public int OrderUserId { get; set; } /// <summary> + /// 鎷涘伐鍏徃鍚嶇О + /// </summary> + public string OrderComName { get; set; } + + /// <summary> /// 鎷涘伐鍚嶇О /// </summary> public string OrderName { get; set; } /// <summary> - /// 宸ヤ綔寮�濮嬫椂闂� + /// 宸ヤ綔寮�濮嬫棩鏈� /// </summary> public DateTime? WordStartTime { get; set; } /// <summary> - /// 宸ヤ綔缁撴潫鏃堕棿 + /// 宸ヤ綔寮�濮嬫棩鏈熷悕绉� + /// </summary> + public string WordStartTimeName { + get + { + if (this.WordStartTime.HasValue) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return this.WordStartTime.Value.ToString("yyyy-MM-dd"); + } + else + { + return ""; + } + + + }} + + /// <summary> + /// 宸ヤ綔缁撴潫鏃ユ湡 /// </summary> public DateTime? WordEndTime { get; set; } + + /// <summary> + /// 宸ヤ綔缁撴潫鏃ユ湡鍚嶇О + /// </summary> + public string WordEndTimeName + { + get + { + if (this.WordEndTime.HasValue) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return this.WordEndTime.Value.ToString("yyyy-MM-dd"); + } + else + { + return ""; + } + + + } + } + + /// <summary> + /// 宸ヤ綔寮�濮嬫椂闂� + /// </summary> + public DateTime? StartTime { get; set; } + + /// <summary> + /// 宸ヤ綔寮�濮嬫椂闂村悕绉� + /// </summary> + public string StartTimeName + { + get + { + if (this.StartTime.HasValue) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return this.StartTime.Value.ToString("HH:mm"); + } + else + { + return ""; + } + + + } + } + + /// <summary> + /// 宸ヤ綔缁撴潫鏃堕棿 + /// </summary> + public DateTime? EndTime { get; set; } + + /// <summary> + /// 宸ヤ綔缁撴潫鏃ユ湡鍚嶇О + /// </summary> + public string EndTimeName + { + get + { + if (this.EndTime.HasValue) + { + // 鍙互娣诲姞鑷繁鐨勯�昏緫 + return this.EndTime.Value.ToString("HH:mm"); + } + else + { + return ""; + } + + + } + } /// <summary> /// 闇�姹� @@ -52,6 +149,16 @@ /// 宸叉嫑宸ヤ汉鏁� /// </summary> public int WorderCounted { get; set; } + + /// <summary> + /// 鎶ュ悕浜烘暟 + /// </summary> + public int BaoMingCount { get; set; } + + /// <summary> + /// 寰呭鏍镐汉鏁� + /// </summary> + public int WorkerDaiCount { get; set; } /// <summary> /// 宸ヤ綔鍦扮偣 @@ -76,6 +183,11 @@ /// </summary> public decimal? WorkPrice { get; set; } + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPriceMax { get; set; } + /// <summary> /// 鎷涘伐鐘舵�� @@ -97,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 "宸蹭笅鏋�"; + } + + + } + } } @@ -161,6 +340,16 @@ /// </summary> public decimal? Salary { get; set; } + + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPrice { get; set; } + + /// <summary> + /// 鍘嗗彶宸ヤ环 + /// </summary> + public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; } } @@ -195,6 +384,24 @@ } + + public class WorkPriceDto + { + + /// <summary> + /// 鎷涘伐鏄庣粏OrderBiddingId + /// </summary> + public int OrderBiddingId { get; set; } + + + /// <summary> + /// 宸ヤ环 + /// </summary> + public decimal? WorkPrice { get; set; } + + + } + public class DakaDetailDto { @@ -214,15 +421,21 @@ { /// <summary> - /// 鎷涘伐鏄庣粏OrderBiddingId + /// 鎷涘伐OrderId /// </summary> - public int OrderBiddingId { get; set; } + public int OrderId { get; set; } /// <summary> /// 鎵撳崱鐓х墖 /// </summary> public string CheckPhoto { get; set; } + + + /// <summary> + /// 浜鸿劯鍥剧墖 + /// </summary> + public string FaceImg { get; set; } @@ -284,6 +497,17 @@ /// <summary> + /// 鐢ㄦ埛id + /// </summary> + public int WorkerUserId { get; set; } + + /// <summary> + /// 鐢ㄦ埛鏄电О + /// </summary> + public string WorkerName { get; set; } + + + /// <summary> /// 鎵撳崱鏄庣粏 /// </summary> public List<OrderBiddingDetailCheckDto> orderBiddingDetailCheck { get; set; } @@ -328,7 +552,13 @@ /// </summary> public int OrderBiddingDetailId { get; set; } - + + /// <summary> + /// 鎷涘伐Id + /// </summary> + public int OrderBiddingId { get; set; } + + /// <summary> /// 鎷涘伐鍚嶇О @@ -368,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; } @@ -388,6 +628,13 @@ /// 鎵撳崱鏄庣粏 /// </summary> public string DakaMingxi { get; set; } + + + /// <summary> + /// 鎷涘伐鍏徃鍚嶇О + /// </summary> + public string Suppliername { get; set; } + } @@ -551,4 +798,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