zhengcaioa.git - Gitblit

			@@ -1776,7 +1776,7 @@



			hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) * shiyongqichuqinlv, 2);
			hrSalaryDTO.Gongzuobutie += Math.Round( (ShiyongPrice * shiyongqichuqinlv - hrSalaryDTO.Baomifei.Value- hrSalaryDTO.Jibengongzi.Value ) , 2);



			@@ -1854,7 +1854,7 @@



			hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) * zhuanzhengchuqinlv, 2);
			hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);



			@@ -2223,7 +2223,8 @@
			#region 采购项目录入

			var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
			if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
			var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
			if ((projectDTOsyue!=null && projectDTOsyue.Count > 0 ) \|\| (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.Count > 0))
			{
			var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "采购项目录入").FirstOrDefault();
			if (jijianidddd != null)
			@@ -2243,9 +2244,10 @@
			if (gongzuoshijian)
			{
			var projectDTOri = projectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList(); //_projectService.GetcaigougonggaoListsalary(userList[i].Id, kaishijisuan, kaishijisuan.AddDays(1));
			var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
			if (jixiaotichengfangan.Tichengstandard == "01")
			{
			decimal youxiaojijian = projectDTOri.Count - renwujishu;
			decimal youxiaojijian = projectDTOri.Count + zhengfuprojectDTOri.Count - renwujishu;
			if (youxiaojijian > 0)
			{
			hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
			@@ -2277,7 +2279,7 @@
			decimal renwujishu = jixiaotichengfangan.Renwu.Value;
			if (jixiaotichengfangan.Tichengstandard == "01")
			{
			decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
			decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
			if (youxiaojijian > 0)
			{
			hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);