From c60a7d7b29faba465969555e2a9c69acb8510f90 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 25 二月 2022 09:11:41 +0800
Subject: [PATCH] 如果客户资料中有“*”的内容，生产文书时自动填上，质疑单位默认填写客户名称，可修改

---
 zhengcaioa/DTO/HrSalaryDTO.cs |   74 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index e06e3cb..9000f10 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; }
@@ -24,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; }
@@ -33,8 +37,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 +48,18 @@
         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);
+                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);
             }
         }
 
@@ -83,13 +93,19 @@
 
         public string Islock { get; set; }
 
-        public string IslockChs { get
+        public string IslockChs
+        {
+            get
             {
                 string str = "";
-                switch(Islock)
+                switch (Islock)
                 {
                     case "D":
                         str = "鏈‘璁�";
+                        break;
+
+                    case "H":
+                        str = "宸叉牳鍑�";
                         break;
 
                     case "S":
@@ -116,13 +132,57 @@
 
     }
 
+    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