| zhengcaioa/DTO/HrJibengongziDTO.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/Model/HrJibengongzi.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/Model/zhengcaioaContext.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/Services/CooperatecustomCustomerService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/Services/HrJibengongziService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/Services/IntentionCustomerService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/zhengcaioa/Views/HrJibengongzi/Edit.cshtml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
zhengcaioa/DTO/HrJibengongziDTO.cs
@@ -32,6 +32,10 @@ public DateTime? Effecttime { get; set; } public string EffecttimeName { get; set; } public decimal? Jiabangongzi { get; set; } public string JiabangongziName { get; set; } } public class HrJibengongziDTOSearch : SearchEntity zhengcaioa/Model/HrJibengongzi.cs
@@ -22,5 +22,7 @@ public DateTime Createtime { get; set; } public string Modifier { get; set; } public DateTime Modifytime { get; set; } public decimal? Jiabangongzi { get; set; } } } zhengcaioa/Model/zhengcaioaContext.cs
@@ -3746,6 +3746,10 @@ .HasColumnType("money") .HasColumnName("jibengongzi"); entity.Property(e => e.Jiabangongzi) .HasColumnType("money") .HasColumnName("jiabangongzi"); entity.Property(e => e.Modifier) .IsRequired() .HasMaxLength(50) zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -60,7 +60,7 @@ cooperatecustomCustomer.Ywjltime = DateTime.Now; var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == cooperatecustomCustomer.Ywjl); if (Cooper + Inten >= 2000) if (Cooper + Inten > 2000) { resultEntity.Result = false; resultEntity.Message = "该业务经理，客户单位和合作客户合计超过2000！"; zhengcaioa/Services/HrJibengongziService.cs
@@ -44,7 +44,7 @@ updatepltRole.Shebaogeren = model.Shebaogeren; updatepltRole.Quanqingjiang = model.Quanqingjiang; updatepltRole.Dianhuabutie = model.Dianhuabutie; updatepltRole.Jiabangongzi = model.Jiabangongzi; updatepltRole.Jiaotongbutie = model.Jiaotongbutie; @@ -130,7 +130,7 @@ Dianhuabutie = a.Dianhuabutie, Quanqingjiang = a.Quanqingjiang, Jiaotongbutie = a.Jiaotongbutie, Jiabangongzi = a.Jiabangongzi, JibengongziName = a.Jibengongzi.HasValue? a.Jibengongzi.Value.ToString("F2"):"", BaomifeiName = a.Baomifei.HasValue ? a.Baomifei.Value.ToString("F2") : "", ShebaodanweiName = a.Shebaodanwei.HasValue ? a.Shebaodanwei.Value.ToString("F2") : "", @@ -140,7 +140,7 @@ JiaotongbutieName = a.Jiaotongbutie.HasValue ? a.Jiaotongbutie.Value.ToString("F2") : "", Effecttime = a.Effecttime, EffecttimeName = a.Effecttime.HasValue ? a.Effecttime.Value.ToString("yyyy-MM-dd") : "", JiabangongziName = a.Jiabangongzi.HasValue ? a.Jiabangongzi.Value.ToString("F2") : "",
@@ -54,7 +54,7 @@ intentionCustomer.Ywjltime = DateTime.Now; var Cooper = _context.CooperatecustomCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl); var Inten = _context.IntentionCustomers.Count(x => x.RecStatus == "A" && x.Ywjl == intentionCustomer.Ywjl); if(Cooper+ Inten >= 2000) if(Cooper+ Inten > 2000) { resultEntity.Result = false; resultEntity.Message = "该业务经理，客户单位和合作客户合计超过2000！"; zhengcaioa/zhengcaioa/Controllers/HR/HrJibengongziController.cs
@@ -108,7 +108,7 @@ dto.QuanqingjiangName = dto.Quanqingjiang.HasValue ? dto.Quanqingjiang.Value.ToString("F2") : ""; dto.JiaotongbutieName = dto.Jiaotongbutie.HasValue ? dto.Jiaotongbutie.Value.ToString("F2") : ""; dto.EffecttimeName = dto.Effecttime.HasValue ? dto.Effecttime.Value.ToString("yyyy-MM-dd") : DateTime.Now.ToString("yyyy-MM-dd"); dto.JiabangongziName = dto.Jiabangongzi.HasValue ? dto.Jiabangongzi.Value.ToString("F2") : "";
@@ -725,10 +725,10 @@ tuiguangDTOs.Add(qunzutuiguangDTO); #endregion #region 朋友圈原创 #region 朋友圈转发 TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO(); pengyouquanDTO.gongzuo = "朋友圈原创"; var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈原创").FirstOrDefault(); pengyouquanDTO.gongzuo = "朋友圈转发"; var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈转发").FirstOrDefault(); if (jijianipengyouquan != null) { @@ -779,10 +779,10 @@ tuiguangDTOs.Add(pengyouquanDTO); #endregion #region 论坛发帖 #region 论坛推广 TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO(); luntanfatieDTO.gongzuo = "论坛发帖"; var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛发帖").FirstOrDefault(); luntanfatieDTO.gongzuo = "论坛推广"; var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛推广").FirstOrDefault(); if (jijianiluntanfatie != null) { @@ -833,10 +833,10 @@ tuiguangDTOs.Add(luntanfatieDTO); #endregion #region 跟帖评论 #region 贴吧推广 TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO(); gentiepinglunDTO.gongzuo = "跟帖评论"; var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "跟帖评论").FirstOrDefault(); gentiepinglunDTO.gongzuo = "贴吧推广"; var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "贴吧推广").FirstOrDefault(); if (jijianigentiepinglun != null) { @@ -1259,10 +1259,10 @@ baifangkehuDTOs.Add(shangmenbanfangDTO); #endregion #region 接待来访客户 #region 录入客户咨询 TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO(); jiedailaifangDTO.gongzuo = "接待来访客户"; var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "接待来访客户").FirstOrDefault(); jiedailaifangDTO.gongzuo = "录入客户咨询"; var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "录入客户咨询").FirstOrDefault(); if (jijianijiedailaifang != null) { @@ -1523,10 +1523,10 @@ ziliaoweihuDTOs.Add(zhengcaizhishiDTO); #endregion #region 新增公众号关注 #region 微信微博公众号新增粉丝 TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO(); gongzhonghaoDTO.gongzuo = "新增公众号关注"; var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "新增公众号关注").FirstOrDefault(); gongzhonghaoDTO.gongzuo = "微信微博公众号新增粉丝"; var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "微信微博公众号新增粉丝").FirstOrDefault(); if (jijianigongzhonghao != null) { @@ -2538,10 +2538,10 @@ tuiguangDTOs.Add(qunzutuiguangDTO); #endregion #region 朋友圈原创 #region 朋友圈转发 TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO(); pengyouquanDTO.gongzuo = "朋友圈原创"; var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈原创").FirstOrDefault(); pengyouquanDTO.gongzuo = "朋友圈转发"; var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈转发").FirstOrDefault(); if (jijianipengyouquan != null) { @@ -2592,10 +2592,10 @@ tuiguangDTOs.Add(pengyouquanDTO); #endregion #region 论坛发帖 #region 论坛推广 TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO(); luntanfatieDTO.gongzuo = "论坛发帖"; var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛发帖").FirstOrDefault(); luntanfatieDTO.gongzuo = "论坛推广"; var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛推广").FirstOrDefault(); if (jijianiluntanfatie != null) { @@ -2646,10 +2646,10 @@ tuiguangDTOs.Add(luntanfatieDTO); #endregion #region 跟帖评论 #region 贴吧推广 TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO(); gentiepinglunDTO.gongzuo = "跟帖评论"; var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "跟帖评论").FirstOrDefault(); gentiepinglunDTO.gongzuo = "贴吧推广"; var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "贴吧推广").FirstOrDefault(); if (jijianigentiepinglun != null) { @@ -3067,10 +3067,10 @@ baifangkehuDTOs.Add(shangmenbanfangDTO); #endregion #region 接待来访客户 #region 录入客户咨询 TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO(); jiedailaifangDTO.gongzuo = "接待来访客户"; var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "接待来访客户").FirstOrDefault(); jiedailaifangDTO.gongzuo = "录入客户咨询"; var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "录入客户咨询").FirstOrDefault(); if (jijianijiedailaifang != null) { @@ -3331,10 +3331,10 @@ ziliaoweihuDTOs.Add(zhengcaizhishiDTO); #endregion #region 新增公众号关注 #region 微信微博公众号新增粉丝 TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO(); gongzhonghaoDTO.gongzuo = "新增公众号关注"; var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "新增公众号关注").FirstOrDefault(); gongzhonghaoDTO.gongzuo = "微信微博公众号新增粉丝"; var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "微信微博公众号新增粉丝").FirstOrDefault(); if (jijianigongzhonghao != null) { zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -1675,7 +1675,12 @@ 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); @@ -1753,7 +1758,11 @@ 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); } }
@@ -144,7 +144,11 @@ </div> <label grouptype="Vdata" class="text-right col-sm-1 col-md-1 control-label">加班工资（元/天）<i class="red">*</i></label> <div class="col-sm-2 col-md-2" grouptype="Vdata"> <input class="form-control" label="加班工资（元/天）" name="Jiabangongzi" id="Jiabangongzi" labtype="txt" addvisible="true" editvisible="true" reg="" ismust="true" type="text" value="@Model.JiabangongziName" oninput="if(value.length>8)value=value.slice(0,18)" onkeyup="value=value.toString().match(/^\d+(?:\.\d{0,2})?/)"> </div> </div> @@ -363,6 +367,11 @@ return; } if ($("#Jiabangongzi").val() == '') { toastr.warning("加班工资不能为空"); return; } //if ($("#Shebaodanwei").val() == '') { // toastr.warning("社保公司不能为空"); // return; zhengcaioa/zhengcaioa/Views/HrJibengongzi/Index.cshtml
@@ -32,6 +32,9 @@ { label: '全勤奖', name: 'QuanqingjiangName', labtype: 'txt', hidden: false, width: 100 }, { label: '交通补贴', name: 'JiaotongbutieName', labtype: 'txt', hidden: false, width: 100 }, { label: '加班工资', name: 'JiabangongziName', labtype: 'txt', hidden: false, width: 100 }, { label: '生效日期', name: 'EffecttimeName', labtype: 'txt', hidden: false, width: 100 }, ]; dataUrl = "/HrJibengongzi/GetList";
