From db227144dedfb5fb5b1e94e8c8b14eab9eb7462f Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 01 十二月 2022 13:32:50 +0800
Subject: [PATCH] 中国政采网的四川数据 发送验证码

---
 zhengcaioa/DTO/HrSalaryDTO.cs |  112 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 111 insertions(+), 1 deletions(-)

diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 9119f27..9000f10 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -4,26 +4,44 @@
 
 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 string DianhuabutieChs { 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 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 +49,20 @@
         public decimal? Fakuan { get; set; }
         public decimal? Peichang { get; set; }
         public decimal? Jiucuo { get; set; }
+        public decimal sum_kgz
+        {
+            get
+            {
+                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);
+            }
+        }
+
         public decimal? Daozhanggongzi { get; set; }
         public decimal? Yufagongzi { get; set; }
         public decimal? Yufagongziheji { get; set; }
@@ -60,19 +92,97 @@
 
 
         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 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