From 3b9bf8c309d77d9817e973aa036e045695c78d70 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 26 七月 2021 16:17:45 +0800
Subject: [PATCH] 今日开发 加班申请· 统计报表：没有任何工作的人，不显示。显示人员的 部门 职位 姓名 工作时间 在计算考勤的时候只有有加班申请的加班才算加班
---
zhengcaioa/DTO/AdmSignInDTO.cs | 47 +++++++++++++++++++++++++++++++++++++++++------
1 files changed, 41 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/DTO/AdmSignInDTO.cs b/zhengcaioa/DTO/AdmSignInDTO.cs
index 9e5da0d..de96018 100644
--- a/zhengcaioa/DTO/AdmSignInDTO.cs
+++ b/zhengcaioa/DTO/AdmSignInDTO.cs
@@ -59,16 +59,32 @@
public string Id { get; set; }
public string SigninId { get; set; }
public string Lavetype { get; set; }
- public DateTime StratTime { get; set; }
- public DateTime EndTime { get; set; }
- public int LaveDay { get; set; }
- public int LavehHour { get; set; }
+ public DateTime? StratTime { get; set; }
+ public string StratTimeName { get; set; }
+ public string StratPoint { get; set; }
+ public DateTime? EndTime { get; set; }
+ public string EndTimeName { get; set; }
+ public string EndPoint { get; set; }
+ public int? LaveDay { get; set; }
+ public int? LavehHour { get; set; }
public string Remark { get; set; }
+ public string ShenpiStatus { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
public DateTime Createtime { get; set; }
public string Modifier { get; set; }
public DateTime Modifytime { get; set; }
+ public string[] attachmentid { get; set; }
+ public string[] Filepath { get; set; }
+ public string[] Filefullname { get; set; }
+
+ public string CreaterName { get; set; }
+ public string Tittle { get; set; }
+
+ public string Content { get; set; }
+
+ public string Tongguojujue { get; set; }
+ public string Step { get; set; }
}
@@ -80,9 +96,14 @@
public string Id { get; set; }
public string SigninId { get; set; }
public string Lavetype { get; set; }
- public DateTime StratTime { get; set; }
- public DateTime EndTime { get; set; }
+ public DateTime? StratTime { get; set; }
+ public string StratTimeName { get; set; }
+ public string StratPoint { get; set; }
+ public DateTime? EndTime { get; set; }
+ public string EndTimeName { get; set; }
+ public string EndPoint { get; set; }
public string MedicalRecord { get; set; }
+ public string ShenpiStatus { get; set; }
public string Remark { get; set; }
public string RecStatus { get; set; }
public string Creater { get; set; }
@@ -92,5 +113,19 @@
public string[] attachmentid { get; set; }
public string[] Filepath { get; set; }
public string[] Filefullname { get; set; }
+
+ public string CreaterName { get; set; }
+ public string Tittle { get; set; }
+ public string Content { get; set; }
+
+ public string Tongguojujue { get; set; }
+ public string Step { get; set; }
+
+ }
+
+ public partial class DateBiJiaoDTO
+ {
+ public DateTime? StartTime { get; set; }
+ public DateTime? EndTime { get; set; }
}
}
--
Gitblit v1.9.1