From 7b9e068cfe4e295f9ee960457d848c631f0136c7 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 27 八月 2021 16:09:56 +0800
Subject: [PATCH] 工作交接
---
zhengcaioa/DTO/HrSalaryDTO.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 7438883..9ab0459 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; }
@@ -50,7 +53,7 @@
{
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);
}
}
@@ -163,10 +166,13 @@
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; }
}
}
--
Gitblit v1.9.1