From bf14008acffe7a9a7ac6e2eeb38ce3552b71b33a Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 14 三月 2023 13:43:30 +0800
Subject: [PATCH] 提交
---
zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | 2570 ++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 2,189 insertions(+), 381 deletions(-)
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index 29e24f2..5a71989 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -50,6 +50,9 @@
private readonly IHttpClientFactory _clientFactory;
private readonly IAskService _askService;
private readonly IAdmEvaluateService _admEvaluateService;
+ private readonly IExpertService _expertService;
+ private readonly zhengcaioaContext _context;
+ private readonly zcUserInfoN_dbContext _zcUsercontext;
private readonly decimal jiabangongzibiaozhun = new decimal(21.5);
public TimedBackgroundService(ILogger<TimedBackgroundService> logger, IServiceScopeFactory factory)
@@ -83,13 +86,16 @@
_clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
_askService= factory.CreateScope().ServiceProvider.GetRequiredService<IAskService>();
_admEvaluateService = factory.CreateScope().ServiceProvider.GetRequiredService<IAdmEvaluateService>();
+ _expertService = factory.CreateScope().ServiceProvider.GetRequiredService<IExpertService>();
+ _context = factory.CreateScope().ServiceProvider.GetRequiredService<zhengcaioaContext>();
+ _zcUsercontext = factory.CreateScope().ServiceProvider.GetRequiredService<zcUserInfoN_dbContext>();
}
protected override async Task ExecuteAsync(CancellationToken stoppingToken)
{
_logger.LogInformation("MyServiceA is starting.");
//stoppingToken.Register(() => File.Create($"E:\\dotnetCore\\Practice\\Practice\\{DateTime.Now.Millisecond}.txt"));
-
+
DateTime datenow = DateTime.Now.Date;
while (!stoppingToken.IsCancellationRequested)
{
@@ -132,6 +138,15 @@
{
jisuangonglinggongzi();
}
+
+
+ _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃�");
+ this.ywjlguiling();
+ _logger.LogInformation("鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃犳墽琛岀粨鏉�");
+
+ _logger.LogInformation("鎶婁細鍛樼郴缁熷拰oa绯荤粺鎵嬫満鍙风浉鍚岀殑瀹㈡埛鍏宠仈璧锋潵");
+ this.huiyuanguanlian();
+ _logger.LogInformation("鎶婁細鍛樼郴缁熷拰oa绯荤粺鎵嬫満鍙风浉鍚岀殑瀹㈡埛鍏宠仈璧锋潵鎵ц缁撴潫");
}
catch (Exception ex)
{
@@ -205,6 +220,144 @@
return diwutian;
}
+
+ //璁＄畻褰撳墠鏃ユ湡鏄惁鏄伐浣滄棩
+ public Boolean shifougongzuori(DateTime workdate)
+ {
+ var admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
+ AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
+ var jiejiari = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiejiari").ToList();
+ var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();
+ var jiabanri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiabanri").ToList();
+ ////鑾峰彇鏈湀鐨勭浜斾釜宸ヤ綔鏃ユ棩鏈熴��
+ //DateTime datemin = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1);
+ //DateTime datemax = datemin.AddMonths(1);
+ //_logger.LogInformation("datemin" + datemin);
+ //_logger.LogInformation("datemax" + datemax);
+ Boolean shifoushangban = false;
+
+ //鏄惁涓婄彮鏃ユ湡
+ if ((int)workdate.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)workdate.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
+ {
+ //鏄惁鑺傚亣鏃�
+ if (jiejiari.Exists(x => x.ValueStart <= workdate && x.ValueEnd >= workdate))
+ {
+ shifoushangban = false;
+ }
+ else
+ {
+ shifoushangban = true;
+ }
+
+ }
+ else
+ {
+ //鏄惁璋冧紤鏃� 璋冧紤鏃ラ渶瑕佷笂鐝�
+ if (tiaoxiuri.Exists(x => x.ValueStart <= workdate && x.ValueEnd >= workdate))
+ {
+ shifoushangban = true;
+ }
+ //鏄惁鍔犵彮鏃� 鍔犵彮鏃ラ渶瑕佷笂鐝�
+ if (jiabanri.Exists(x => x.ValueStart <= workdate && x.ValueEnd >= workdate))
+ {
+ shifoushangban = true;
+ }
+ }
+
+
+
+ return shifoushangban;
+ }
+
+
+ //鑾峰彇鏃ユ湡鎵�鍦ㄥ懆鐨勮捣姝㈡棩鏈�
+ /// <summary>
+ /// 璁＄畻鏈懆璧峰鏃ユ湡锛堟槦鏈熶竴锛�
+ /// </summary>
+ /// <param name="dateTime">璇ュ懆涓换鎰忎竴澶�</param>
+ /// <returns>杩斿洖绀兼嫓涓�鏃ユ湡锛屽悗闈㈢殑鍏蜂綋鏃躲�佸垎銆佺鍜屼紶鍏ュ�肩浉绛�</returns>
+ public DateTime CalculateFirstDateOfWeek(DateTime dateTime)
+ {
+ int i = dateTime.DayOfWeek - DayOfWeek.Monday;
+ if (i == -1)
+ i = 6;
+ TimeSpan ts = new TimeSpan(i, 0, 0, 0);
+ return dateTime.Subtract(ts);
+ }
+
+ /// <summary>
+ /// 璁＄畻鏈懆缁撴潫鏃ユ湡锛堢ぜ鎷滄棩鐨勬棩鏈燂級
+ /// </summary>
+ /// <param name="dateTime"> 璇ュ懆涓换鎰忎竴澶�</param>
+ /// <returns>杩斿洖绀兼嫓鏃ユ棩鏈燂紝鍚庨潰鐨勫叿浣撴椂銆佸垎銆佺鍜屼紶鍏ュ�肩浉绛� </returns>
+ public DateTime CalculateLastDateOfWeek(DateTime dateTime)
+ {
+ int i = dateTime.DayOfWeek - DayOfWeek.Sunday;
+ if (i != 0) i = 7 - i; // 鍥犱负鏋氫妇鍘熷洜锛孲unday鎺掑湪鏈�鍓嶏紝鐩稿噺闂撮殧瑕佽7鍑忋��
+ TimeSpan ts = new TimeSpan(i, 0, 0, 0);
+ return dateTime.Add(ts);
+ }
+
+
+
+ //鎶婅秴杩�90澶╄繕娌℃湁杞寲鐨勬。妗堝鎴风殑涓氬姟缁忕悊褰掍负鏃�
+ public void ywjlguiling()
+ {
+ var intentionCustomerDTOs = _intentionCustomerService.GetList().Where(x=>x.Ywjltime < DateTime.Now.AddDays(-90)).ToList();
+
+ foreach(var intentionCustomerDTO in intentionCustomerDTOs)
+ {
+ intentionCustomerDTO.Ywjl = null;
+ intentionCustomerDTO.Ywjltime = null;
+ _intentionCustomerService.save(intentionCustomerDTO);
+ }
+ }
+
+
+ //鎶婁細鍛樼郴缁熷拰oa绯荤粺鎵嬫満鍙风浉鍚岀殑瀹㈡埛鍏宠仈璧锋潵
+ public void huiyuanguanlian()
+ {
+ var cooperatecustomCustomers = _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A" && x.HuiyuanId == null).ToList();
+ var frameworkUsers = _zcUsercontext.FrameworkUsers.Where(x => x.IsValid == true).ToList();
+ if (cooperatecustomCustomers != null && cooperatecustomCustomers.Count > 0)
+ {
+ foreach (var cooperatecustomCustomer in cooperatecustomCustomers)
+ {
+ if (!string.IsNullOrEmpty(cooperatecustomCustomer.Tel))
+ {
+ var frameworkUser = frameworkUsers.Where(x => x.Itcode == cooperatecustomCustomer.Tel).FirstOrDefault();
+ if (frameworkUser != null)
+ {
+ cooperatecustomCustomer.HuiyuanId = frameworkUser.Id.ToString();
+ }
+ }
+
+ }
+ _context.SaveChanges();
+ }
+
+
+
+ var intentionCustomers = _context.IntentionCustomers.Where(x => x.RecStatus == "A" && x.HuiyuanId == null).ToList();
+ if (intentionCustomers != null && intentionCustomers.Count > 0)
+ {
+ foreach (var intentionCustomer in intentionCustomers)
+ {
+ if (!string.IsNullOrEmpty(intentionCustomer.Tel))
+ {
+ var frameworkUser = frameworkUsers.Where(x => x.Itcode == intentionCustomer.Tel).FirstOrDefault();
+ if (frameworkUser != null)
+ {
+ intentionCustomer.HuiyuanId = frameworkUser.Id.ToString();
+ }
+ }
+
+ }
+ _context.SaveChanges();
+ }
+
+ }
+
//璁＄畻鑰冨嫟
public void jisuankaoqin()
{
@@ -236,14 +389,20 @@
ResultEntity resultEntity = new ResultEntity();
resultEntity.Result = false;
-
+ var Month = DateTime.Now.Month - 1;
+ var Year = DateTime.Now.Year;
+ if (Month == 0)
+ {
+ Month = 12;
+ Year = Year - 1;
+ }
//鏌ヨ鎵�鏈夌殑鏈夋晥浜哄憳
- List<PltUserDTO> userList = _userService.GetListjisuankaoqin(new DateTime(DateTime.Now.Year, DateTime.Now.Month - 1, 1), new DateTime(DateTime.Now.Year, DateTime.Now.Month - 1, 1).AddMonths(1));//.Where(x => x.UserSn == "yang").ToList();
+ List<PltUserDTO> userList = _userService.GetListjisuankaoqin(new DateTime(Year, Month, 1), new DateTime(Year, Month, 1).AddMonths(1));//.Where(x => x.UserSn == "yang").ToList();
for (int a = 0; a < userList.Count; a++)
{
_logger.LogInformation("寮�濮嬭绠�" + userList[a].UserName + "鑰冨嫟");
//寮�濮嬭绠楄�冨嫟
- DateTime dateminkaoqin = new DateTime(DateTime.Now.Year, DateTime.Now.Month - 1, 1);
+ DateTime dateminkaoqin = new DateTime(Year, Month, 1);
DateTime datemaxkaoqin = dateminkaoqin.AddMonths(1);
List<AdmAskLeaveDTO> admAskLeaveDTOs = _signinService.GetAskLeaveByUserId(userList[a].Id);
List<AdmAskLeaveOffDTO> admAskLeaveOffDTOs = _signinService.GetAskLeaveOffByUserId(userList[a].Id);
@@ -261,6 +420,7 @@
admAttendanceDTO.Qingjia = 0;
admAttendanceDTO.Jiaban = 0;
admAttendanceDTO.Xiaojia = 0;
+ admAttendanceDTO.Daixinjia = 0;
admAttendanceDTO.Chidao = 0;
admAttendanceDTO.Zaotui = 0;
admAttendanceDTO.Kuanggong = 0;
@@ -286,6 +446,7 @@
decimal Zaotui = 0;
decimal Kuanggong = 0;
decimal Xiaojia = 0;
+ decimal Daixinjia = 0;
while (dateminkaoqin < datemaxkaoqin)
{
@@ -339,7 +500,7 @@
admSignInDTO = new AdmSignInDTO();
}
//鏌ヨ璇峰亣 璇峰亣鏃堕棿涓嶈兘閲嶅彔
- List<AdmAskLeaveDTO> admAskLeaveDTOMin = admAskLeaveDTOs.Where(x =>x.Lavetype != "2" && x.StratTime < dateminkaoqin.AddDays(1) && x.EndTime > dateminkaoqin).OrderByDescending(x=>x.Createtime).ToList();
+ List<AdmAskLeaveDTO> admAskLeaveDTOMin = admAskLeaveDTOs.Where(x => x.Lavetype != "2" && x.StratTime < dateminkaoqin.AddDays(1) && x.EndTime > dateminkaoqin).OrderByDescending(x=>x.Createtime).ToList();
//鏌ヨ閿�鍋� 閿�鍋囨椂闂翠笉鑳介噸鍙�
List<AdmAskLeaveOffDTO> admAskLeaveOffDTOMin = admAskLeaveOffDTOs.Where(x => x.StratTime < dateminkaoqin.AddDays(1) && x.EndTime > dateminkaoqin).OrderByDescending(x => x.Createtime).ToList();
@@ -373,6 +534,8 @@
decimal Kuanggongtianshu = 0;
decimal dangtianqingjia = 0;
decimal dangtianxiaojia = 0;
+ decimal dangtiandaixinjia = 0;
+
string Iswork = "D";
if (iswork)
{
@@ -438,17 +601,22 @@
}
else
{
- if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
- {
- kuanggong = true;
- break;
- }
- else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //{
+ // //kuanggong = true;
+ // break;
+ //}
+ //else
+ if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
{
endttime = dateBiJiaoDTOs[i].EndTime;
}
+ if (!starttime.HasValue)
+ {
+ starttime = dateBiJiaoDTOs[i].StartTime;
+ }
}
- if (endttime>= StratTimeWorkingEnd)
+ if (endttime >= StratTimeWorkingEnd && starttime.HasValue)
{
break;
}
@@ -559,17 +727,22 @@
}
else
{
- if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
- {
- kuanggong = true;
- break;
- }
- else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //{
+ // //kuanggong = true;
+ // break;
+ //}
+ //else
+ if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
{
endttime = dateBiJiaoDTOs[i].EndTime;
}
+ if (!starttime.HasValue)
+ {
+ starttime = dateBiJiaoDTOs[i].StartTime;
+ }
}
- if (endttime >= StratTimeOffworkEnd)
+ if (endttime >= StratTimeOffworkEnd && starttime.HasValue)
{
break;
}
@@ -627,7 +800,7 @@
//璁＄畻褰撳ぉ璇峰亣
List<DateBiJiaoDTO> qingjias = new List<DateBiJiaoDTO>();
- var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7").ToList();
+ var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7" && x.Lavetype != "3" && x.Lavetype != "9").ToList();
foreach (var admAskLeave in feichuqinjia)
{
@@ -688,6 +861,63 @@
}
Qingjia += dangtianqingjia;
+
+
+
+ //璁＄畻褰撳ぉ甯﹁柂鍋�
+ List<DateBiJiaoDTO> daixinjias = new List<DateBiJiaoDTO>();
+
+ var chauxndaixinjias = admAskLeaveDTOMin.Where(x => x.Lavetype == "4" || x.Lavetype == "7" || x.Lavetype == "3" || x.Lavetype == "9").ToList();
+ foreach (var admAskLeave in chauxndaixinjias)
+ {
+
+ DateBiJiaoDTO dateBiJiaoDTO = new DateBiJiaoDTO();
+ dateBiJiaoDTO.StartTime = admAskLeave.StratTime;
+ dateBiJiaoDTO.EndTime = admAskLeave.EndTime;
+ daixinjias.Add(dateBiJiaoDTO);
+
+ }
+
+ foreach (var daixinjia in daixinjias)
+ {
+ if (daixinjia.StartTime < StratTimeWorkingStart)
+ {
+ daixinjia.StartTime = StratTimeWorkingStart;
+ }
+ if (daixinjia.StartTime > StratTimeWorkingEnd && daixinjia.StartTime < StratTimeOffworkStart)
+ {
+ daixinjia.StartTime = StratTimeOffworkStart;
+ }
+
+
+ if (daixinjia.EndTime > StratTimeWorkingEnd && daixinjia.EndTime < StratTimeOffworkStart)
+ {
+ daixinjia.EndTime = StratTimeWorkingEnd;
+ }
+
+
+ if (daixinjia.EndTime > StratTimeOffworkEnd)
+ {
+ daixinjia.EndTime = StratTimeOffworkEnd;
+ }
+ TimeSpan daixinjiashiijan = daixinjia.EndTime.Value.Subtract(daixinjia.StartTime.Value);
+ if (daixinjia.StartTime <= StratTimeWorkingEnd && daixinjia.EndTime >= StratTimeOffworkStart)
+ {
+ TimeSpan wuxiushijian = StratTimeOffworkStart.Subtract(StratTimeWorkingEnd);
+ dangtiandaixinjia += Math.Round(((decimal)(daixinjiashiijan.Hours * 60 + daixinjiashiijan.Minutes - wuxiushijian.Hours * 60 - wuxiushijian.Minutes)) / ((decimal)shangbanshijian), 2);
+ }
+ else
+ {
+ dangtiandaixinjia += Math.Round(((decimal)(daixinjiashiijan.Hours * 60 + daixinjiashiijan.Minutes)) / ((decimal)shangbanshijian), 2);
+ }
+
+
+
+ }
+
+ Daixinjia += dangtiandaixinjia;
+
+
//璁＄畻褰撳ぉ鍑哄嫟澶╂暟
Shijichuqin += (1 - Kuanggongtianshu - dangtianqingjia);
@@ -764,10 +994,10 @@
{
jiabanshijian = admAskovertimeDTO.Overtime.Value;
}
-
-
-
-
+ if (jiabanshijian > new decimal(shangbanshijian) / 60)
+ {
+ jiabanshijian = new decimal(shangbanshijian) /60;
+ }
Jiaban += Math.Round(jiabanshijian * 60 / shangbanshijian, 2);
}
@@ -839,14 +1069,19 @@
}
else
{
- if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
- {
- kuanggong = true;
- break;
- }
- else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //{
+ // //kuanggong = true;
+ // break;
+ //}
+ //else
+ if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
{
endttime = dateBiJiaoDTOs[i].EndTime;
+ }
+ if (!starttime.HasValue)
+ {
+ starttime = dateBiJiaoDTOs[i].StartTime;
}
}
}
@@ -956,14 +1191,19 @@
}
else
{
- if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
- {
- kuanggong = true;
- break;
- }
- else if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //if (dateBiJiaoDTOs[i].StartTime > dateBiJiaoDTOs[i - 1].EndTime)
+ //{
+ // //kuanggong = true;
+ // break;
+ //}
+ //else
+ if (dateBiJiaoDTOs[i].EndTime > dateBiJiaoDTOs[i - 1].EndTime)
{
endttime = dateBiJiaoDTOs[i].EndTime;
+ }
+ if (!starttime.HasValue)
+ {
+ starttime = dateBiJiaoDTOs[i].StartTime;
}
}
}
@@ -1020,7 +1260,7 @@
//璁＄畻褰撳ぉ璇峰亣
List<DateBiJiaoDTO> qingjias = new List<DateBiJiaoDTO>();
- var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7").ToList();
+ var feichuqinjia = admAskLeaveDTOMin.Where(x => x.Lavetype != "4" && x.Lavetype != "7" && x.Lavetype != "3" && x.Lavetype != "9").ToList();
foreach (var admAskLeave in feichuqinjia)
{
@@ -1081,6 +1321,64 @@
}
Qingjia += dangtianqingjia;
+
+
+
+ //璁＄畻褰撳ぉ甯﹁柂鍋�
+ List<DateBiJiaoDTO> daixinjias = new List<DateBiJiaoDTO>();
+
+ var chauxndaixinjias = admAskLeaveDTOMin.Where(x => x.Lavetype == "4" || x.Lavetype == "7" || x.Lavetype == "3" || x.Lavetype == "9").ToList();
+ foreach (var admAskLeave in chauxndaixinjias)
+ {
+
+ DateBiJiaoDTO dateBiJiaoDTO = new DateBiJiaoDTO();
+ dateBiJiaoDTO.StartTime = admAskLeave.StratTime;
+ dateBiJiaoDTO.EndTime = admAskLeave.EndTime;
+ daixinjias.Add(dateBiJiaoDTO);
+
+ }
+
+ foreach (var daixinjia in daixinjias)
+ {
+ if (daixinjia.StartTime < StratTimeWorkingStart)
+ {
+ daixinjia.StartTime = StratTimeWorkingStart;
+ }
+ if (daixinjia.StartTime > StratTimeWorkingEnd && daixinjia.StartTime < StratTimeOffworkStart)
+ {
+ daixinjia.StartTime = StratTimeOffworkStart;
+ }
+
+
+ if (daixinjia.EndTime > StratTimeWorkingEnd && daixinjia.EndTime < StratTimeOffworkStart)
+ {
+ daixinjia.EndTime = StratTimeWorkingEnd;
+ }
+
+
+ if (daixinjia.EndTime > StratTimeOffworkEnd)
+ {
+ daixinjia.EndTime = StratTimeOffworkEnd;
+ }
+ TimeSpan daixinjiashiijan = daixinjia.EndTime.Value.Subtract(daixinjia.StartTime.Value);
+ if (daixinjia.StartTime <= StratTimeWorkingEnd && daixinjia.EndTime >= StratTimeOffworkStart)
+ {
+ TimeSpan wuxiushijian = StratTimeOffworkStart.Subtract(StratTimeWorkingEnd);
+ dangtiandaixinjia += Math.Round(((decimal)(daixinjiashiijan.Hours * 60 + daixinjiashiijan.Minutes - wuxiushijian.Hours * 60 - wuxiushijian.Minutes)) / ((decimal)shangbanshijian), 2);
+ }
+ else
+ {
+ dangtiandaixinjia += Math.Round(((decimal)(daixinjiashiijan.Hours * 60 + daixinjiashiijan.Minutes)) / ((decimal)shangbanshijian), 2);
+ }
+
+
+
+ }
+
+ Daixinjia += dangtiandaixinjia;
+
+
+
//璁＄畻褰撳ぉ鍑哄嫟澶╂暟
Jiaban += (1 - Kuanggongtianshu - dangtianqingjia);
@@ -1161,10 +1459,10 @@
{
jiabanshijian = admAskovertimeDTO.Overtime.Value;
}
-
-
-
-
+ if (jiabanshijian > new decimal(shangbanshijian) / 60)
+ {
+ jiabanshijian = new decimal(shangbanshijian) / 60;
+ }
Jiaban += Math.Round(jiabanshijian * 60 / shangbanshijian, 2);
}
}
@@ -1192,7 +1490,7 @@
admAttendanceDtlDTO.OvertimeOut = admSignInDTO.OvertimeOut;
admAttendanceDtlDTO.Qingjia = dangtianqingjia;
admAttendanceDtlDTO.Xiaojia = dangtianxiaojia;
-
+ admAttendanceDtlDTO.Daixinjia = dangtiandaixinjia;
@@ -1228,6 +1526,7 @@
admAttendanceDtlDTO.OvertimeIn = admSignInDTO.OvertimeIn;
admAttendanceDtlDTO.OvertimeOut = admSignInDTO.OvertimeOut;
admAttendanceDtlDTO.Qingjia = dangtianqingjia;
+ admAttendanceDtlDTO.Daixinjia = dangtiandaixinjia;
admAttendanceDtlDTO.Xiaojia = dangtianxiaojia;
@@ -1279,6 +1578,7 @@
admAttendanceDTO.Qingjia = Qingjia;
+ admAttendanceDTO.Daixinjia = Daixinjia;
admAttendanceDTO.Xiaojia = Xiaojia;
admAttendanceDTO.Chidao = Chidao;
admAttendanceDTO.Islock = "A";
@@ -1296,8 +1596,15 @@
//璁＄畻宸ヨ祫
public async Task jisuangongziAsync()
{
+ var Month = DateTime.Now.Month - 1;
+ var Year = DateTime.Now.Year;
+ if (Month == 0)
+ {
+ Month = 12;
+ Year = Year - 1;
+ }
//鏌ヨ鎵�鏈夌殑鏈夋晥浜哄憳
- DateTime dateminkaoqin = new DateTime(DateTime.Now.Year, DateTime.Now.Month - 1, 1);
+ DateTime dateminkaoqin = new DateTime(Year, Month, 1);
DateTime datemaxkaoqin = dateminkaoqin.AddMonths(1);
List<PltUserDTO> userList = _userService.GetListjisuankaoqin(dateminkaoqin, datemaxkaoqin);//.Where(x => x.UserSn == "yang").ToList();
List<HrJibengongziDTO> hrJibengongziDTOs = _JibengongziService.GetList().Where(x=> x.Effecttime < datemaxkaoqin).ToList();
@@ -1384,7 +1691,7 @@
hrSalaryDTO.Jiabangongzi = 0;
decimal shiyongqichuqintianshu = 0;
decimal shiyongqichuqinlv = 0;
-
+ decimal yingfaheji = 0;
decimal BasicPrice = 0;
@@ -1396,12 +1703,20 @@
- 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) ;
+ decimal ShiyongPrice = 0;
if (!userList[i].ShiyongPrice.HasValue)
{
- _logger.LogInformation(userList[i].UserName + ": 鍛樺伐澶勪簬璇曠敤鏈燂紝浣嗘槸璇曠敤鏈熷伐璧勪负绌�");
- continue;
+ ShiyongPrice = BasicPrice * new decimal(0.8);
+ _logger.LogInformation(userList[i].UserName + ": 鍛樺伐澶勪簬璇曠敤鏈燂紝浣嗘槸璇曠敤鏈熷伐璧勪负绌�,瀹氫负姝ｅ紡宸ヨ祫鐨�0.8鍊�");
+
+ }
+ else
+ {
+ ShiyongPrice = userList[i].ShiyongPrice.Value;
}
//鏌ヨ鏄惁鏈変笉绉拌亴鐨勫伐浣滆�冭瘎
var admEvaluateDTOsshiyongqi = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, userList[i].ShiyongDateEnd.Value.AddDays(1)).Where(x => x.EvaluateValue == "03").ToList();
@@ -1419,7 +1734,7 @@
shiyongqichuqintianshu += (1 - admAttendanceDtlDTO.Qingjia - admAttendanceDtlDTO.Kuanggongtianshu);
if (admAttendanceDtlDTO.Kuanggongtianshu > 0)
{
- var queqingkoukuan = Math.Round(userList[i].ShiyongPrice.Value / jiabangongzibiaozhun * admAttendanceDtlDTO.Kuanggongtianshu * (admAttendanceRuleDTO.AbsenteeismPayment1 - 1), 2);
+ var queqingkoukuan = Math.Round(ShiyongPrice / jiabangongzibiaozhun * admAttendanceDtlDTO.Kuanggongtianshu * (admAttendanceRuleDTO.AbsenteeismPayment1 - 1), 2);
if (queqingkoukuan > 0)
{
hrSalaryDTO.Queqin += queqingkoukuan;
@@ -1434,29 +1749,34 @@
shiyongqichuqinlv = Math.Round(shiyongqichuqintianshu / admAttendanceDTO.Yingchuqin, 4);
//宸ヤ綔璇勪环涓嶅悎鏍肩綒娆�
- hrSalaryDTO.Fakuan += Math.Round(userList[i].ShiyongPrice.Value * admEvaluateDTOsshiyongqi.Count / admAttendanceDTO.Yingchuqin + BasicPrice * (admEvaluateDTOs.Count - admEvaluateDTOsshiyongqi.Count) / admAttendanceDTO.Yingchuqin, 2);
+ hrSalaryDTO.Fakuan += Math.Round(ShiyongPrice * admEvaluateDTOsshiyongqi.Count / admAttendanceDTO.Yingchuqin + BasicPrice * (admEvaluateDTOs.Count - admEvaluateDTOsshiyongqi.Count) / admAttendanceDTO.Yingchuqin, 2);
}
else
{
if (admAttendanceDTO.Kuanggong > 0)
{
- var queqingkoukuan = Math.Round(userList[i].ShiyongPrice.Value / jiabangongzibiaozhun * admAttendanceDTO.Kuanggong * (admAttendanceRuleDTO.AbsenteeismPayment1 - 1), 2);
+ var queqingkoukuan = Math.Round(ShiyongPrice / jiabangongzibiaozhun * admAttendanceDTO.Kuanggong * (admAttendanceRuleDTO.AbsenteeismPayment1 - 1), 2);
if (queqingkoukuan > 0)
{
hrSalaryDTO.Queqin += queqingkoukuan;
}
}
- hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value, 2);
+ if (hrJibengongzi.Jiabangongzi.HasValue)
+ {
+ hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2); //(admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value
+ }
+
+
//宸ヤ綔璇勪环涓嶅悎鏍肩綒娆�
- hrSalaryDTO.Fakuan += Math.Round(userList[i].ShiyongPrice.Value * admEvaluateDTOs.Count / admAttendanceDTO.Yingchuqin, 2);
+ hrSalaryDTO.Fakuan += Math.Round(ShiyongPrice * admEvaluateDTOs.Count / admAttendanceDTO.Yingchuqin, 2);
}
- hrSalaryDTO.Gongzuobutie += Math.Round( (userList[i].ShiyongPrice.Value - hrJibengongzi.Baomifei.Value- hrJibengongzi.Jibengongzi.Value ) * shiyongqichuqinlv, 2);
+ hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice * shiyongqichuqinlv - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) , 2);
@@ -1525,12 +1845,16 @@
hrSalaryDTO.Queqin += queqingkoukuan;
}
}
- hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
+ if (hrJibengongzi.Jiabangongzi.HasValue)
+ {
+ hrSalaryDTO.Jiabangongzi += Math.Round(admAttendanceDTO.Jiaban * hrJibengongzi.Jiabangongzi.Value, 2); // hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * BasicPrice, 2);
+ }
+
}
- hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice - hrJibengongzi.Baomifei.Value - hrJibengongzi.Jibengongzi.Value) * zhuanzhengchuqinlv, 2);
+ hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);
@@ -1825,12 +2149,12 @@
//var feijijiandengji = fiPiecerateDTOs.Where(x => x.Standard == "A");
//var jijiandengji = fiPiecerateDTOs.Where(x => x.Standard == "A");
- #region 閲囪喘椤圭洰褰曞叆
+ #region 閲囪喘鍏憡褰曞叆
- var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
- if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
+ var caigougonggaoDTOsyue = _projectService.GetcaigougonggaoListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ if (caigougonggaoDTOsyue != null && caigougonggaoDTOsyue.Count > 0)
{
- var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
+ var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "閲囪喘鍏憡褰曞叆").FirstOrDefault();
if (jijianidddd != null)
{
var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1838,16 +2162,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while(kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var caigougonggaoDTOsri = caigougonggaoDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = caigougonggaoDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
}
-
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = caigougonggaoDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -1855,7 +2206,7 @@
decimal renwujishu = jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
+ decimal youxiaojijian = caigougonggaoDTOsyue.Count - renwujishu;
if (youxiaojijian > 0)
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1869,8 +2220,85 @@
}
#endregion
+ #region 閲囪喘椤圭洰褰曞叆
+
+ var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ 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)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ 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 + zhengfuprojectDTOri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
+ }
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+
+ }
+ }
+ }
+
+ }
+ }
+ #endregion
+
+
+
+
+
#region 瀹㈡埛璧勬枡褰曞叆
-
+
var _intentionCustomerDTOs = _intentionCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
if (_intentionCustomerDTOs!=null && _intentionCustomerDTOs.Count > 0)
{
@@ -1882,16 +2310,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = _intentionCustomerDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var _intentionCustomerDTOsri = _intentionCustomerDTOs.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = _intentionCustomerDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = _intentionCustomerDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -1928,16 +2383,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var groupTopicDTOsri = groupTopicDTOs.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = groupTopicDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -1972,16 +2454,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = intentionVisitDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var intentionVisitDTOsri = intentionVisitDTOs.Where(x => x.Vistime >= kaishijisuan && x.Vistime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = intentionVisitDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = intentionVisitDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2016,16 +2525,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = duanxinsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var duanxinsri = duanxinsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = duanxinsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = duanxinsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2047,6 +2583,80 @@
}
#endregion
+
+ #region 娣诲姞寰俊瀹㈡埛
+ TongjiBaoBiaoDTO weixnDTO = new TongjiBaoBiaoDTO();
+ weixnDTO.gongzuo = "娣诲姞寰俊瀹㈡埛";
+ //鏈湀鏁伴噺
+ var cooperweixinDTOsyue = _cooperatecustomCustomerService.GetListsalaryweixin(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ var intentionweixinDTOsyue = _intentionCustomerService.GetListsalaryweixin(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ var jijianiweixn = fiPiecerateDTOs.Where(x => x.Project == "娣诲姞寰俊瀹㈡埛").FirstOrDefault();
+ if (jijianiweixn != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiweixn.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperweixinDTOsri = cooperweixinDTOsyue.Where(x => x.Weixintime >= kaishijisuan && x.Weixintime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var intentionweixinDTOsri = intentionweixinDTOsyue.Where(x => x.Weixintime >= kaishijisuan && x.Weixintime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
+ }
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperweixinDTOsyue.Count+ intentionweixinDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperweixinDTOsyue.Count + intentionweixinDTOsyue.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+
+ }
+ }
+ }
+
+ }
+
+ #endregion
+
#region 缇ゅ彂閭欢
var youjiansyue = _cusFangwenjiluService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "02").ToList();
@@ -2060,16 +2670,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = youjiansyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var youjiansri = youjiansyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = youjiansri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = youjiansyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2104,16 +2741,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = yixiangsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var yixiangsri = yixiangsyue.Where(x => x.Yixiangtime >= kaishijisuan && x.Yixiangtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = yixiangsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = yixiangsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2193,16 +2857,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = zhucehuiyuansyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var zhucehuiyuansyueri = zhucehuiyuansyue.Where(x => x.CreatTime >= kaishijisuan && x.CreatTime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhucehuiyuansyueri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = zhucehuiyuansyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2238,16 +2930,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = qianyueDTOsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var qianyueDTOsri = qianyueDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = qianyueDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = qianyueDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2283,16 +3003,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = intentionVisitDTOsshangmen.Count + cooperVisitDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperVisitDTOsri = cooperVisitDTOs.Where(x => x.Vistime >= kaishijisuan && x.Vistime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var intentionVisitDTOsshangmenri = intentionVisitDTOsshangmen.Where(x => x.Vistime >= kaishijisuan && x.Vistime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperVisitDTOsri.Count + intentionVisitDTOsshangmenri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = intentionVisitDTOsshangmen.Count + cooperVisitDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2306,6 +3054,42 @@
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
}
+ }
+ }
+
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+
+ var cooperVisitDTOszhou = _cooperVisitService.GetListsalary(userList[i].Id, dateminkaoqin.AddMonths(-1), datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+ var intentionVisitDTOsshangmenzhou = _intentionVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ var zhoukaishidate = CalculateFirstDateOfWeek(kaishijisuan);
+ var zhoujieshudate = CalculateLastDateOfWeek(kaishijisuan);
+
+ try
+ {
+ if(zhoujieshudate < datemaxkaoqin)
+ {
+ var cooperVisitDTOsri = cooperVisitDTOszhou.Where(x => x.Vistime >= zhoukaishidate && x.Vistime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var intentionVisitDTOsshangmenri = intentionVisitDTOsshangmenzhou.Where(x => x.Vistime >= zhoukaishidate && x.Vistime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperVisitDTOsri.Count + intentionVisitDTOsshangmenri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = zhoujieshudate.AddDays(1);
}
}
}
@@ -2333,16 +3117,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = dtChannelArticleNewsDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var dtChannelArticleNewsDTOsri = dtChannelArticleNewsDTOs.Where(x => x.AddTime >= kaishijisuan && x.AddTime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = dtChannelArticleNewsDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = dtChannelArticleNewsDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2383,16 +3194,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = dianxinanDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var dianxinanDTOsri = dianxinanDTOs.Where(x => x.AddTime >= kaishijisuan && x.AddTime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = dianxinanDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = dianxinanDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2433,16 +3271,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = zhengcaizhishiDTOs.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var zhengcaizhishiDTOsri = zhengcaizhishiDTOs.Where(x => x.AddTime >= kaishijisuan && x.AddTime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhengcaizhishiDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = zhengcaizhishiDTOs.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2477,16 +3342,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = xinzengwendaDTOsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var xinzengwendaDTOsri = xinzengwendaDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = xinzengwendaDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = xinzengwendaDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2521,16 +3413,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = shenhewendaDTOsyue.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var shenhewendaDTOsri = shenhewendaDTOsyue.Where(x => x.Shenhetime >= kaishijisuan && x.Shenhetime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = shenhewendaDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = shenhewendaDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2612,6 +3531,7 @@
#endregion
//鍚堜綔瀹㈡埛璁㈠崟
List<CooperOrderDTO> cooperOrderDTOs = _cooperOrderService.GetList(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ List<CooperOrderDTO> cooperOrderDTOszhouyue = _cooperOrderService.GetList(userList[i].Id, dateminkaoqin.AddMinutes(-1), datemaxkaoqin);
#region 鍥句功閿�鍞�
var cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "01").ToList();
@@ -2623,17 +3543,44 @@
{
if(jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if(jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu ;
- if (youxiaojijian>0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushusri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushusri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
}
-
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
-
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ // if(jixiaotichengfangan.Tichengstandard == "01")
+ // {
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu ;
+ // if (youxiaojijian>0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ // }
+
}
else if (jixiaotichengfangan.Renwustandard == "02")
{
@@ -2650,19 +3597,49 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian* new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushusri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushusri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian* new decimal(0.01), 2);
+ //}
}
}
@@ -2681,6 +3658,44 @@
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
}
+ }
+ }
+ else if (jixiaotichengfangan.Renwustandard == "06")
+ {
+
+ var cooperOrderDTOszhou = cooperOrderDTOszhouyue.Where(x => x.OrderType == "01").ToList();
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ var zhoukaishidate = CalculateFirstDateOfWeek(kaishijisuan);
+ var zhoujieshudate = CalculateLastDateOfWeek(kaishijisuan);
+
+ try
+ {
+ if (zhoujieshudate < datemaxkaoqin)
+ {
+ var cooperOrdertushusri = cooperOrderDTOszhou.Where(x => x.Createtime >= zhoukaishidate && x.Createtime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushusri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+
+
+
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = zhoujieshudate.AddDays(1);
}
}
}
@@ -2697,16 +3712,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2724,19 +3767,49 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -2755,6 +3828,44 @@
{
hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
}
+ }
+ }
+ else if (jixiaotichengfangan.Renwustandard == "06")
+ {
+
+ var cooperOrderDTOszhou = cooperOrderDTOszhouyue.Where(x => x.OrderType == "02").ToList();
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ var zhoukaishidate = CalculateFirstDateOfWeek(kaishijisuan);
+ var zhoujieshudate = CalculateLastDateOfWeek(kaishijisuan);
+
+ try
+ {
+ if (zhoujieshudate < datemaxkaoqin)
+ {
+ var cooperOrdertushusri = cooperOrderDTOszhou.Where(x => x.Createtime >= zhoukaishidate && x.Createtime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushusri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+
+
+
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = zhoujieshudate.AddDays(1);
}
}
}
@@ -2772,16 +3883,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2799,19 +3938,49 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -2832,6 +4001,44 @@
}
}
}
+ else if (jixiaotichengfangan.Renwustandard == "06")
+ {
+
+ var cooperOrderDTOszhou = cooperOrderDTOszhouyue.Where(x => x.OrderType == "03").ToList();
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ var zhoukaishidate = CalculateFirstDateOfWeek(kaishijisuan);
+ var zhoujieshudate = CalculateLastDateOfWeek(kaishijisuan);
+
+ try
+ {
+ if (zhoujieshudate < datemaxkaoqin)
+ {
+ var cooperOrdertushusri = cooperOrderDTOszhou.Where(x => x.Createtime >= zhoukaishidate && x.Createtime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushusri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+
+
+
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = zhoujieshudate.AddDays(1);
+ }
+ }
}
}
@@ -2847,16 +4054,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2874,19 +4108,49 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -2922,16 +4186,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushusri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushusri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -2964,19 +4255,48 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -2997,6 +4317,47 @@
}
}
}
+
+ else if (jixiaotichengfangan.Renwustandard == "05")
+ {
+
+ var cooperOrderDTOszhou = cooperOrderDTOszhouyue.Where(x => x.OrderType == "05").OrderBy(x => x.Createtime).ToList();
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ var zhoukaishidate = CalculateFirstDateOfWeek(kaishijisuan);
+ var zhoujieshudate = CalculateLastDateOfWeek(kaishijisuan);
+
+ try
+ {
+ if (zhoujieshudate < datemaxkaoqin)
+ {
+ var cooperOrdertushusri = cooperOrderDTOszhou.Where(x => x.Createtime >= zhoukaishidate && x.Createtime < zhoujieshudate.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ //if (jixiaotichengfangan.Tichengstandard == "02")
+ if (cooperOrdertushusri.Count > renwujishu)
+ {
+ List<CooperOrderDTO> cooperOrdertushuyouxiao = new List<CooperOrderDTO>();
+ for (int j = Convert.ToInt32(renwujishu); j < cooperOrdertushusri.Count; j++)
+ {
+ cooperOrdertushuyouxiao.Add(cooperOrdertushusri[j]);
+ }
+ var dingdanjine = cooperOrdertushuyouxiao.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * dingdanjinezhenshi * new decimal(0.01), 2);
+ }
+
+
+
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = zhoujieshudate.AddDays(1);
+ }
+ }
}
}
@@ -3012,14 +4373,41 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ //}
}
@@ -3039,19 +4427,48 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -3087,14 +4504,42 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "01")
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ //}
}
@@ -3114,19 +4559,50 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -3162,16 +4638,44 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Wangongtime >= kaishijisuan && x.Wangongtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -3189,19 +4693,48 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Wangongtime >= kaishijisuan && x.Wangongtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -3237,16 +4770,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -3264,19 +4824,48 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -3312,16 +4901,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -3339,19 +4955,48 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
if (jixiaotichengfangan.Tichengstandard == "02")
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ //var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ ////var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ ////var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ //decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ //if (youxiaojijian > 0)
+ //{
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ //}
}
}
@@ -3387,16 +5032,43 @@
{
if (jixiaotichengfangan.Renwustandard == "01")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "01")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
- }
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = cooperOrdertushuri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "02")
@@ -3414,20 +5086,50 @@
}
else if (jixiaotichengfangan.Renwustandard == "03")
{
- decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
- if (jixiaotichengfangan.Tichengstandard == "02")
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
{
- var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
- var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
- //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
- //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
-
- decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
- if (youxiaojijian > 0)
+ try
{
- hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var cooperOrdertushuri = cooperOrdertushu.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ var dingdanjine = cooperOrdertushuri.Sum(x => x.Money);
+ var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ if (jixiaotichengfangan.Tichengstandard == "02")
+ {
+ decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ }
+ }
+ }
+
}
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
}
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "02")
+ //{
+ // var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+ // var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+ // //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+ // //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+ // decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+ // }
+ //}
}
else if (jixiaotichengfangan.Renwustandard == "04")
@@ -3452,9 +5154,105 @@
#endregion
+
+
+
+ #region 涓撳褰曞叆
+
+ var zhuanjialuruDTOsyue = _expertService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+ if (zhuanjialuruDTOsyue != null && zhuanjialuruDTOsyue.Count > 0)
+ {
+ var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "涓撳褰曞叆").FirstOrDefault();
+ if (jijianidddd != null)
+ {
+ var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+ if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+ {
+ if (jixiaotichengfangan.Renwustandard == "01")
+ {
+ DateTime kaishijisuan = new DateTime(Year, Month, 1);
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ while (kaishijisuan < datemaxkaoqin)
+ {
+ try
+ {
+ var gongzuoshijian = shifougongzuori(kaishijisuan);
+ if (gongzuoshijian)
+ {
+ var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhuanjialuruDTOsri.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ _logger.LogInformation(ex.ToString());
+ }
+ kaishijisuan = kaishijisuan.AddDays(1);
+ }
+
+ //decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+ //if (jixiaotichengfangan.Tichengstandard == "01")
+ //{
+ // decimal youxiaojijian = zhuanjialuruDTOsyue.Count - renwujishu;
+ // if (youxiaojijian > 0)
+ // {
+ // hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ // }
+
+ //}
+
+ }
+ else if (jixiaotichengfangan.Renwustandard == "02")
+ {
+ decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+ if (jixiaotichengfangan.Tichengstandard == "01")
+ {
+ decimal youxiaojijian = zhuanjialuruDTOsyue.Count - renwujishu;
+ if (youxiaojijian > 0)
+ {
+ hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+ }
+
+ }
+ }
+ }
+
+ }
+ }
+ #endregion
+
}
+ //璇曠敤鏈熺哗鏁堜负0.8鍊�
+ if (hrSalaryDTO.Jixiaoticheng.HasValue)
+ {
+ if (userList[i].ShiyongDate.HasValue && userList[i].ShiyongDateEnd.HasValue && dateminkaoqin >= userList[i].ShiyongDate.Value && dateminkaoqin <= userList[i].ShiyongDateEnd.Value)
+ {
+ if (userList[i].ShiyongDateEnd.Value < datemaxkaoqin.AddDays(-1))
+ {
+ var a = userList[i].ShiyongDateEnd.Value.Day;
+ var b = datemaxkaoqin.AddDays(-1).Day;
+ var shiyongqijixiao = new decimal(a) / new decimal(b) * hrSalaryDTO.Jixiaoticheng.Value * new decimal(0.8);
+ var zhengshijixiao =(new decimal(1) - new decimal(a) / new decimal(b)) * hrSalaryDTO.Jixiaoticheng.Value;
+ hrSalaryDTO.Jixiaoticheng = Math.Round(shiyongqijixiao + zhengshijixiao, 2);
+
+ }
+ else
+ {
+ hrSalaryDTO.Jixiaoticheng = Math.Round(hrSalaryDTO.Jixiaoticheng.Value * new decimal(0.8), 2);
+ }
+ }
+ }
+
hrSalaryDTO.Daozhanggongzi = 0;
@@ -3515,21 +5313,90 @@
decimal peichang1 = hrSalaryDTO1.Peichang.HasValue ? hrSalaryDTO1.Peichang.Value : 0;
decimal jiucuo1 = hrSalaryDTO1.Jiucuo.HasValue ? hrSalaryDTO1.Jiucuo.Value : 0;
- baodinianxin += jibengongzi1 + baomifei1 + gongzuobutie1 + jiabangongzi1 + shebao1 + quanqinjiang1 + jiaotngbutie1 + jixiaoticheng1 + jiangjin1 + bufagongzi1 + jiucuo1;
+ baodinianxin += jibengongzi1 + baomifei1 + gongzuobutie1 + jiabangongzi1 + shebao1 + quanqinjiang1 + jiaotngbutie1 + jixiaoticheng1 + jiangjin1 + bufagongzi1 + jiucuo1+ peichang1;
}
}
- baodinianxin += jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi + jiucuo;
- if(baodinianxin < userList[i].miniyearsalary.Value)
+ baodinianxin += jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi + jiucuo + peichang;
+ if (baodinianxin < userList[i].miniyearsalary.Value)
{
jiucuo = userList[i].miniyearsalary.Value - baodinianxin;
}
}
}
+ yingfaheji = jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou + ((dianhuabutie - dianhuafei) <= 0 ? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan + peichang + jiucuo;
+
+
+ hrSalaryDTO.Yufagongzi = userList[i].advancewages;
+
+ if (userList[i].advancewages.HasValue && userList[i].advancewages.Value > 0)
+ {
+ hrSalaryDTO.Yufagongziheji = 0;
+ HrSalaryDTO hrSalaryDTOlast = _hrSalaryService.GetListByUser(userList[i].Id, dateminkaoqin.AddMonths(-1).Year, dateminkaoqin.AddMonths(-1).Month);
+ if (hrSalaryDTOlast != null && hrSalaryDTOlast.Yufagongziheji.HasValue)
+ {
+ hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
+ }
+
+ if (hrSalaryDTO.Yufagongziheji > 0)
+ {
+ if (yingfaheji < (hrSalaryDTO.Yufagongzi+shebao- shebaokou))
+ {
+ hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi + shebao - shebaokou - yingfaheji);
+ yingfaheji = (hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou);
+ }
+ else if (yingfaheji > (hrSalaryDTO.Yufagongzi + shebao - shebaokou))
+ {
+ if (hrSalaryDTO.Yufagongziheji >= (yingfaheji - (hrSalaryDTO.Yufagongzi + shebao - shebaokou)))
+ {
+ hrSalaryDTO.Yufagongziheji += ((hrSalaryDTO.Yufagongzi + shebao - shebaokou) - yingfaheji);
+ yingfaheji = (hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou);
+ }
+ else
+ {
+ yingfaheji -= hrSalaryDTO.Yufagongziheji.Value;
+ hrSalaryDTO.Yufagongziheji = 0;
+ }
+
+
+ }
+
+ }
+ else if (hrSalaryDTO.Yufagongziheji == 0)
+ {
+ hrSalaryDTO.Yufagongziheji += ((hrSalaryDTO.Yufagongzi + shebao - shebaokou) - yingfaheji);
+ if (yingfaheji < (hrSalaryDTO.Yufagongzi + shebao - shebaokou))
+ {
+ yingfaheji = (hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou);
+ }
+ }
+ else if (hrSalaryDTO.Yufagongziheji < 0)
+ {
+ if (yingfaheji < (hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou))
+ {
+ if (-hrSalaryDTO.Yufagongziheji >= ((hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou) - yingfaheji))
+ {
+ hrSalaryDTO.Yufagongziheji += ((hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou) - yingfaheji);
+ yingfaheji = (hrSalaryDTO.Yufagongzi.Value + shebao - shebaokou);
+ }
+ else
+ {
+ yingfaheji += hrSalaryDTO.Yufagongziheji.Value;
+ hrSalaryDTO.Yufagongziheji = 0;
+ }
+ }
+
+ }
+
+ }
- yingnashuie = jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou + ( (dianhuabutie - dianhuafei)<=0? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan - peichang + jiucuo - geshuiqizheng;
+
+
+
+
+ yingnashuie = yingfaheji - geshuiqizheng;
hrSalaryDTO.Geshui = 0;
@@ -3653,72 +5520,13 @@
}
decimal geshui = hrSalaryDTO.Geshui.HasValue ? hrSalaryDTO.Geshui.Value : 0;
- hrSalaryDTO.Daozhanggongzi += jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou - geshui + ((dianhuabutie - dianhuafei) <= 0 ? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan - peichang + jiucuo;
+
+
+ hrSalaryDTO.Daozhanggongzi = yingfaheji - geshui;
- hrSalaryDTO.Yufagongzi = userList[i].advancewages;
-
- if (userList[i].advancewages.HasValue && userList[i].advancewages.Value>0)
- {
- hrSalaryDTO.Yufagongziheji = 0;
- HrSalaryDTO hrSalaryDTOlast = _hrSalaryService.GetListByUser(userList[i].Id, dateminkaoqin.AddMonths(-1).Year, dateminkaoqin.AddMonths(-1).Month);
- if(hrSalaryDTOlast!=null && hrSalaryDTOlast.Yufagongziheji.HasValue)
- {
- hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
- }
-
- if (hrSalaryDTO.Yufagongziheji > 0)
- {
- if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
- {
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi);
- hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
- }
- else if (hrSalaryDTO.Daozhanggongzi > hrSalaryDTO.Yufagongzi)
- {
- if(hrSalaryDTO.Yufagongziheji>= (hrSalaryDTO.Daozhanggongzi - hrSalaryDTO.Yufagongzi))
- {
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi);
- hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
- }
- else
- {
- hrSalaryDTO.Daozhanggongzi -= hrSalaryDTO.Yufagongziheji;
- hrSalaryDTO.Yufagongziheji = 0;
- }
-
-
- }
-
- }
- else if (hrSalaryDTO.Yufagongziheji == 0)
- {
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi);
- if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
- {
- hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
- }
- }
- else if (hrSalaryDTO.Yufagongziheji < 0)
- {
- if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
- {
- if (-hrSalaryDTO.Yufagongziheji >= (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi))
- {
- hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Yufagongzi - hrSalaryDTO.Daozhanggongzi);
- hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
- }
- else
- {
- hrSalaryDTO.Daozhanggongzi += hrSalaryDTO.Yufagongziheji;
- hrSalaryDTO.Yufagongziheji = 0;
- }
- }
-
- }
-
- }
+
hrSalaryDTO.RecStatus = "A";
hrSalaryDTO.Islock = "D";
hrSalaryDTO.Creater = "1";
--
Gitblit v1.9.1