From 0b78a8e7557d020e98fe855d259a7a310fb96bb0 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 19 八月 2021 09:07:16 +0800
Subject: [PATCH] 提交
---
zhengcaioa/Services/HrSalaryService.cs | 30 ++++++++++++++++++++++++++----
1 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/zhengcaioa/Services/HrSalaryService.cs b/zhengcaioa/Services/HrSalaryService.cs
index b20d382..6b5c965 100644
--- a/zhengcaioa/Services/HrSalaryService.cs
+++ b/zhengcaioa/Services/HrSalaryService.cs
@@ -136,19 +136,38 @@
//璁＄畻棰勫彂宸ヨ祫
if (user.advancewages.HasValue && user.advancewages.Value>0)
{
+ //涓婁竴娆＄殑宸ヨ祫
+ var bf= _context.HrSalaries.Where(c => c.Userid == user.Id && c.Islock== "Q" && c.RecStatus=="A").
+ OrderByDescending(c=>c.Year).ThenByDescending(c=>c.Month).FirstOrDefault();
+
var pc = user.advancewages.Value;
if (sum_f - sum_k > pc)
{
- updatepltRole.Daozhanggongzi = sum_f - sum_k;
+ updatepltRole.Daozhanggongzi = sum_f - sum_k;
+ updatepltRole.Yufagongzi = 0;
+ if(bf!=null)
+ {
+ updatepltRole.Yufagongziheji = bf.Yufagongziheji??0 - (updatepltRole.Daozhanggongzi-pc);
+ }
+ else
+ {
+ updatepltRole.Yufagongziheji = (pc - updatepltRole.Daozhanggongzi);
+ }
}
else
{
//棰勫彂
updatepltRole.Daozhanggongzi = pc;
updatepltRole.Yufagongzi = pc - (sum_f - sum_k);
- updatepltRole.Yufagongziheji += updatepltRole.Yufagongzi;
+ if (bf != null)
+ {
+ updatepltRole.Yufagongziheji =bf.Yufagongziheji??0+ updatepltRole.Yufagongzi;
+ }
+ else
+ {
+ updatepltRole.Yufagongziheji = updatepltRole.Yufagongzi;
+ }
}
-
}
else
{
@@ -790,7 +809,10 @@
&& (string.IsNullOrWhiteSpace(searchEntity.Usernumber) || f.Usernumber == searchEntity.Usernumber.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.DeptId) || f.DeptId == searchEntity.DeptId.Trim())
&& (string.IsNullOrWhiteSpace(searchEntity.UserName) || f.UserName.Contains(searchEntity.UserName.Trim()))
- select new HrSalaryDTO
+
+ && (string.IsNullOrWhiteSpace(searchEntity.UserId) || a.Userid.Contains(searchEntity.UserId.Trim()))
+
+ select new HrSalaryDTO
{
Id = a.Id,
--
Gitblit v1.9.1