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/PltUserDTO.cs | 24 ++++++++++++++++++++++++
1 files changed, 24 insertions(+), 0 deletions(-)
diff --git a/zhengcaioa/DTO/PltUserDTO.cs b/zhengcaioa/DTO/PltUserDTO.cs
index c4593d0..84bb8d7 100644
--- a/zhengcaioa/DTO/PltUserDTO.cs
+++ b/zhengcaioa/DTO/PltUserDTO.cs
@@ -56,6 +56,7 @@
public DateTime? Indate { get; set; }
public string IndateName { get; set; }
public DateTime? Outdate { get; set; }
+ public string OutdateName { get; set; }
public string Gongling { get; set; }
public string Sex { get; set; }
@@ -74,6 +75,7 @@
public string Zhengzhi { get; set; }
public string IsMaryed { get; set; }
public string Weixin { get; set; }
+ public string Yaoqingma { get; set; }
public string Jinji { get; set; }
public string JinjiPhone { get; set; }
public string JzYoubian { get; set; }
@@ -99,19 +101,39 @@
/// 棰勫彂宸ヨ祫
/// </summary>
public decimal? advancewages { get; set; }
+ public string advancewagesName { get; set; }
/// <summary>
/// 淇濆簳骞磋柂
/// </summary>
public decimal? miniyearsalary { get; set; }
+ public string miniyearsalaryName { get; set; }
/// <summary>
/// 宸ラ緞宸ヨ祫
/// </summary>
public decimal? senioritywages { get; set; }
+ public string senioritywagesName { get; set; }
/// <summary>
/// 鏄惁浜ら�氳ˉ璐�
/// </summary>
public string Istravelsubsidy { get; set; }
+ /// <summary>
+ /// 鏄惁浜ら�氳ˉ璐�
+ /// </summary>
+ public string IstravelsubsidyName { get; set; }
+
+ public string Beizhu { get; set; }
+
+
+ public decimal? baomisalary { get; set; }
+ public string baomisalaryName { get; set; }
+ public decimal? jibensalary { get; set; }
+ public string jibensalaryName { get; set; }
+ public decimal? jintiesalary { get; set; }
+ public string jintiesalaryName { get; set; }
+
+ public decimal? geshuiqizheng { get; set; }
+ public string geshuiqizhengName { get; set; }
public string[] JiatingchengyuanId { get; set; }
@@ -149,5 +171,7 @@
public string UserSn { get; set; }
public string Zhiwustatus { get; set; }
+
+ public string Usernumber { get; set; }
}
}
--
Gitblit v1.9.1