From bdeea0f54fcdb94531d404e9b720d0086d5cca96 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 13 八月 2021 10:29:31 +0800
Subject: [PATCH] 流程管理界面
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 253e624..a2b31ad 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1728,7 +1728,8 @@
hrSalaryDTO.Dianhuafei = SimCost.bill_amount;
}
- if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin)
+ if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin
+ && hrSalaryDTO.Queqin <=0)
{
hrSalaryDTO.Quanqinjiang = hrJibengongzi.Quanqingjiang;
}
@@ -3597,7 +3598,7 @@
hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
}
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Daozhanggongzi- hrSalaryDTO.Yufagongzi);
+ hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi );
if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
{
hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
--
Gitblit v1.9.1