From ed3015095f1b0e88bc579877c678a3fac191381f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期一, 28 六月 2021 14:32:26 +0800
Subject: [PATCH] Merge branch 'master' of http://47.108.235.38:8080/r/zhengcaioa
---
zhengcaioa/DTO/HrSalaryDTO.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 46 insertions(+), 6 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 7677933..7438883 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; }
@@ -33,8 +34,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 +45,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,10 +84,12 @@
public string Islock { get; set; }
- public string IslockChs { get
+ public string IslockChs
+ {
+ get
{
string str = "";
- switch(Islock)
+ switch (Islock)
{
case "D":
str = "鏈‘璁�";
@@ -120,6 +123,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; }
--
Gitblit v1.9.1