增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -201,13 +201,13 @@
            xiangmuDTO.gongzuo = "采购项目录入";
            //本月数量
            var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
            var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);
           // var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, dateminkaoqin, datemaxkaoqin);

            xiangmuDTO.benyueshuliang = (projectDTOsyue.Count+ zhengfuprojectDTOsyue .Count).ToString();
            xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
            //本日数量
            var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
           // var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();

            var jijianixiangmu = fiPiecerateDTOs.Where(x =>   x.Project == "采购项目录入").FirstOrDefault();

@@ -224,7 +224,7 @@
                        xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {
                            decimal youxiaojijian = projectDTOsri.Count+ zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            if (youxiaojijian > 0)
                            {
                                xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -247,7 +247,7 @@
                    }
                }
            }
            if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 || zhengfuprojectDTOsri.Count > 0)
            if(projectDTOsyue.Count > 0 || projectDTOsri.Count > 0 )
                tuiguangDTOs.Add(xiangmuDTO);
            #endregion

@@ -2030,12 +2030,12 @@
                    xiangmuDTO.gongzuo = "采购项目录入";
                    //本月数量
                    var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
                    xiangmuDTO.benyueshuliang = (projectDTOsyue.Count + zhengfuprojectDTOsyue.Count).ToString();
                    //var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(Userid, dateminkaoqin, datemaxkaoqin);
                    xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
                    //本日数量
                    var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    xiangmuDTO.benrishuliang = (projectDTOsri.Count+ zhengfuprojectDTOsri.Count).ToString();
                    //var zhengfuprojectDTOsri = zhengfuprojectDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    xiangmuDTO.benrishuliang = projectDTOsri.Count.ToString();

                    var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "采购项目录入").FirstOrDefault();

@@ -2052,7 +2052,7 @@
                                xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = projectDTOsri.Count + zhengfuprojectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    decimal youxiaojijian = projectDTOsri.Count  - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");