政采招标oa系统
blame | 历史 | 补丁 | 提交 | 提交对比 | show whitespace
username@email.com
2024-07-08 3cf9d2b6664bf83216c25d33f3f2890de6f25443 
 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs


@@ -2251,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)


@@ -2272,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);


@@ -2307,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);