From bef853fc5adf095c54415e7fc23574655ac0859a Mon Sep 17 00:00:00 2001
From: LR-20210131IOQH\Administrator <jackcold@163.com>
Date: 星期二, 10 八月 2021 17:06:28 +0800
Subject: [PATCH] 预发工资计算逻辑调整

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

diff --git a/zhengcaioa/DTO/HrSalaryDTO.cs b/zhengcaioa/DTO/HrSalaryDTO.cs
index 7438883..8aab32d 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);
             }
         }
 

--
Gitblit v1.9.1