From 0b78a8e7557d020e98fe855d259a7a310fb96bb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 八月 2021 09:07:16 +0800
Subject: [PATCH] 提交
---
zhengcaioa/DTO/HrSalaryDTO.cs | 62 +++++++++++++++++++++++++++---
1 files changed, 55 insertions(+), 7 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index e06e3cb..511c2ad 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -4,6 +4,7 @@
namespace DTO
{
+
public class HrSalaryDTO
{
public string Id { get; set; }
@@ -24,6 +25,9 @@
public decimal? Shebao { get; set; }
public decimal? Dianhuabutie { get; set; }
+
+ public string DianhuabutieChs { get; set; }
+
public decimal? Quanqinjiang { get; set; }
public decimal? Jiaotngbutie { get; set; }
public decimal? Jixiaoticheng { get; set; }
@@ -33,8 +37,8 @@
{
get
{
- return ( (Jibengongzi??0) + (Baomifei??0) + (Gongzuobutie??0) + (Jiabangongzi??0) + (Shebao??0) +
- (Dianhuabutie??0) + (Quanqinjiang??0) + (Jiaotngbutie??0) + (Jixiaoticheng??0) + (Jiangjin??0) + (Bufagongzi??0));
+ return ((Jibengongzi ?? 0) + (Baomifei ?? 0) + (Gongzuobutie ?? 0) + (Jiabangongzi ?? 0) + (Shebao ?? 0) +
+ (Dianhuabutie ?? 0) + (Quanqinjiang ?? 0) + (Jiaotngbutie ?? 0) + (Jixiaoticheng ?? 0) + (Jiangjin ?? 0) + (Bufagongzi ?? 0));
}
}
@@ -44,12 +48,12 @@
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);
+ return (Shebaokou ?? 0) + (Geshui ?? 0) + (Dianhuafei ?? 0) + (Queqin ?? 0) + (Fakuan ?? 0) + (Peichang ?? 0)- (Jiucuo ?? 0);
}
}
@@ -83,13 +87,19 @@
public string Islock { get; set; }
- public string IslockChs { get
+ public string IslockChs
+ {
+ get
{
string str = "";
- switch(Islock)
+ switch (Islock)
{
case "D":
str = "鏈‘璁�";
+ break;
+
+ case "H":
+ str = "宸叉牳鍑�";
break;
case "S":
@@ -116,6 +126,43 @@
}
+ public class HrSalaryUpDTO
+ {
+ public string Id { get; set; }
+
+ public string Modifier { 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; }
+ public decimal? Jiaotngbutie { get; set; }
+ public decimal? Jixiaoticheng { get; set; }
+ public decimal? Jiangjin { get; set; }
+ public decimal? Bufagongzi { get; set; }
+
+
+ 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? Daozhanggongzi { get; set; }
+ public decimal? Yufagongzi { get; set; }
+ public decimal? Yufagongziheji { get; set; }
+
+ }
+
public partial class HrSalaryDTOSearch : SearchEntity
{
public string searchDate { get; set; }
@@ -123,6 +170,7 @@
public string Usernumber { get; set; }
public string DeptId { get; set; }
public string UserName { get; set; }
-
+
+ public string UserId { get; set; }
}
}
--
Gitblit v1.9.1