zhengcaioa.git - Gitblit

			@@ -627,7 +627,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").ToList();
			foreach (var admAskLeave in feichuqinjia)
			{

			@@ -1020,7 +1020,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").ToList();
			foreach (var admAskLeave in feichuqinjia)
			{

			@@ -3515,11 +3515,11 @@
			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;
			}
			@@ -3529,7 +3529,7 @@



			yingnashuie = jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou + ( (dianhuabutie - dianhuafei)<=0? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan - peichang + jiucuo - geshuiqizheng;
			yingnashuie = jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou + ( (dianhuabutie - dianhuafei)<=0? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan + peichang + jiucuo - geshuiqizheng;


			hrSalaryDTO.Geshui = 0;
			@@ -3653,7 +3653,7 @@
			}
			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 += jibengongzi + baomifei + gongzuobutie + jiabangongzi + shebao + quanqinjiang + jiaotngbutie + jixiaoticheng + jiangjin + bufagongzi - shebaokou - geshui + ((dianhuabutie - dianhuafei) <= 0 ? (dianhuabutie - dianhuafei) : 0) - queqin - fakuan + peichang + jiucuo;

			@@ -84,7 +84,7 @@
			<div class="clearfix layer-area" style="padding-bottom:15px;">
			<label class="text-right col-sm-3 col-md-3 control-label">赔偿</label>
			<div class="col-sm-9 col-md-9">
			<input class="form-control" id="Peichang" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)">
			<input class="form-control" id="Peichang" name="Peichang" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.Peichang" oninput="if(value.length>10)value=value.slice(0,10)" onkeyup="CheckNum(this);">
			</div>
			</div>
			<div class="clearfix layer-area" style="padding-bottom:15px;">

	zhengcaioa/DTO/HrSalaryDTO.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs	14 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	zhengcaioa/zhengcaioa/Views/SalaryCheck/Edit.cshtml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

			@@ -59,7 +59,7 @@
			dianhuafei = (Dianhuafei ?? 0) - (Dianhuabutie ?? 0) ;
			}

			return (Shebaokou ?? 0) + (Geshui ?? 0) + dianhuafei + (Queqin ?? 0) + (Fakuan ?? 0) + (Peichang ?? 0)+ (Jiucuo ?? 0);
			return (Shebaokou ?? 0) + (Geshui ?? 0) + dianhuafei + (Queqin ?? 0) + (Fakuan ?? 0) - (Peichang ?? 0)- (Jiucuo ?? 0);
			}
			}