From e6c74bf2f4926aa62b4442169f55b8fbccf33300 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 14 十月 2024 08:48:34 +0800
Subject: [PATCH] 审批时间5分钟以内可以再次审批

---
 cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs |  164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 163 insertions(+), 1 deletions(-)

diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index 93cef3f..1ddcab4 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; }
@@ -497,6 +628,13 @@
         /// 鎵撳崱鏄庣粏
         /// </summary>
         public string DakaMingxi { get; set; }
+
+
+        /// <summary>
+        /// 鎷涘伐鍏徃鍚嶇О
+        /// </summary>
+        public string Suppliername { get; set; }
+        
 
     }
 
@@ -660,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