From 6e2b929cf381e2320ba6e7dec56c0371124d2b51 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期六, 27 八月 2022 15:03:00 +0800
Subject: [PATCH] 提交
---
zhengcaioa/DTO/HrSalaryDTO.cs | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 7438883..9000f10 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -25,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; }
@@ -35,7 +38,7 @@
get
{
return ((Jibengongzi ?? 0) + (Baomifei ?? 0) + (Gongzuobutie ?? 0) + (Jiabangongzi ?? 0) + (Shebao ?? 0) +
- (Dianhuabutie ?? 0) + (Quanqinjiang ?? 0) + (Jiaotngbutie ?? 0) + (Jixiaoticheng ?? 0) + (Jiangjin ?? 0) + (Bufagongzi ?? 0));
+ /*(Dianhuabutie ?? 0) +*/ (Quanqinjiang ?? 0) + (Jiaotngbutie ?? 0) + (Jixiaoticheng ?? 0) + (Jiangjin ?? 0) + (Bufagongzi ?? 0));
}
}
@@ -50,7 +53,13 @@
{
get
{
- return (Shebaokou ?? 0) + (Geshui ?? 0) + (Dianhuafei ?? 0) + (Queqin ?? 0) + (Fakuan ?? 0) + (Peichang ?? 0) + (Jiucuo ?? 0);
+ decimal dianhuafei = 0;
+ if((Dianhuabutie??0) - (Dianhuafei?? 0) <= 0 )
+ {
+ dianhuafei = (Dianhuafei ?? 0) - (Dianhuabutie ?? 0) ;
+ }
+
+ return (Shebaokou ?? 0) + (Geshui ?? 0) + dianhuafei + (Queqin ?? 0) + (Fakuan ?? 0) - (Peichang ?? 0)- (Jiucuo ?? 0);
}
}
@@ -163,10 +172,17 @@
public partial class HrSalaryDTOSearch : SearchEntity
{
public string searchDate { get; set; }
+ public string searchDatestart { get; set; }
+ public string searchDateend { get; set; }
public string YearMonth { get; set; }
public string Usernumber { get; set; }
public string DeptId { get; set; }
public string UserName { get; set; }
-
+
+ public string UserId { get; set; }
+
+ public string YearMonth222 { get; set; }
+ public string searchDatestart222 { get; set; }
+ public string searchDateend222 { get; set; }
}
}
--
Gitblit v1.9.1