From 78b0883ddf8329fa8693d78b01e1e0a7f5b6972e Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期四, 14 十二月 2023 13:10:02 +0800
Subject: [PATCH] 班次分组和横幅ID
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 76d3848..80469f1 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1874,9 +1874,15 @@
}
+ if(shiyongqichuqinlv>0 || hrSalaryDTO.Gongzuobutie != new decimal(0))
+ {
+ hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv ), 2);
+ }
+ else
+ {
+ hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value), 2);
+ }
-
- hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);
--
Gitblit v1.9.1