增加制单人查询条件

username@email.com

2023-07-10 050d8fde17d71d0e5d3353984a55838903abbe36

 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs

@@ -57,7 +57,10 @@
        private readonly ILiaotianService _liaotianService;
        private readonly IConfiguration _configuration;
        private readonly IHttpClientFactory _clientFactory;

        private readonly IHrPositionService _hrPositionService;
        private readonly IHrDeptService _hrDeptService;
        private readonly IAdmSigninService _admSigninService;
        private readonly IExpertService _expertService;

        public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
            , IAdmAttendanceRuleService attendanceRuleService
@@ -82,9 +85,14 @@
            , IDtChannelArticleNewsService dtChannelArticleNewsService
            , IProjectService projectService
            , ICusFangwenjiluService cusFangwenjiluService
            ,ILiaotianService liaotianService
              , IConfiguration configuration
            , IHttpClientFactory clientFactory)
            , ILiaotianService liaotianService
            , IConfiguration configuration
            , IHttpClientFactory clientFactory
            , IHrPositionService hrPositionService
            , IHrDeptService hrDeptService
            , IAdmSigninService admSigninService
            , IExpertService expertService
            )
        {
            _logger = logger;
            _attendanceRuleService = attendanceRuleService;
@@ -112,6 +120,10 @@
            _liaotianService = liaotianService;
            _configuration = configuration;
            _clientFactory = clientFactory;
            _hrPositionService = hrPositionService;
            _hrDeptService = hrDeptService;
            _admSigninService = admSigninService;
            _expertService = expertService;
        }

        public async Task<IActionResult> IndexAsync(string Tongjitime="")
@@ -189,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();
@@ -236,6 +251,59 @@
                tuiguangDTOs.Add(xiangmuDTO);
            #endregion



            #region 采购公告录入 
            TongjiBaoBiaoDTO caigougonggaoDTO = new TongjiBaoBiaoDTO();
            caigougonggaoDTO.gongzuo = "采购公告录入";
            //本月数量
            var caigougonggaoDTOsyue = _projectService.GetcaigougonggaoListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
            caigougonggaoDTO.benyueshuliang = caigougonggaoDTOsyue.Count.ToString();
            //本日数量
            var caigougonggaoDTOsri = caigougonggaoDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            caigougonggaoDTO.benrishuliang = caigougonggaoDTOsri.Count.ToString();

            var jijianicaigougonggao = fiPiecerateDTOs.Where(x => x.Project == "采购公告录入").FirstOrDefault();

            if (jijianicaigougonggao != null)
            {
                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianicaigougonggao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                {
                    if (jixiaotichengfangan.Renwustandard == "01")
                    {
                        //本月规定
                        caigougonggaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        //本日规定
                        caigougonggaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {
                            decimal youxiaojijian = caigougonggaoDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            if (youxiaojijian > 0)
                            {
                                caigougonggaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                            }
                        }
                    }
                    else if (jixiaotichengfangan.Renwustandard == "02")
                    {
                        //本月规定
                        caigougonggaoDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                        //if (jixiaotichengfangan.Tichengstandard == "01")
                        //{
                        //    decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
                        //    if (youxiaojijian > 0)
                        //    {
                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                        //    }

                        //}
                    }
                }
            }
            if (caigougonggaoDTOsyue.Count > 0 || caigougonggaoDTOsri.Count > 0)
                tuiguangDTOs.Add(caigougonggaoDTO);
            #endregion

            #region 客户资料录入
            TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
@@ -660,10 +728,10 @@
                tuiguangDTOs.Add(qunzutuiguangDTO);
            #endregion

            #region 朋友圈原创
            #region 朋友圈转发
            TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
            pengyouquanDTO.gongzuo = "朋友圈原创";
            var jijianipengyouquan = fiPiecerateDTOs.Where(x =>   x.Project == "朋友圈原创").FirstOrDefault();
            pengyouquanDTO.gongzuo = "朋友圈转发";
            var jijianipengyouquan = fiPiecerateDTOs.Where(x =>   x.Project == "朋友圈转发").FirstOrDefault();

            if (jijianipengyouquan != null)
            {
@@ -708,16 +776,22 @@

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

                    }
                }
            }
            if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
                tuiguangDTOs.Add(pengyouquanDTO);
            #endregion

            #region 论坛发帖
            #region 论坛推广
            TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
            luntanfatieDTO.gongzuo = "论坛发帖";
            var jijianiluntanfatie = fiPiecerateDTOs.Where(x =>   x.Project == "论坛发帖").FirstOrDefault();
            luntanfatieDTO.gongzuo = "论坛推广";
            var jijianiluntanfatie = fiPiecerateDTOs.Where(x =>   x.Project == "论坛推广").FirstOrDefault();

            if (jijianiluntanfatie != null)
            {
@@ -768,10 +842,10 @@
                tuiguangDTOs.Add(luntanfatieDTO);
            #endregion

            #region 跟帖评论
            #region 贴吧推广
            TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
            gentiepinglunDTO.gongzuo = "跟帖评论";
            var jijianigentiepinglun = fiPiecerateDTOs.Where(x =>   x.Project == "跟帖评论").FirstOrDefault();
            gentiepinglunDTO.gongzuo = "贴吧推广";
            var jijianigentiepinglun = fiPiecerateDTOs.Where(x =>   x.Project == "贴吧推广").FirstOrDefault();

            if (jijianigentiepinglun != null)
            {
@@ -935,8 +1009,8 @@

            if (jijianizhucehuiyuan != null)
            {
                //本月数量
                List<YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
             //本月数量
             List <YaoQingYongHuDTO> zhucehuiyuansyue = new List<YaoQingYongHuDTO>();
                try
                {
                    //var pltUserDTO = _userService.GetPltUserEntity(curentuser.Id);
@@ -978,7 +1052,7 @@
                }
                catch (Exception ex)
                {

                    zhucehuiyuanDTO.benyueshuliang = "0";
                }
                //var zhucehuiyuansyue = _admPieceCheckService.GetList(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();

@@ -1085,6 +1159,59 @@
            #endregion


            #region 专家录入
            TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
            zhuanjialuruDTO.gongzuo = "专家录入";
            //本月数量
            var zhuanjialuruDTOsyue = _expertService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
            zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
            //本日数量
            var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();

            var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "专家录入").FirstOrDefault();

            if (jijianizhuanjialuru != null)
            {
                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                {
                    if (jixiaotichengfangan.Renwustandard == "01")
                    {

                        zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                        if (jixiaotichengfangan.Tichengstandard == "01")
                        {
                            decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                            if (youxiaojijian > 0)
                            {
                                zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                            }

                        }

                    }
                    else if (jixiaotichengfangan.Renwustandard == "02")
                    {
                        zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                        //if (jixiaotichengfangan.Tichengstandard == "01")
                        //{
                        //    decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
                        //    if (youxiaojijian > 0)
                        //    {
                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                        //    }

                        //}
                    }
                }
            }
            if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
                tuiguangDTOs.Add(zhuanjialuruDTO);
            #endregion


            List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();

            #region 上门拜访客户
@@ -1135,16 +1262,22 @@

                        //}
                    }
                    else if (jixiaotichengfangan.Renwustandard == "05")
                    {
                        //本月规定
                        shangmenbanfangDTO.benyueqingkuang = (4 * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                        
                    }
                }
            }
            if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
                baifangkehuDTOs.Add(shangmenbanfangDTO);
            #endregion

            #region 接待来访客户
            #region 录入客户咨询
            TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
            jiedailaifangDTO.gongzuo = "接待来访客户";
            var jijianijiedailaifang = fiPiecerateDTOs.Where(x =>   x.Project == "接待来访客户").FirstOrDefault();
            jiedailaifangDTO.gongzuo = "录入客户咨询";
            var jijianijiedailaifang = fiPiecerateDTOs.Where(x =>   x.Project == "录入客户咨询").FirstOrDefault();

            if (jijianijiedailaifang != null)
            {
@@ -1205,7 +1338,7 @@
            var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;

            //本日数量
            var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
            var dingdanDTOsri = dingdanDTOsyue.Where(x =>( x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1)) ).ToList();
            foreach (var cooperOrderDTO in dingdanDTOsri)
            {
                TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -1405,10 +1538,10 @@
                ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
            #endregion

            #region 新增公众号关注
            #region 微信微博公众号新增粉丝
            TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
            gongzhonghaoDTO.gongzuo = "新增公众号关注";
            var jijianigongzhonghao = fiPiecerateDTOs.Where(x =>  x.Project == "新增公众号关注").FirstOrDefault();
            gongzhonghaoDTO.gongzuo = "微信微博公众号新增粉丝";
            var jijianigongzhonghao = fiPiecerateDTOs.Where(x =>  x.Project == "微信微博公众号新增粉丝").FirstOrDefault();

            if (jijianigongzhonghao != null)
            {
@@ -1802,7 +1935,7 @@
            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
            ViewData["curentuser"] = curentuser;

            DateTime chauxnshijian = DateTime.Now;
            DateTime chauxnshijian = DateTime.Now.Date;
            if (!string.IsNullOrEmpty(Tongjitime))
            {
                DateTime.TryParse(Tongjitime, out chauxnshijian);
@@ -1812,12 +1945,12 @@
            string[] Userids = null;
            if (!string.IsNullOrEmpty(userid) && userid!= "null")
            {
                Userids = userid.Split(','); ;
                Userids = userDTOs.Where(x=> userid.Split(',').Contains(x.Id)).OrderBy(x => x.DeptId).ThenBy(x => x.HrPosition).Select(x => x.Id).ToArray();

            }
            else
            {
                Userids = userDTOs.OrderBy(x => x.UserSn).Select(x => x.Id).ToArray();
                Userids = userDTOs.OrderBy(x => x.DeptId).ThenBy(x=>x.HrPosition).Select(x => x.Id).ToArray();
            }

            List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = new List<TongjibaobiaobaobiaoDTO>();
@@ -1882,6 +2015,11 @@
                    var userDTO = userDTOs.Where(x=>x.Id == Userid).FirstOrDefault();
                    string position = userDTO.HrPosition;

                   var hrPositionDTO = _hrPositionService.Get(userDTO.HrPosition);

                    var deptDTO = _hrDeptService.Get(userDTO.DeptId);
                   var admSignInDTO = _admSigninService.GetByUserAndDate(Userid, chauxnshijian);

                    var hrJixiaotichengThis = hrJixiaotichengDTOs.Where(x => x.PostId == position).ToList();


@@ -1892,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();
@@ -1912,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.##");
@@ -1939,6 +2079,58 @@
                        tuiguangDTOs.Add(xiangmuDTO);
                    #endregion


                    #region 采购公告录入 
                    TongjiBaoBiaoDTO caigougonggaoDTO = new TongjiBaoBiaoDTO();
                    caigougonggaoDTO.gongzuo = "采购公告录入";
                    //本月数量
                    var caigougonggaoDTOsyue = _projectService.GetcaigougonggaoListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    caigougonggaoDTO.benyueshuliang = caigougonggaoDTOsyue.Count.ToString();
                    //本日数量
                    var caigougonggaoDTOsri = caigougonggaoDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    caigougonggaoDTO.benrishuliang = caigougonggaoDTOsri.Count.ToString();

                    var jijianicaigougonggao = fiPiecerateDTOs.Where(x => x.Project == "采购公告录入").FirstOrDefault();

                    if (jijianicaigougonggao != null)
                    {
                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianicaigougonggao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                        {
                            if (jixiaotichengfangan.Renwustandard == "01")
                            {
                                //本月规定
                                caigougonggaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                                //本日规定
                                caigougonggaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = caigougonggaoDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        caigougonggaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                                    }
                                }
                            }
                            else if (jixiaotichengfangan.Renwustandard == "02")
                            {
                                //本月规定
                                caigougonggaoDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                                //if (jixiaotichengfangan.Tichengstandard == "01")
                                //{
                                //    decimal youxiaojijian = _intentionCustomerDTOs.Count + cooperatecustomCustomerDTOs.Count - renwujishu;
                                //    if (youxiaojijian > 0)
                                //    {
                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                                //    }

                                //}
                            }
                        }
                    }
                    if (caigougonggaoDTOsyue.Count > 0 || caigougonggaoDTOsri.Count > 0)
                        tuiguangDTOs.Add(caigougonggaoDTO);
                    #endregion

                    #region 客户资料录入
                    TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
@@ -2122,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.##");
@@ -2363,10 +2555,10 @@
                        tuiguangDTOs.Add(qunzutuiguangDTO);
                    #endregion

                    #region 朋友圈原创
                    #region 朋友圈转发
                    TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
                    pengyouquanDTO.gongzuo = "朋友圈原创";
                    var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈原创").FirstOrDefault();
                    pengyouquanDTO.gongzuo = "朋友圈转发";
                    var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "朋友圈转发").FirstOrDefault();

                    if (jijianipengyouquan != null)
                    {
@@ -2411,16 +2603,22 @@

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

                            }
                        }
                    }
                    if (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
                        tuiguangDTOs.Add(pengyouquanDTO);
                    #endregion

                    #region 论坛发帖
                    #region 论坛推广
                    TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
                    luntanfatieDTO.gongzuo = "论坛发帖";
                    var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛发帖").FirstOrDefault();
                    luntanfatieDTO.gongzuo = "论坛推广";
                    var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "论坛推广").FirstOrDefault();

                    if (jijianiluntanfatie != null)
                    {
@@ -2471,10 +2669,10 @@
                        tuiguangDTOs.Add(luntanfatieDTO);
                    #endregion

                    #region 跟帖评论
                    #region 贴吧推广
                    TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
                    gentiepinglunDTO.gongzuo = "跟帖评论";
                    var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "跟帖评论").FirstOrDefault();
                    gentiepinglunDTO.gongzuo = "贴吧推广";
                    var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "贴吧推广").FirstOrDefault();

                    if (jijianigentiepinglun != null)
                    {
@@ -2681,7 +2879,7 @@
                        }
                        catch (Exception ex)
                        {

                            zhucehuiyuanDTO.benyueshuliang = "0";
                        }


@@ -2783,6 +2981,59 @@
                    #endregion


                    #region 专家录入
                    TongjiBaoBiaoDTO zhuanjialuruDTO = new TongjiBaoBiaoDTO();
                    zhuanjialuruDTO.gongzuo = "专家录入";
                    //本月数量
                    var zhuanjialuruDTOsyue = _expertService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
                    zhuanjialuruDTO.benyueshuliang = zhuanjialuruDTOsyue.Count.ToString();
                    //本日数量
                    var zhuanjialuruDTOsri = zhuanjialuruDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    zhuanjialuruDTO.benrishuliang = zhuanjialuruDTOsri.Count.ToString();

                    var jijianizhuanjialuru = fiPiecerateDTOs.Where(x => x.Project == "专家录入").FirstOrDefault();

                    if (jijianizhuanjialuru != null)
                    {
                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanjialuru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                        {
                            if (jixiaotichengfangan.Renwustandard == "01")
                            {

                                zhuanjialuruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
                                zhuanjialuruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
                                if (jixiaotichengfangan.Tichengstandard == "01")
                                {
                                    decimal youxiaojijian = zhuanjialuruDTOsri.Count - jixiaotichengfangan.Renwu.Value;
                                    if (youxiaojijian > 0)
                                    {
                                        zhuanjialuruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
                                    }

                                }

                            }
                            else if (jixiaotichengfangan.Renwustandard == "02")
                            {
                                zhuanjialuruDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
                                //if (jixiaotichengfangan.Tichengstandard == "01")
                                //{
                                //    decimal youxiaojijian = intentionCustomerDTOs.Count - renwujishu;
                                //    if (youxiaojijian > 0)
                                //    {
                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
                                //    }

                                //}
                            }
                        }
                    }
                    if (zhuanjialuruDTOsyue.Count > 0 || zhuanjialuruDTOsri.Count > 0)
                        tuiguangDTOs.Add(zhuanjialuruDTO);
                    #endregion


                    List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();

                    #region 上门拜访客户
@@ -2833,16 +3084,22 @@

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

                            }
                        }
                    }
                    if (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
                        baifangkehuDTOs.Add(shangmenbanfangDTO);
                    #endregion

                    #region 接待来访客户
                    #region 录入客户咨询
                    TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
                    jiedailaifangDTO.gongzuo = "接待来访客户";
                    var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "接待来访客户").FirstOrDefault();
                    jiedailaifangDTO.gongzuo = "录入客户咨询";
                    var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "录入客户咨询").FirstOrDefault();

                    if (jijianijiedailaifang != null)
                    {
@@ -2903,7 +3160,7 @@
                    var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;

                    //本日数量
                    var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
                    var dingdanDTOsri = dingdanDTOsyue.Where(x => (x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)) || (x.Wangongtime >= chauxnshijian.Date && x.Wangongtime < chauxnshijian.Date.AddDays(1))).ToList();
                    foreach (var cooperOrderDTO in dingdanDTOsri)
                    {
                        TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -3103,10 +3360,10 @@
                        ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
                    #endregion

                    #region 新增公众号关注
                    #region 微信微博公众号新增粉丝
                    TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
                    gongzhonghaoDTO.gongzuo = "新增公众号关注";
                    var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "新增公众号关注").FirstOrDefault();
                    gongzhonghaoDTO.gongzuo = "微信微博公众号新增粉丝";
                    var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "微信微博公众号新增粉丝").FirstOrDefault();

                    if (jijianigongzhonghao != null)
                    {
@@ -3488,7 +3745,24 @@
                    tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs = ziliaoweihuDTOs;
                    tongjibaobiaobaobiaoDTO.xiangmushishiDTOs = xiangmushishiDTOs;
                    tongjibaobiaobaobiaoDTO.dingdanDTOsCount = dingdanDTOsCount;
                    tongjibaobiaobaobiaoDTO.UserName = userDTO.UserName;
                    tongjibaobiaobaobiaoDTO.UserName = "";
                    if (deptDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserName += "部门：" + deptDTO.DeptName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    tongjibaobiaobaobiaoDTO.UserName += "姓名：" + userDTO.UserName + "&nbsp&nbsp&nbsp&nbsp";

                    tongjibaobiaobaobiaoDTO.UserDaka = ""; 
                    if (hrPositionDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserDaka += "职务：" + hrPositionDTO.PostName + "&nbsp&nbsp&nbsp&nbsp";
                    }
                    if (admSignInDTO != null)
                    {
                        tongjibaobiaobaobiaoDTO.UserDaka += "    打卡时间：上午 " + (admSignInDTO.MorningIn.HasValue? admSignInDTO.MorningIn.Value.ToString("HH:mm:ss"):"") + "-" + (admSignInDTO.MorningOut.HasValue ? admSignInDTO.MorningOut.Value.ToString("HH:mm:ss") : "")
                            + "&nbsp&nbsp&nbsp&nbsp下午 " + (admSignInDTO.AfternoonIn.HasValue ? admSignInDTO.AfternoonIn.Value.ToString("HH:mm:ss") : "") + "-" + (admSignInDTO.AfternoonOut.HasValue ? admSignInDTO.AfternoonOut.Value.ToString("HH:mm:ss") : "")
                              + (admSignInDTO.OvertimeIn.HasValue ? "    加班 " + admSignInDTO.OvertimeIn.Value.ToString("HH:mm:ss") + "-" : "") + (admSignInDTO.OvertimeOut.HasValue ? admSignInDTO.OvertimeOut.Value.ToString("HH:mm:ss") : "");
                    }

                    tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);