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.Model/TransferOrder/WeChartTransferOrder.cs | 41 +++++++++++++++++++++++++++++------------
1 files changed, 29 insertions(+), 12 deletions(-)
diff --git a/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs b/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
index 697153d..79e78d8 100644
--- a/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
+++ b/cylsg/cylsg.Model/TransferOrder/WeChartTransferOrder.cs
@@ -1,5 +1,6 @@
锘縰sing cylsg.Core;
using cylsg.Core.Attributes;
+using cylsg.Model.UserModel;
using Newtonsoft.Json;
using SqlSugar;
using System;
@@ -33,22 +34,30 @@
/// <summary>
/// 鑾峰彇鎴栬缃井淇℃壒娆″崟鍙枫��
/// </summary>
- [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃井淇℃壒娆″崟鍙�")]
- public string BatchId { get; set; }
+ [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃井淇℃壒娆″崟鍙�",IsNullable =true)]
+ public string? BatchId { get; set; }
/// <summary>
/// 鑾峰彇鎴栬缃壒娆＄姸鎬併��
/// </summary>
- [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃壒娆＄姸鎬�")]
+ [SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃壒娆＄姸鎬�",IsNullable =true)]
public string? BatchStatus { get; set; }
+ /// <summary>
+ /// 鐢ㄦ埛ID銆�
+ /// </summary>
+ [SugarColumn(ColumnDescription = "鐢ㄦ埛ID")]
+ public int UserID { get; set; }
-
-
+ /// <summary>
+ /// 鐢ㄦ埛琛ㄦ儏銆�
+ /// </summary>
+ [Navigate(NavigateType.OneToOne, nameof(UserID))]
+ public User user { get; set; }
/// <summary>
/// 鑾峰彇鎴栬缃壒娆＄殑鍚嶇О銆�
@@ -130,14 +139,21 @@
/// </summary>
[SugarColumn(ColumnDescription = "鑾峰彇鎴栬缃浆璐﹀満鏅爣璇嗙", IsNullable = true)]
public string? TransferSceneId { get; set; }
-
+ /// <summary>
+ /// 閿欒娑堟伅
+ /// </summary>
+ [SugarColumn(ColumnDescription = "閿欒娑堟伅", IsNullable = true)]
+ public string? ErrorMsg { get; set; }
-
-
- /// <summary>
- /// 鑾峰彇鎴栬缃壒娆′腑鐨勮缁嗚浆璐﹀垪琛ㄣ��
- /// </summary>
- [Navigate(NavigateType.OneToMany,nameof(WeChatTransferItem.WeChatTransferOrderID))]
+ /// <summary>
+ /// 閿欒鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnDescription = "閿欒鏍囪瘑", IsNullable = true)]
+ public string? ErrorCode { get; set; }
+ /// <summary>
+ /// 鑾峰彇鎴栬缃壒娆′腑鐨勮缁嗚浆璐﹀垪琛ㄣ��
+ /// </summary>
+ [Navigate(NavigateType.OneToMany,nameof(WeChatTransferItem.WeChatTransferOrderID))]
public List<WeChatTransferItem> TransferDetailList { get; set; }
}
@@ -146,6 +162,7 @@
/// 杞处鍗曞垪琛�
/// </summary>
[SugarTable(TableDescription = "杞处鍗曡处璇︾粏鍒楄〃妯″瀷")]
+ [CoderFirst]
public class WeChatTransferItem:BaseModel
{
/// <summary>
--
Gitblit v1.9.1