提交

username@email.com

2021-10-31 94b1c11bf1be4bd293a1b641411dc3a106eda584

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -764,10 +764,10 @@
                                {
                                    jiabanshijian = admAskovertimeDTO.Overtime.Value;
                                }




                                if (jiabanshijian > new decimal(shangbanshijian) / 60)
                                {
                                    jiabanshijian = new decimal(shangbanshijian) /60;
                                }
                                Jiaban += Math.Round(jiabanshijian * 60 / shangbanshijian, 2);
                            }
                            
@@ -1161,10 +1161,10 @@
                                {
                                    jiabanshijian = admAskovertimeDTO.Overtime.Value;
                                }




                                if (jiabanshijian > new decimal(shangbanshijian) / 60)
                                {
                                    jiabanshijian = new decimal(shangbanshijian) / 60;
                                }
                                Jiaban += Math.Round(jiabanshijian * 60 / shangbanshijian, 2);
                            }
                        }
@@ -1354,12 +1354,19 @@
                //查询当前员工职务的基本工资配置

               var hrJibengongzi = hrJibengongziDTOs.Where(x=>x.PostId == userList[i].HrPosition ).OrderByDescending(x=>x.Effecttime).FirstOrDefault();

               
                if (hrJibengongzi == null)
                {
                    _logger.LogInformation(userList[i].UserName + ": 职务所属资本工资为空");
                    continue;
                }
                var shebaoDTO = _JibengongziService.GetListShebao().FirstOrDefault();
                if (shebaoDTO == null)
                {
                    _logger.LogInformation(userList[i].UserName + ": 社保维护为空");
                    continue;
                }
             
                hrSalaryDTO.Jibengongzi = Math.Round( hrJibengongzi.Jibengongzi.Value * chuqinlv, 2);
                hrSalaryDTO.Baomifei = Math.Round(hrJibengongzi.Baomifei.Value * chuqinlv, 2);
                //是否在试用期
@@ -1368,8 +1375,8 @@
                {
                    geshuiqizheng = userList[i].geshuiqizheng.Value;
                }
                var Shebaodanwei = hrJibengongzi.Shebaodanwei.HasValue ? hrJibengongzi.Shebaodanwei.Value : 0;
                var Shebaogeren = hrJibengongzi.Shebaogeren.HasValue ? hrJibengongzi.Shebaogeren.Value : 0;
                var Shebaodanwei = shebaoDTO.Shebaodanwei.HasValue ? shebaoDTO.Shebaodanwei.Value : 0;
                var Shebaogeren = shebaoDTO.Shebaogeren.HasValue ? shebaoDTO.Shebaogeren.Value : 0;
                decimal yingnashuie = 0;
                hrSalaryDTO.Queqin = 0;
                hrSalaryDTO.Fakuan = 0;
@@ -1453,7 +1460,7 @@



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



@@ -1527,7 +1534,7 @@

                  

                    //yingnashuie = BasicPrice - Shebaogeren - geshuiqizheng;
                   

                    
                }