From f4a0b32daa9e021227707bcfb70b67738bd1b000 Mon Sep 17 00:00:00 2001
From: 移动系统liao <liaoxujun@qq.com>
Date: 星期五, 24 一月 2025 17:28:13 +0800
Subject: [PATCH] 修改报销部分逻辑

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

diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index 93cef3f..9ac7c36 100644
--- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
+++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
@@ -18,10 +18,21 @@
         /// </summary>
         public int Id { get; set; }
 
+
+        /// <summary>
+        /// 鎷涘伐OldId
+        /// </summary>
+        public int OldId { get; set; }
+
         /// <summary>
         /// 鎷涘伐鐢ㄦ埛id
         /// </summary>
         public int OrderUserId { get; set; }
+
+        /// <summary>
+        /// 鎷涘伐鍏徃鍚嶇О
+        /// </summary>
+        public string OrderComName { get; set; }
 
         /// <summary>
         /// 鎷涘伐鍚嶇О
@@ -146,6 +157,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 +189,11 @@
         /// </summary>
         public decimal? WorkPrice { get; set; }
 
+        /// <summary>
+        /// 宸ヤ环
+        /// </summary>
+        public decimal? WorkPriceMax { get; set; }
+
 
         /// <summary>
         /// 鎷涘伐鐘舵��
@@ -189,9 +215,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 +346,16 @@
         /// </summary>
         public decimal? Salary { get; set; }
 
+
+        /// <summary>
+        /// 宸ヤ环
+        /// </summary>
+        public decimal? WorkPrice { get; set; }
+
+        /// <summary>
+        /// 鍘嗗彶宸ヤ环
+        /// </summary>
+        public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; }
     }
 
 
@@ -283,6 +386,24 @@
 
          
 
+
+
+    }
+
+
+    public class WorkPriceDto
+    {
+
+        /// <summary>
+        /// 鎷涘伐鏄庣粏OrderBiddingId
+        /// </summary>
+        public int OrderBiddingId { get; set; }
+
+
+        /// <summary>
+        /// 宸ヤ环
+        /// </summary>
+        public decimal? WorkPrice { get; set; }
 
 
     }
@@ -437,7 +558,13 @@
         /// </summary>
         public int OrderBiddingDetailId { get; set; }
 
-         
+
+        /// <summary>
+        /// 鎷涘伐Id
+        /// </summary>
+        public int OrderBiddingId { get; set; }
+
+
 
         /// <summary>
         /// 鎷涘伐鍚嶇О
@@ -477,6 +604,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 +631,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 +708,11 @@
         /// 瀹℃壒鐘舵��
         /// </summary>
         public int? IsShenPi { get; set; }
+
+        /// <summary>
+        /// 瀹℃壒鏃堕棿
+        /// </summary>
+        public DateTime? ShenPitime { get; set; }
 
 
         /// <summary>
@@ -660,4 +814,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