zhengcaioa.git - Gitblit

			@@ -319,8 +319,8 @@
			Offdays += 1;
			}
			}

			if(userList[a].Outdate.HasValue && dateminkaoqin >=userList[a].Outdate )
			//离职当天计算考勤
			if(userList[a].Zhiwustatus == "D" && userList[a].Outdate.HasValue && dateminkaoqin >userList[a].Outdate )
			{
			dateminkaoqin = dateminkaoqin.AddDays(1);
			continue;
			@@ -448,6 +448,10 @@
			endttime = dateBiJiaoDTOs[i].EndTime;
			}
			}
			if (endttime>= StratTimeWorkingEnd)
			{
			break;
			}
			}
			if (kuanggong)
			{
			@@ -564,6 +568,10 @@
			{
			endttime = dateBiJiaoDTOs[i].EndTime;
			}
			}
			if (endttime >= StratTimeOffworkEnd)
			{
			break;
			}
			}
			if (kuanggong)
			@@ -1341,7 +1349,7 @@
			//查询是否有不称职的工作考评
			var admEvaluateDTOs = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x=>x.EvaluateValue == "03").ToList();
			//当月出勤率
			decimal chuqinlv = Math.Round((admAttendanceDTO.Shijichuqin- admEvaluateDTOs.Count) / admAttendanceDTO.Yingchuqin,4);
			decimal chuqinlv = Math.Round(admAttendanceDTO.Shijichuqin / admAttendanceDTO.Yingchuqin,4);

			//查询当前员工职务的基本工资配置

			@@ -1364,11 +1372,23 @@
			var Shebaogeren = hrJibengongzi.Shebaogeren.HasValue ? hrJibengongzi.Shebaogeren.Value : 0;
			decimal yingnashuie = 0;
			hrSalaryDTO.Queqin = 0;
			hrSalaryDTO.Fakuan = 0;
			hrSalaryDTO.Gongzuobutie = 0;
			hrSalaryDTO.Jiabangongzi = 0;
			decimal shiyongqichuqintianshu = 0;
			decimal shiyongqichuqinlv = 0;




			decimal BasicPrice = 0;
			if (!decimal.TryParse(userList[i].BasicPrice, out BasicPrice))
			{
			_logger.LogInformation(userList[i].UserName + ": 员工没有维护工资");
			continue;
			}



			if (userList[i].ShiyongDate.HasValue && userList[i].ShiyongDateEnd.HasValue && dateminkaoqin>= userList[i].ShiyongDate.Value && dateminkaoqin <= userList[i].ShiyongDateEnd.Value)
			{
			if (!userList[i].ShiyongPrice.HasValue)
			@@ -1376,6 +1396,10 @@
			_logger.LogInformation(userList[i].UserName + ": 员工处于试用期，但是试用期工资为空");
			continue;
			}
			//查询是否有不称职的工作考评
			var admEvaluateDTOsshiyongqi = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, userList[i].ShiyongDateEnd.Value.AddDays(1)).Where(x => x.EvaluateValue == "03").ToList();


			//试用期的出勤率
			shiyongqichuqinlv = chuqinlv;
			if(userList[i].ShiyongDateEnd.Value< datemaxkaoqin.AddDays(-1))
			@@ -1397,11 +1421,14 @@
			}
			}

			//查询是否有不称职的工作考评
			var admEvaluateDTOsshiyongqi = _admEvaluateService.GetListsalary(userList[i].Id, dateminkaoqin, userList[i].ShiyongDateEnd.Value.AddDays(1)).Where(x => x.EvaluateValue == "03").ToList();



			shiyongqichuqinlv = Math.Round((shiyongqichuqintianshu- admEvaluateDTOsshiyongqi.Count) / admAttendanceDTO.Yingchuqin, 4);
			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);

			}
			else
			{
			@@ -1414,6 +1441,9 @@
			}
			}
			hrSalaryDTO.Jiabangongzi += Math.Round((admAttendanceDTO.Jiaban / jiabangongzibiaozhun) * userList[i].ShiyongPrice.Value, 2);

			//工作评价不合格罚款
			hrSalaryDTO.Fakuan += Math.Round(userList[i].ShiyongPrice.Value * admEvaluateDTOs.Count / admAttendanceDTO.Yingchuqin, 2);
			}


			@@ -1421,7 +1451,7 @@

			hrSalaryDTO.Gongzuobutie += Math.Round( (userList[i].ShiyongPrice.Value - hrJibengongzi.Baomifei.Value- hrJibengongzi.Jibengongzi.Value ) * shiyongqichuqinlv, 2);




			//yingnashuie = userList[i].ShiyongPrice.Value - Shebaogeren - geshuiqizheng;

			@@ -1429,16 +1459,15 @@


			}
			else
			{
			//工作评价罚款
			hrSalaryDTO.Fakuan += Math.Round(BasicPrice * admEvaluateDTOs.Count/ admAttendanceDTO.Yingchuqin , 2);
			}


			if(true)
			{
			decimal BasicPrice = 0;
			if(!decimal.TryParse(userList[i].BasicPrice,out BasicPrice))
			{
			_logger.LogInformation(userList[i].UserName + ": 员工没有维护工资");
			continue;
			}
			//转正后的出勤率
			decimal zhuanzhengchuqinlv = chuqinlv- shiyongqichuqinlv;
			if (userList[i].ShiyongDate.HasValue && userList[i].ShiyongDateEnd.HasValue && userList[i].ShiyongDateEnd.Value >= dateminkaoqin && userList[i].ShiyongDateEnd.Value <= datemaxkaoqin.AddDays(-1))
			@@ -1728,7 +1757,8 @@
			hrSalaryDTO.Dianhuafei = SimCost.bill_amount;
			}

			if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin)
			if(admAttendanceDTO.Shijichuqin>=admAttendanceDTO.Yingchuqin
			&& hrSalaryDTO.Queqin <=0)
			{
			hrSalaryDTO.Quanqinjiang = hrJibengongzi.Quanqingjiang;
			}
			@@ -1749,7 +1779,6 @@



			hrSalaryDTO.Fakuan = 0;
			//工作安排罚款
			List<AdmMemoBookDTO> admMemoBookDTOs = _DailyManageService.GetRemindsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin,"2");
			if (admMemoBookDTOs.Count > 0)
			@@ -3504,32 +3533,53 @@
			decimal yingnashuie3 = 0;
			decimal yingnashuie4 = 0;
			decimal yingnashuie5 = 0;
			if (yingnashuie > 39250)
			decimal yingnashuie6 = 0;
			decimal yingnashuie7 = 0;
			if (yingnashuie > 80000)
			{
			yingnashuie1 = 4750;
			yingnashuie2 = (9250 - 4750);
			yingnashuie3 = (25250 - 9250);
			yingnashuie4 = (39250 - 25250);
			yingnashuie5 = (yingnashuie - 39250);
			yingnashuie1 = 3000;
			yingnashuie2 = (12000 - 3000);
			yingnashuie3 = (25000 - 12000);
			yingnashuie4 = (35000 - 25000);
			yingnashuie5 = (55000 - 35000);
			yingnashuie6 = (80000 - 55000);
			yingnashuie7 = (yingnashuie - 55000);
			}
			else if (yingnashuie > 25250)
			if (yingnashuie > 55000)
			{
			yingnashuie1 = 4750;
			yingnashuie2 = (9250 - 4750);
			yingnashuie3 = (25250 - 9250);
			yingnashuie4 = (yingnashuie - 25250);
			yingnashuie1 = 3000;
			yingnashuie2 = (12000 - 3000);
			yingnashuie3 = (25000 - 12000);
			yingnashuie4 = (35000 - 25000);
			yingnashuie5 = (55000 - 35000);
			yingnashuie6 = (yingnashuie - 55000);
			}
			if (yingnashuie > 35000)
			{
			yingnashuie1 = 3000;
			yingnashuie2 = (12000 - 3000);
			yingnashuie3 = (25000 - 12000);
			yingnashuie4 = (35000 - 25000);
			yingnashuie5 = (yingnashuie - 35000);
			}
			else if (yingnashuie > 25000)
			{
			yingnashuie1 = 3000;
			yingnashuie2 = (12000 - 3000);
			yingnashuie3 = (25000 - 12000);
			yingnashuie4 = (yingnashuie - 25000);

			}
			else if (yingnashuie > 9250)
			else if (yingnashuie > 12000)
			{
			yingnashuie1 = 4750;
			yingnashuie2 = (9250 - 4750);
			yingnashuie3 = (yingnashuie - 9250);
			yingnashuie1 = 3000;
			yingnashuie2 = (12000 - 3000);
			yingnashuie3 = (yingnashuie - 12000);
			}
			else if (yingnashuie > 4750)
			else if (yingnashuie > 3000)
			{
			yingnashuie1 = 4750;
			yingnashuie2 = (yingnashuie - 4750);
			yingnashuie1 = 3000;
			yingnashuie2 = (yingnashuie - 3000);
			}
			else
			{
			@@ -3537,7 +3587,7 @@
			}
			if (yingnashuie1 > 0)
			{
			var yingjiao1 = Math.Round(yingnashuie1 * new decimal(0.05) - 0, 2);
			var yingjiao1 = Math.Round(yingnashuie1 * new decimal(0.03) - 0, 2);
			if (yingjiao1 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao1;
			@@ -3546,7 +3596,7 @@
			}
			if (yingnashuie2 > 0)
			{
			var yingjiao2 = Math.Round(yingnashuie2 * new decimal(0.1) - 250, 2);
			var yingjiao2 = Math.Round(yingnashuie2 * new decimal(0.1) - 0, 2);
			if (yingjiao2 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao2;
			@@ -3554,7 +3604,7 @@
			}
			if (yingnashuie3 > 0)
			{
			var yingjiao3 = Math.Round(yingnashuie3 * new decimal(0.2) - 1250, 2);
			var yingjiao3 = Math.Round(yingnashuie3 * new decimal(0.2) - 0, 2);
			if (yingjiao3 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao3;
			@@ -3562,7 +3612,7 @@
			}
			if (yingnashuie4 > 0)
			{
			var yingjiao4 = Math.Round(yingnashuie4 * new decimal(0.3) - 4250, 2);
			var yingjiao4 = Math.Round(yingnashuie4 * new decimal(0.25) - 0, 2);
			if (yingjiao4 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao4;
			@@ -3570,14 +3620,28 @@
			}
			if (yingnashuie5 > 0)
			{
			var yingjiao5 = Math.Round(yingnashuie5 * new decimal(0.35) - 6750, 2);
			var yingjiao5 = Math.Round(yingnashuie5 * new decimal(0.30) - 0, 2);
			if (yingjiao5 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao5;
			}
			}


			if (yingnashuie6 > 0)
			{
			var yingjiao6 = Math.Round(yingnashuie6 * new decimal(0.35) - 0, 2);
			if (yingjiao6 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao6;
			}
			}
			if (yingnashuie7 > 0)
			{
			var yingjiao7 = Math.Round(yingnashuie7 * new decimal(0.45) - 0, 2);
			if (yingjiao7 > 0)
			{
			hrSalaryDTO.Geshui += yingjiao7;
			}
			}

			}
			decimal geshui = hrSalaryDTO.Geshui.HasValue ? hrSalaryDTO.Geshui.Value : 0;
			@@ -3597,11 +3661,56 @@
			hrSalaryDTO.Yufagongziheji = hrSalaryDTOlast.Yufagongziheji;
			}

			hrSalaryDTO.Yufagongziheji += (hrSalaryDTO.Daozhanggongzi- hrSalaryDTO.Yufagongzi);
			if (hrSalaryDTO.Daozhanggongzi < hrSalaryDTO.Yufagongzi)
			if (hrSalaryDTO.Yufagongziheji > 0)
			{
			hrSalaryDTO.Daozhanggongzi = hrSalaryDTO.Yufagongzi;
			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";