试用期工资计算

username@email.com

2023-12-11 72e4a4d81cb1b9776ffb7287e0c5ed67592eda8b

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -139,14 +139,13 @@
                            jisuangonglinggongzi();
                        }


                        _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无");
                        this.ywjlguiling();
                        _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无执行结束");

                        _logger.LogInformation("把会员系统和oa系统手机号相同的客户关联起来");
                        this.huiyuanguanlian();
                        _logger.LogInformation("把会员系统和oa系统手机号相同的客户关联起来执行结束");

                        _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无");
                        this.ywjlguiling();
                        _logger.LogInformation("把超过90天还没有转化的档案客户的业务经理归为无执行结束"); 
                    }
                    catch (Exception ex)
                    {
@@ -329,6 +328,18 @@
                        if (frameworkUser != null)
                        {
                            cooperatecustomCustomer.HuiyuanId = frameworkUser.Id.ToString();
                            //2023-03-23 添加在职企业
                            var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == cooperatecustomCustomer.HuiyuanId && x.Customerid == cooperatecustomCustomer.Id).FirstOrDefault();
                            if (customerGuanlianhuiyuan1 == null)
                            {
                                CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan();
                                customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString();
                                customerGuanlianhuiyuan.Huiyuanid = cooperatecustomCustomer.HuiyuanId;
                                customerGuanlianhuiyuan.Customerid = cooperatecustomCustomer.Id;
                                customerGuanlianhuiyuan.Customertype = "合作客户";
                                _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan);
                            }

                        }
                    }

@@ -349,6 +360,17 @@
                        if (frameworkUser != null)
                        {
                            intentionCustomer.HuiyuanId = frameworkUser.Id.ToString();
                            //2023-03-23 添加在职企业
                            var customerGuanlianhuiyuan1 = _context.CustomerGuanlianhuiyuans.Where(x => x.Huiyuanid == intentionCustomer.HuiyuanId && x.Customerid == intentionCustomer.Id).FirstOrDefault();
                            if (customerGuanlianhuiyuan1 == null)
                            {
                                CustomerGuanlianhuiyuan customerGuanlianhuiyuan = new CustomerGuanlianhuiyuan();
                                customerGuanlianhuiyuan.Id = Guid.NewGuid().ToString();
                                customerGuanlianhuiyuan.Huiyuanid = intentionCustomer.HuiyuanId;
                                customerGuanlianhuiyuan.Customerid = intentionCustomer.Id;
                                customerGuanlianhuiyuan.Customertype = "档案客户";
                                _context.CustomerGuanlianhuiyuans.Add(customerGuanlianhuiyuan);
                            }      
                        }
                    }

@@ -1776,7 +1798,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);



@@ -1852,9 +1874,15 @@
                     
                    }

                    if(shiyongqichuqinlv>0 ||  hrSalaryDTO.Gongzuobutie != new decimal(0))
                    {
                        hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv ), 2);
                    }
                    else
                    {
                        hrSalaryDTO.Gongzuobutie += Math.Round((BasicPrice * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value), 2);
                    }


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

                  

@@ -2223,7 +2251,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 +2272,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 +2307,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);