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 | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 511c2ad..9000f10 100644
--- a/zhengcaioa/DTO/HrSalaryDTO.cs
+++ b/zhengcaioa/DTO/HrSalaryDTO.cs
@@ -38,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));
}
}
@@ -53,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);
}
}
@@ -166,11 +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