From 595df5dac0a782bfdadab766b4dd62d326b0a383 Mon Sep 17 00:00:00 2001
From: 小飞侠 <8277136+liaoxujun@user.noreply.gitee.com>
Date: 星期二, 21 十月 2025 14:53:04 +0800
Subject: [PATCH] 增加川印设备维修回写
---
cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs | 366 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 360 insertions(+), 6 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index 09e9b61..493176e 100644
--- a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
+++ b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
@@ -1,6 +1,9 @@
-锘縰sing cylsg.Model.OrderModel;
+锘縰sing cylsg.Core.Attributes;
+using cylsg.Core;
+using cylsg.Model.OrderModel;
using System;
using System.Collections.Generic;
+using System.ComponentModel;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -15,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>
/// 鎷涘伐鍚嶇О
@@ -26,14 +40,106 @@
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>
/// 闇�姹�
@@ -49,6 +155,16 @@
/// 宸叉嫑宸ヤ汉鏁�
/// </summary>
public int WorderCounted { get; set; }
+
+ /// <summary>
+ /// 鎶ュ悕浜烘暟
+ /// </summary>
+ public int BaoMingCount { get; set; }
+
+ /// <summary>
+ /// 寰呭鏍镐汉鏁�
+ /// </summary>
+ public int WorkerDaiCount { get; set; }
/// <summary>
/// 宸ヤ綔鍦扮偣
@@ -73,6 +189,11 @@
/// </summary>
public decimal? WorkPrice { get; set; }
+ /// <summary>
+ /// 宸ヤ环
+ /// </summary>
+ public decimal? WorkPriceMax { get; set; }
+
/// <summary>
/// 鎷涘伐鐘舵��
@@ -94,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 "宸蹭笅鏋�";
+ }
+
+
+ }
+ }
}
@@ -158,6 +346,22 @@
/// </summary>
public decimal? Salary { get; set; }
+
+ /// <summary>
+ /// 宸ヤ环
+ /// </summary>
+ public decimal? WorkPrice { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool? IsCollect { get; set; }
+
+
+ /// <summary>
+ /// 鍘嗗彶宸ヤ环
+ /// </summary>
+ public List<OrderBiddingWorkPrice> orderBiddingWorkPrices { get; set; }
}
@@ -192,6 +396,41 @@
}
+
+ public class ShoucangDto
+ {
+
+ /// <summary>
+ /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// </summary>
+ public int OrderBiddingId { get; set; }
+
+
+ /// <summary>
+ /// 鏄惁鏀惰棌
+ /// </summary>
+ public bool IsCollect { get; set; }
+
+ }
+
+
+ public class WorkPriceDto
+ {
+
+ /// <summary>
+ /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// </summary>
+ public int OrderBiddingId { get; set; }
+
+
+ /// <summary>
+ /// 宸ヤ环
+ /// </summary>
+ public decimal? WorkPrice { get; set; }
+
+
+ }
+
public class DakaDetailDto
{
@@ -211,9 +450,9 @@
{
/// <summary>
- /// 鎷涘伐鏄庣粏OrderBiddingId
+ /// 鎷涘伐OrderId
/// </summary>
- public int OrderBiddingId { get; set; }
+ public int OrderId { get; set; }
/// <summary>
@@ -287,6 +526,17 @@
/// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public int WorkerUserId { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string WorkerName { get; set; }
+
+
+ /// <summary>
/// 鎵撳崱鏄庣粏
/// </summary>
public List<OrderBiddingDetailCheckDto> orderBiddingDetailCheck { get; set; }
@@ -331,7 +581,13 @@
/// </summary>
public int OrderBiddingDetailId { get; set; }
-
+
+ /// <summary>
+ /// 鎷涘伐Id
+ /// </summary>
+ public int OrderBiddingId { get; set; }
+
+
/// <summary>
/// 鎷涘伐鍚嶇О
@@ -371,6 +627,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,9 +654,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; }
+
}
@@ -454,6 +732,11 @@
/// </summary>
public int? IsShenPi { get; set; }
+ /// <summary>
+ /// 瀹℃壒鏃堕棿
+ /// </summary>
+ public DateTime? ShenPitime { get; set; }
+
/// <summary>
/// 瀹℃壒鐘舵�佸悕绉�
@@ -507,4 +790,75 @@
public decimal? TodaySalary { get; set; }
}
+
+
+
+ /// <summary>
+ /// 鐢ㄦ埛宸ヤ汉鎻愮幇鏄庣粏琛�
+ /// </summary>
+ public class UserTiXianDetailDto
+ {
+ /// <summary>
+ /// 鎻愮幇鏄庣粏Id
+ /// </summary>
+ public int Id { get; set; }
+
+
+ /// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public int UserId { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public string UserName { get; set; }
+ /// <summary>
+ /// 閲戦
+ /// </summary>
+ public decimal? YiTiXianJine { get; set; }
+
+
+ /// <summary>
+ /// 鏀嚭杩樻槸鏀跺叆
+ /// </summary>
+ public int ZhiChuShouRu { get; set; }
+
+ /// <summary>
+ /// 鏀嚭杩樻槸鏀跺叆
+ /// </summary>
+ public string ZhiChuShouRuName { get; set; }
+
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ public string Remark { get; set; }
+
+
+ }
+
+
+
+
+ /// <summary>
+ /// 淇敼鍏徃绠＄悊鍛�
+ /// </summary>
+ public class StaffAdminDto
+ {
+
+
+
+ /// <summary>
+ /// 鐢ㄦ埛鍏徃id
+ /// </summary>
+ public int ComId { get; set; }
+
+ /// <summary>
+ /// 鏄惁绠＄悊鍛�
+ /// </summary>
+ public bool IsAdmin { get; set; }
+
+
+ }
}
--
Gitblit v1.9.1