From ea037964dba48654bdaf7169517c64508984841e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 19 七月 2021 14:53: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