投诉处理，爬

username@email.com

17 小时以前 d4431c7e89865a506af8662244004d0baa7ed609

 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs

@@ -1874,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 * zhuanzhengchuqinlv - hrSalaryDTO.Baomifei.Value - hrSalaryDTO.Jibengongzi.Value) , 2);

                  

@@ -2245,8 +2251,8 @@
                    #region 采购项目录入

                    var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(userList[i].Id, dateminkaoqin, datemaxkaoqin);
                    if ((projectDTOsyue!=null && projectDTOsyue.Count > 0 ) || (zhengfuprojectDTOsyue != null && zhengfuprojectDTOsyue.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)
@@ -2266,10 +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();
                                               // var zhengfuprojectDTOri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= kaishijisuan && x.Createtime < kaishijisuan.AddDays(1)).ToList();
                                                if (jixiaotichengfangan.Tichengstandard == "01")
                                                {
                                                    decimal youxiaojijian = projectDTOri.Count + zhengfuprojectDTOri.Count - renwujishu;
                                                    decimal youxiaojijian = projectDTOri.Count  - renwujishu;//+ zhengfuprojectDTOri.Count
                                                    if (youxiaojijian > 0)
                                                    {
                                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -2301,7 +2307,7 @@
                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
                                    if (jixiaotichengfangan.Tichengstandard == "01")
                                    {
                                        decimal youxiaojijian = projectDTOsyue.Count + zhengfuprojectDTOsyue.Count - renwujishu;
                                        decimal youxiaojijian = projectDTOsyue.Count  - renwujishu;//+ zhengfuprojectDTOsyue.Count
                                        if (youxiaojijian > 0)
                                        {
                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);