From 18590e3512d2d348e5149ee2bb3018c28c9a5b22 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 30 九月 2024 14:26:35 +0800
Subject: [PATCH] 修改上下架，自己安排工作时间，员工工资统计查询
---
cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs | 272 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 267 insertions(+), 5 deletions(-)
diff --git a/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs b/cylsg/cylsg.Application/Orders/Dtos/OrderDto.cs
index c524481..01dab91 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;
@@ -21,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>
/// 闇�姹�
@@ -97,6 +197,63 @@
/// 鎷涘伐鏄庣粏
/// </summary>
public List<OrderBiddingDto> orderBidding { 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 "宸蹭笅鏋�";
+ }
+
+
+ }
+ }
}
@@ -211,15 +368,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; }
@@ -278,6 +441,17 @@
/// 鎻愮幇鏃堕棿
/// </summary>
public DateTime? TiXiantime { get; set; }
+
+
+ /// <summary>
+ /// 鐢ㄦ埛id
+ /// </summary>
+ public int WorkerUserId { get; set; }
+
+ /// <summary>
+ /// 鐢ㄦ埛鏄电О
+ /// </summary>
+ public string WorkerName { get; set; }
/// <summary>
@@ -365,6 +539,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; }
@@ -385,6 +569,13 @@
/// 鎵撳崱鏄庣粏
/// </summary>
public string DakaMingxi { get; set; }
+
+
+ /// <summary>
+ /// 鎷涘伐鍏徃鍚嶇О
+ /// </summary>
+ public string Suppliername { get; set; }
+
}
@@ -501,4 +692,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