From 2ccb8c94fcfe6891b6db60995e83cd7b54e389a6 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期日, 29 九月 2024 17:33:23 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/cylsg
---
cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs | 157 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 153 insertions(+), 4 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index e98d7c7..ceee37f 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>
/// 闇�姹�
@@ -214,9 +311,9 @@
{
/// <summary>
- /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// 鎷涘伐OrderId
/// </summary>
- public int OrderBiddingId { get; set; }
+ public int OrderId { get; set; }
/// <summary>
@@ -287,6 +384,17 @@
/// 鎻愮幇鏃堕棿
/// </summary>
public DateTime? TiXiantime { get; set; }
+
+
+ /// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public int WorkerUserId { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string WorkerName { get; set; }
/// <summary>
@@ -374,6 +482,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; }
@@ -394,6 +512,13 @@
/// 鎵撳崱鏄庣粏
/// </summary>
public string DakaMingxi { get; set; }
+
+
+ /// <summary>
+ /// 鎷涘伐鍏徃鍚嶇О
+ /// </summary>
+ public string Suppliername { get; set; }
+
}
@@ -557,4 +682,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