From 0fbf7c551ba932e7c8bfdb1086bd4ef7acc90a9c Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 18 四月 2025 08:55:14 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 54 ++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 42 insertions(+), 12 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index b3e0898..d0c0cae 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -139,14 +139,13 @@
jisuangonglinggongzi();
}
-
- _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃�");
- this.ywjlguiling();
- _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃犳墽琛岀粨鏉�");
-
_logger.LogInformation("鎶婁細鍛樼郴缁熷拰oa绯荤粺鎵嬫満鍙风浉鍚岀殑瀹㈡埛鍏宠仈璧锋潵");
this.huiyuanguanlian();
_logger.LogInformation("鎶婁細鍛樼郴缁熷拰oa绯荤粺鎵嬫満鍙风浉鍚岀殑瀹㈡埛鍏宠仈璧锋潵鎵ц缁撴潫");
+
+ _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃�");
+ this.ywjlguiling();
+ _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃犳墽琛岀粨鏉�");
}
catch (Exception ex)
{
@@ -329,6 +328,18 @@
if (frameworkUser != null)
{
cooperatecustomCustomer.HuiyuanId = frameworkUser.Id.ToString();
+ //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟
+ var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomer.HuiyuanId && x.Customerid == cooperatecustomCustomer.Id).FirstOrDefault();
+ if (customerGuanlianhuiyuan1 == null)
+ {
+ CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan();
+ customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString();
+ customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomer.HuiyuanId;
+ customerGuanlianhuiyuan.Customerid = cooperatecustomCustomer.Id;
+ customerGuanlianhuiyuan.Customertype = "鍚堜綔瀹㈡埛";
+ _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan);
+ }
+
}
}
@@ -349,6 +360,17 @@
if (frameworkUser != null)
{
intentionCustomer.HuiyuanId = frameworkUser.Id.ToString();
+ //2023-03-23 娣诲姞鍦ㄨ亴浼佷笟
+ var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == intentionCustomer.HuiyuanId && x.Customerid == intentionCustomer.Id).FirstOrDefault();
+ if (customerGuanlianhuiyuan1 == null)
+ {
+ CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan();
+ customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString();
+ customerGuanlianhuiyuan.Huiyuanid = intentionCustomer.HuiyuanId;
+ customerGuanlianhuiyuan.Customerid = intentionCustomer.Id;
+ customerGuanlianhuiyuan.Customertype = "妗ｆ瀹㈡埛";
+ _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan);
+ }
}
}
@@ -1703,7 +1725,7 @@
- if (userList[i].ShiyongDate.HasValue && userList[i].ShiyongDateEnd.HasValue && dateminkaoqin>= userList[i].ShiyongDate.Value && dateminkaoqin <= userList[i].ShiyongDateEnd.Value)
+ if (userList[i].ShiyongDate.HasValue && userList[i].ShiyongDateEnd.HasValue && datemaxkaoqin> userList[i].ShiyongDate.Value && dateminkaoqin <= userList[i].ShiyongDateEnd.Value)
{
hrSalaryDTO.Jibengongzi = Math.Round(hrJibengongzi.Jibengongzi.Value * chuqinlv * new decimal(0.8), 2) ;
hrSalaryDTO.Baomifei = Math.Round(hrJibengongzi.Baomifei.Value * chuqinlv * new decimal(0.8), 2) ;
@@ -1776,7 +1798,7 @@
- hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) * shiyongqichuqinlv, 2);
+ hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice * shiyongqichuqinlv - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) , 2);
@@ -1852,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 - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) * zhuanzhengchuqinlv, 2);
@@ -2223,7 +2251,8 @@
#region 閲囪喘椤圭洰褰曞叆
var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
- if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
+ // var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )//|| (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.Count > 0)
{
var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
if (jijianidddd != null)
@@ -2243,9 +2272,10 @@
if (gongzuoshijian)
{
var projectDTOri = projectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ // var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOri.Count - renwujishu;
+ decimal youxiaojijian = projectDTOri.Count - renwujishu;//+ zhengfuprojectDTOri.Count
if (youxiaojijian > 0)
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2277,7 +2307,7 @@
decimal renwujishu = jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
+ decimal youxiaojijian = projectDTOsyue.Count - renwujishu;//+ zhengfuprojectDTOsyue.Count
if (youxiaojijian > 0)
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
--
Gitblit v1.9.1