增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -201,9 +201,12 @@
            xiangmuDTO.gongzuo = "采购项目录入";
            //本月数量
            var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
           // var zhengfuprojectDTOsyue = _projectService.GetListsalaryzhengfu(curentuser.Id, 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.ToString();

            var jijianixiangmu = fiPiecerateDTOs.Where(x =>   x.Project == "采购项目录入").FirstOrDefault();
@@ -773,6 +776,12 @@

                        //}
                    }
                    else if (jixiaotichengfangan.Renwustandard == "05")
                    {
                        //本月规定
                        pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");

                    }
                }
            }
            if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
@@ -1252,6 +1261,12 @@
                        //    }

                        //}
                    }
                    else if (jixiaotichengfangan.Renwustandard == "05")
                    {
                        //本月规定
                        shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        
                    }
                }
            }
@@ -2015,9 +2030,11 @@
                    xiangmuDTO.gongzuo = "采购项目录入";
                    //本月数量
                    var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    //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.ToString();

                    var jijianixiangmu = fiPiecerateDTOs.Where(x => x.Project == "采购项目录入").FirstOrDefault();
@@ -2035,7 +2052,7 @@
                                xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = projectDTOsri.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.##");
@@ -2297,7 +2314,7 @@
                                weixnDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsyue.Count - jixiaotichengfangan.Renwu.Value;
                                    decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        weixnDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
@@ -2585,6 +2602,12 @@
                                //    }

                                //}
                            }
                            else if (jixiaotichengfangan.Renwustandard == "05")
                            {
                                //本月规定
                                pengyouquanDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");

                            }
                        }
                    }
@@ -3061,6 +3084,12 @@

                                //}
                            }
                            else if (jixiaotichengfangan.Renwustandard == "05")
                            {
                                //本月规定
                                shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");

                            }
                        }
                    }
                    if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)