From ddd7b8e07e5d7f76e5ee28eaab91e75a419b3750 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 22 七月 2021 14:57:13 +0800
Subject: [PATCH] 今日开发 我的报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工作报表中的 新增注册会员 改为非手工几件登记，自动从系统读取 工资计算中的 新增注册会员 改为非手工几件登记，自动从系统读取
---
zhengcaioa/DTO/HrSalaryDTO.cs | 94 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 94 insertions(+), 0 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 9119f27..7438883 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -4,19 +4,25 @@
namespace DTO
{
+
public class HrSalaryDTO
{
public string Id { get; set; }
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,6 +30,15 @@
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; }
@@ -31,6 +46,14 @@
public decimal? Fakuan { get; set; }
public decimal? Peichang { 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 +83,86 @@
public string Islock { get; set; }
+
+ public string IslockChs
+ {
+ get
+ {
+ string str = "";
+ switch (Islock)
+ {
+ case "D":
+ str = "鏈‘璁�";
+ break;
+
+ case "H":
+ 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 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; }
public string YearMonth { get; set; }
public string Usernumber { get; set; }
public string DeptId { get; set; }
--
Gitblit v1.9.1