From 274fb67703d0ffcc7e3398d41855c5c8bfb3383b Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 六月 2021 13:07:44 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/DTO/HrSalaryDTO.cs | 52 +++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 51 insertions(+), 1 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 9119f27..e06e3cb 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -10,13 +10,18 @@
public string Userid { get; set; }
public int Year { get; set; }
public int Month { get; set; }
+
+ public string YearMonth { get { return Year + "-" + Month.ToString().PadLeft(2, '0'); } }
+
public string Usernumber { get; set; }
public string UserName { get; set; }
public string DeptName { get; set; }
public decimal? Jibengongzi { get; set; }
public decimal? Baomifei { get; set; }
public decimal? Gongzuobutie { get; set; }
+
public decimal? Jiabangongzi { get; set; }
+
public decimal? Shebao { get; set; }
public decimal? Dianhuabutie { get; set; }
public decimal? Quanqinjiang { get; set; }
@@ -24,13 +29,30 @@
public decimal? Jixiaoticheng { get; set; }
public decimal? Jiangjin { get; set; }
public decimal? Bufagongzi { get; set; }
+ public decimal sum_fgz
+ {
+ get
+ {
+ return ( (Jibengongzi??0) + (Baomifei??0) + (Gongzuobutie??0) + (Jiabangongzi??0) + (Shebao??0) +
+ (Dianhuabutie??0) + (Quanqinjiang??0) + (Jiaotngbutie??0) + (Jixiaoticheng??0) + (Jiangjin??0) + (Bufagongzi??0));
+ }
+ }
+
public decimal? Shebaokou { get; set; }
public decimal? Geshui { get; set; }
public decimal? Dianhuafei { get; set; }
public decimal? Queqin { get; set; }
public decimal? Fakuan { get; set; }
public decimal? Peichang { get; set; }
- public decimal? Jiucuo { get; set; }
+ public decimal? Jiucuo { get; set; }
+ public decimal sum_kgz
+ {
+ get
+ {
+ return (Shebaokou??0) + (Geshui?? 0) + (Dianhuafei ?? 0) + (Queqin ?? 0) + (Fakuan ?? 0) + (Peichang ?? 0) + (Jiucuo ?? 0);
+ }
+ }
+
public decimal? Daozhanggongzi { get; set; }
public decimal? Yufagongzi { get; set; }
public decimal? Yufagongziheji { get; set; }
@@ -60,15 +82,43 @@
public string Islock { get; set; }
+
+ public string IslockChs { get
+ {
+ string str = "";
+ switch(Islock)
+ {
+ case "D":
+ str = "鏈‘璁�";
+ break;
+
+ case "S":
+ str = "鐢宠瘔";
+ break;
+
+ case "Q":
+ str = "宸茬‘璁�";
+ break;
+ }
+ return str;
+ }
+ }
+
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 reason { get; set; }
+ public decimal amount { get; set; }
+ public string basis { get; set; }
+
}
public partial class HrSalaryDTOSearch : SearchEntity
{
+ public string searchDate { get; set; }
public string YearMonth { get; set; }
public string Usernumber { get; set; }
public string DeptId { get; set; }
--
Gitblit v1.9.1