From 8a286d8dd894be550bd0ce9fd859781f98478747 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期二, 20 七月 2021 15:15:04 +0800
Subject: [PATCH] 今日开发     客户资料。前端同步到后端  ,书城端和会员端都需要同步                  绩效管理  菜单修改                  绩效管理-我的报表,没有参与的大项,小项都不显示                  绩效管理-工作报表  批量查询,批量打印

---
 zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs                    |    5 
 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 3097 ++++++++++++++++++++-------------------
 zhengcaioa/Services/CooperatecustomCustomerService.cs              |   51 
 zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml             |  524 +++---
 zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs            |  296 ++
 zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml       |  582 ++++---
 zhengcaioa/IServices/ICooperatecustomCustomerService.cs            |    2 
 zhengcaioa/DTO/TongjiBaoBiaoDTO.cs                                 |   12 
 8 files changed, 2,464 insertions(+), 2,105 deletions(-)

diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index d3d580b..dd00adf 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -224,7 +224,10 @@
 
             CreateMap<DtChannelArticleNews, DtChannelArticleNewsDTO>();
             CreateMap<DtChannelArticleNewsDTO, DtChannelArticleNews>();
-            
+
+            CreateMap<AdmEvaluate, AdmEvaluateDTO>();
+            CreateMap<AdmEvaluateDTO, AdmEvaluate>();
+
         }
     }
 }
diff --git a/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs b/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
index 6c605ef..dac0d7b 100644
--- a/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
+++ b/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
@@ -25,4 +25,16 @@
         public string jine { get; set; }
         public string benyueleijijine { get; set; }
     }
+
+    public class TongjibaobiaobaobiaoDTO
+    {
+        public List<TongjiBaoBiaoDTO> tuiguangDTOs { get; set; }
+        public List<TongjiBaoBiaoDTO> baifangkehuDTOs { get; set; }
+        public List<TongjiDingDanDTO> dingdanDTOs { get; set; }
+        public List<TongjiBaoBiaoDTO> ziliaoweihuDTOs { get; set; }
+        public List<TongjiBaoBiaoDTO> xiangmushishiDTOs { get; set; }
+        public int dingdanDTOsCount { get; set; }
+        public string UserName { get; set; }
+    }
+
 }
diff --git a/zhengcaioa/IServices/ICooperatecustomCustomerService.cs b/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
index ed87fca..7ac1057 100644
--- a/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
+++ b/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
@@ -17,7 +17,7 @@
 
         ResultEntity ModifyStatus(string id, string userid);
 
-        List<CooperatecustomCustomerDTO> GetList();
+        List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "",string Name="");
         List<CooperatecustomCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
 
 
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index 368891e..0f51554 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -173,14 +173,26 @@
             var query = (from a in _context.CooperatecustomCustomers
                          join b in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khly")
                          on a.Khly equals b.CodeSn
+                         into bsss
+                         from bbb in bsss.DefaultIfEmpty()
+
                          join c in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "hyfl")
                          on a.Hyfl equals c.CodeSn
+                          into csss
+                         from ccc in csss.DefaultIfEmpty()
+
                          join d in listCode.Where(x => x.CodeTable == "CooperatecustomCustomer" && x.CodeField == "khlx")
                         on a.Khlx equals d.CodeSn
+                         into dsss
+                         from ddd in dsss.DefaultIfEmpty()
+
+
                          join e in _context.PltUsers.Where(x => x.RecStatus == "A" && x.Zhiwustatus == "A" && x.IsYwjl == "A")
                          on a.Ywjl equals e.Id
                          into esss
                          from abi in esss.DefaultIfEmpty()
+
+
                          join i in _context.CooperOrders.Where(x => x.RecStatus == "A" &&  x.ChedanStatus !="A" ).GroupBy(q => new { q.Khdw }).Select(q => new
                          {
                              Khdw = q.Key.Khdw,
@@ -191,9 +203,24 @@
                          on a.Id equals i.Khdw
                          into isss
                          from iii in isss.DefaultIfEmpty()
+
+
+
                          join f in _context.Areas on a.Sheng equals f.CodeId
+                            into fsss
+                         from fff in fsss.DefaultIfEmpty()
+
+
                          join g in _context.Areas on a.City equals g.CodeId
+                            into gsss
+                         from ggg in gsss.DefaultIfEmpty()
+
+
                          join h in _context.Areas on a.AreaId equals h.CodeId
+                            into hsss
+                         from hhh in hsss.DefaultIfEmpty()
+
+
 
                          where a.RecStatus == "A"
                           && (string.IsNullOrWhiteSpace(searchEntity.Createtime) || (a.Createtime >= Createtimestart && a.Createtime <= Createtimeend))
@@ -218,12 +245,12 @@
                              Hyfl = a.Hyfl,
                              Khlx = a.Khlx,
                              Ywjl = a.Ywjl,
-                             ShengName = f.Name + "-" + g.Name+ "-" + h.Name,
-                             CityName = g.Name,
-                             AreaIdName = h.Name,
-                             KhlyName = b.Comments,
-                             HyflName = c.Comments,
-                             KhlxName = d.Comments,
+                             ShengName = fff.Name + "-" + ggg.Name+ "-" + hhh.Name,
+                             CityName = ggg.Name,
+                             AreaIdName = hhh.Name,
+                             KhlyName = bbb.Comments,
+                             HyflName = ccc.Comments,
+                             KhlxName = ddd.Comments,
                              YwjlName = abi.UserName,
                              Name = a.Name,
                              Postal = a.Postal,
@@ -303,12 +330,22 @@
         /// 鑾峰彇鎵�鏈夋湁鏁堝悎浣滃鎴�
         /// </summary>
         /// <returns></returns>
-        public List<CooperatecustomCustomerDTO> GetList()
+        public List<CooperatecustomCustomerDTO> GetList(string HuiyuanId = "", string Name = "")
         {
 
 
             var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A").ToList();
 
+            if (!string.IsNullOrEmpty(HuiyuanId))
+            {
+                listPosition = listPosition.Where(x => x.HuiyuanId == HuiyuanId).ToList();
+            }
+
+            if (!string.IsNullOrEmpty(Name))
+            {
+                listPosition = listPosition.Where(x => x.Name == Name).ToList();
+            }
+
             var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
             return list;
         }
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
index 8df149c..9a3e373 100644
--- a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -1159,6 +1159,12 @@
 
                 dingdanDTOs.Add(dingdanDTO);
             }
+            int dingdanDTOsCount = 1;
+            if (dingdanDTOs.Count == 0 && benyuezonge == 0)
+            {
+                dingdanDTOsCount = 0;
+            }
+
             if (dingdanDTOs.Count == 0)
             {
                 TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
@@ -1720,6 +1726,10 @@
             ViewBag.dingdanDTOs = dingdanDTOs;
             ViewBag.ziliaoweihuDTOs = ziliaoweihuDTOs;
             ViewBag.xiangmushishiDTOs = xiangmushishiDTOs;
+            ViewBag.dingdanDTOsCount = dingdanDTOsCount;
+            ViewBag.UserName = curentuser.UserName;
+
+
 
             ViewBag.Tongjitime = chauxnshijian.ToString("yyyy-MM-dd");
 
@@ -1738,1621 +1748,1662 @@
             {
                 DateTime.TryParse(Tongjitime, out chauxnshijian);
             }
-            string position = curentuser.HrPosition;
-            string Userid = curentuser.Id;
-            if (!string.IsNullOrEmpty(userid))
+            var userDTOs = _userService.GetList();
+
+            string[] Userids = null;
+            if (!string.IsNullOrEmpty(userid) && userid!= "null")
             {
-                Userid = userid;
-                position = _userService.GetPltUserEntity(Userid).HrPosition;
+                Userids = userid.Split(','); ;
+
+            }
+            else
+            {
+                Userids = userDTOs.OrderBy(x => x.UserSn).Select(x => x.Id).ToArray();
             }
 
-           
+            List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = new List<TongjibaobiaobaobiaoDTO>();
 
-
-            DateTime dateminkaoqin = new DateTime(chauxnshijian.Year, chauxnshijian.Month, 1);
-            DateTime datemaxkaoqin = dateminkaoqin.AddMonths(1);
-            int Yingchuqin = 0;
-            int Offdays = 0;
-            //鏄惁涓婄彮鏃ユ湡
-            AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
-            var admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
-            var jiejiari = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiejiari").ToList();
-
-            var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();
-            List<FiPiecerateDTO> fiPiecerateDTOs = _fiPiecerateService.GetList();
-            List<HrJixiaotichengDTO> hrJixiaotichengDTOs = _hrJixiaotichengService.GetList().Where(x => x.Effecttime < datemaxkaoqin).ToList();
-            var hrJixiaotichengThis = hrJixiaotichengDTOs.Where(x => x.PostId == position).ToList();
-
-
-            //璁$畻姣忔湀宸ヤ綔鏃�
-            while (dateminkaoqin < datemaxkaoqin)
+            if (Userids!=null&& Userids.Length > 0)
             {
-                _logger.LogInformation("dateminkaoqin " + dateminkaoqin);
-                //bool iswork = false;
+                DateTime dateminkaoqin = new DateTime(chauxnshijian.Year, chauxnshijian.Month, 1);
+                DateTime datemaxkaoqin = dateminkaoqin.AddMonths(1);
+                int Yingchuqin = 0;
+                int Offdays = 0;
+                //鏄惁涓婄彮鏃ユ湡
+                AdmAttendanceRuleDTO admAttendanceRuleDTO = _attendanceRuleService.Get("");
+                var admAttendanceRulesDtlDTOs = _attendanceRuleService.GetDtlList("");
+                var jiejiari = admAttendanceRulesDtlDTOs.Where(x => x.Name == "jiejiari").ToList();
+
+                var tiaoxiuri = admAttendanceRulesDtlDTOs.Where(x => x.Name == "tiaoxiuri").ToList();
+                List<FiPiecerateDTO> fiPiecerateDTOs = _fiPiecerateService.GetList();
+                List<HrJixiaotichengDTO> hrJixiaotichengDTOs = _hrJixiaotichengService.GetList().Where(x => x.Effecttime < datemaxkaoqin).ToList();
 
 
 
-                if ((int)dateminkaoqin.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)dateminkaoqin.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
+                //璁$畻姣忔湀宸ヤ綔鏃�
+                while (dateminkaoqin < datemaxkaoqin)
                 {
-                    //鏄惁鑺傚亣鏃�
-                    if (jiejiari.Exists(x => x.ValueStart <= dateminkaoqin && x.ValueEnd >= dateminkaoqin))
+                    _logger.LogInformation("dateminkaoqin " + dateminkaoqin);
+                    //bool iswork = false;
+
+
+
+                    if ((int)dateminkaoqin.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)dateminkaoqin.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
                     {
-                        Offdays += 1;
+                        //鏄惁鑺傚亣鏃�
+                        if (jiejiari.Exists(x => x.ValueStart <= dateminkaoqin && x.ValueEnd >= dateminkaoqin))
+                        {
+                            Offdays += 1;
+                        }
+                        else
+                        {
+                            Yingchuqin += 1;
+                            //iswork = true;
+                        }
                     }
                     else
                     {
-                        Yingchuqin += 1;
-                        //iswork = true;
-                    }
-                }
-                else
-                {
-                    //鏄惁璋冧紤鏃�  璋冧紤鏃ラ渶瑕佷笂鐝�
-                    if (tiaoxiuri.Exists(x => x.ValueStart <= dateminkaoqin.Date && x.ValueEnd >= dateminkaoqin.Date))
-                    {
-                        Yingchuqin += 1;
-                        //iswork = true;
-                    }
-                    else
-                    {
-                        Offdays += 1;
-                    }
-                }
-                dateminkaoqin = dateminkaoqin.AddDays(1);
-            }
-            dateminkaoqin = new DateTime(chauxnshijian.Year, chauxnshijian.Month, 1);
-
-            List<TongjiBaoBiaoDTO> tuiguangDTOs = new List<TongjiBaoBiaoDTO>();
-
-            #region 閲囪喘椤圭洰褰曞叆
-            TongjiBaoBiaoDTO xiangmuDTO = new TongjiBaoBiaoDTO();
-            xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
-            //鏈湀鏁伴噺
-            var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
-            xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var projectDTOsri = projectDTOsyue.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();
-
-            if (jijianixiangmu != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangmu.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-                        //鏈湀瑙勫畾
-                        xiangmuDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        //鏈棩瑙勫畾
-                        xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        //鏄惁璋冧紤鏃�  璋冧紤鏃ラ渶瑕佷笂鐝�
+                        if (tiaoxiuri.Exists(x => x.ValueStart <= dateminkaoqin.Date && x.ValueEnd >= dateminkaoqin.Date))
                         {
-                            decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            Yingchuqin += 1;
+                            //iswork = true;
+                        }
+                        else
+                        {
+                            Offdays += 1;
+                        }
+                    }
+                    dateminkaoqin = dateminkaoqin.AddDays(1);
+                }
+                dateminkaoqin = new DateTime(chauxnshijian.Year, chauxnshijian.Month, 1);
+
+                foreach (var Userid in Userids)
+                {
+                    var userDTO = userDTOs.Where(x=>x.Id == Userid).FirstOrDefault();
+                    string position = userDTO.HrPosition;
+
+                    var hrJixiaotichengThis = hrJixiaotichengDTOs.Where(x => x.PostId == position).ToList();
+
+
+                    List<TongjiBaoBiaoDTO> tuiguangDTOs = new List<TongjiBaoBiaoDTO>();
+
+                    #region 閲囪喘椤圭洰褰曞叆
+                    TongjiBaoBiaoDTO xiangmuDTO = new TongjiBaoBiaoDTO();
+                    xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
+                    //鏈湀鏁伴噺
+                    var projectDTOsyue = _projectService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+                    xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var projectDTOsri = projectDTOsyue.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();
+
+                    if (jijianixiangmu != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangmu.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                //鏈湀瑙勫畾
+                                xiangmuDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                //鏈棩瑙勫畾
+                                xiangmuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = projectDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        xiangmuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+                                }
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                //鏈湀瑙勫畾
+                                xiangmuDTO.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);
+                                //    }
+
+                                //}
                             }
                         }
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(xiangmuDTO.benyueshuliang) > 0 || decimal.Parse(xiangmuDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(xiangmuDTO);
+                    #endregion
+
+
+                    #region 瀹㈡埛璧勬枡褰曞叆
+                    TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
+                    kehuluruDTO.gongzuo = "瀹㈡埛璧勬枡褰曞叆";
+                    //鏈湀鏁伴噺
+                    var intentionCustomerDTOsyue = _intentionCustomerService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+                    kehuluruDTO.benyueshuliang = intentionCustomerDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var intentionCustomerDTOsri = intentionCustomerDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    kehuluruDTO.benrishuliang = intentionCustomerDTOsri.Count.ToString();
+
+                    var jijianikehuluru = fiPiecerateDTOs.Where(x => x.Project == "瀹㈡埛璧勬枡褰曞叆").FirstOrDefault();
+
+                    if (jijianikehuluru != null)
                     {
-                        //鏈湀瑙勫畾
-                        xiangmuDTO.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 (decimal.Parse(xiangmuDTO.benyueshuliang) > 0 || decimal.Parse(xiangmuDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(xiangmuDTO);
-            #endregion
-
-
-            #region 瀹㈡埛璧勬枡褰曞叆
-            TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
-            kehuluruDTO.gongzuo = "瀹㈡埛璧勬枡褰曞叆";
-            //鏈湀鏁伴噺
-            var intentionCustomerDTOsyue = _intentionCustomerService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
-            kehuluruDTO.benyueshuliang = intentionCustomerDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var intentionCustomerDTOsri = intentionCustomerDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            kehuluruDTO.benrishuliang = intentionCustomerDTOsri.Count.ToString();
-
-            var jijianikehuluru = fiPiecerateDTOs.Where(x => x.Project == "瀹㈡埛璧勬枡褰曞叆").FirstOrDefault();
-
-            if (jijianikehuluru != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianikehuluru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        kehuluruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        kehuluruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianikehuluru.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = intentionCustomerDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                kehuluruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                kehuluruDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                kehuluruDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = intentionCustomerDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        kehuluruDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
                             }
-
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        kehuluruDTO.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 (decimal.Parse(kehuluruDTO.benyueshuliang) > 0 || decimal.Parse(kehuluruDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(kehuluruDTO);
-            #endregion
-
-            #region 鏂板姞缇ょ粍
-            TongjiBaoBiaoDTO qunzuDTO = new TongjiBaoBiaoDTO();
-            qunzuDTO.gongzuo = "鏂板姞缇ょ粍";
-            //鏈湀鏁伴噺
-            var groupTopicDTOsyue = _groupTopicService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
-            qunzuDTO.benyueshuliang = groupTopicDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var groupTopicDTOsri = groupTopicDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            qunzuDTO.benrishuliang = groupTopicDTOsri.Count.ToString();
-
-            var jijianixianggroupTopic = fiPiecerateDTOs.Where(x => x.Project == "鏂板姞缇ょ粍").FirstOrDefault();
-
-            if (jijianixianggroupTopic != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixianggroupTopic.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-                        //鏈湀瑙勫畾
-                        qunzuDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        //鏈棩瑙勫畾
-                        qunzuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = groupTopicDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            else if (jixiaotichengfangan.Renwustandard == "02")
                             {
-                                qunzuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                kehuluruDTO.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);
+                                //    }
+
+                                //}
                             }
                         }
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(kehuluruDTO.benyueshuliang) > 0 || decimal.Parse(kehuluruDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(kehuluruDTO);
+                    #endregion
+
+                    #region 鏂板姞缇ょ粍
+                    TongjiBaoBiaoDTO qunzuDTO = new TongjiBaoBiaoDTO();
+                    qunzuDTO.gongzuo = "鏂板姞缇ょ粍";
+                    //鏈湀鏁伴噺
+                    var groupTopicDTOsyue = _groupTopicService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+                    qunzuDTO.benyueshuliang = groupTopicDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var groupTopicDTOsri = groupTopicDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    qunzuDTO.benrishuliang = groupTopicDTOsri.Count.ToString();
+
+                    var jijianixianggroupTopic = fiPiecerateDTOs.Where(x => x.Project == "鏂板姞缇ょ粍").FirstOrDefault();
+
+                    if (jijianixianggroupTopic != null)
                     {
-                        //鏈湀瑙勫畾
-                        qunzuDTO.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 (decimal.Parse(qunzuDTO.benyueshuliang) > 0 || decimal.Parse(qunzuDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(qunzuDTO);
-            #endregion
-
-            #region 鐢佃瘽鎺ㄥ箍
-            TongjiBaoBiaoDTO dianhuatuiguangDTO = new TongjiBaoBiaoDTO();
-            dianhuatuiguangDTO.gongzuo = "鐢佃瘽鎺ㄥ箍";
-            //鏈湀鏁伴噺
-            var intentionVisitDTOsyue = _intentionVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "01").ToList();
-            dianhuatuiguangDTO.benyueshuliang = intentionVisitDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var intentionVisitDTOsri = intentionVisitDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
-            dianhuatuiguangDTO.benrishuliang = intentionVisitDTOsri.Count.ToString();
-
-            var jijianixiangdianhuatuiguang = fiPiecerateDTOs.Where(x => x.Project == "鐢佃瘽鎺ㄥ箍").FirstOrDefault();
-
-            if (jijianixiangdianhuatuiguang != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangdianhuatuiguang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-                        //鏈湀瑙勫畾
-                        dianhuatuiguangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        //鏈棩瑙勫畾
-                        dianhuatuiguangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixianggroupTopic.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = intentionVisitDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                dianhuatuiguangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                //鏈湀瑙勫畾
+                                qunzuDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                //鏈棩瑙勫畾
+                                qunzuDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = groupTopicDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        qunzuDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+                                }
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                //鏈湀瑙勫畾
+                                qunzuDTO.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);
+                                //    }
+
+                                //}
                             }
                         }
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(qunzuDTO.benyueshuliang) > 0 || decimal.Parse(qunzuDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(qunzuDTO);
+                    #endregion
+
+                    #region 鐢佃瘽鎺ㄥ箍
+                    TongjiBaoBiaoDTO dianhuatuiguangDTO = new TongjiBaoBiaoDTO();
+                    dianhuatuiguangDTO.gongzuo = "鐢佃瘽鎺ㄥ箍";
+                    //鏈湀鏁伴噺
+                    var intentionVisitDTOsyue = _intentionVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "01").ToList();
+                    dianhuatuiguangDTO.benyueshuliang = intentionVisitDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var intentionVisitDTOsri = intentionVisitDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
+                    dianhuatuiguangDTO.benrishuliang = intentionVisitDTOsri.Count.ToString();
+
+                    var jijianixiangdianhuatuiguang = fiPiecerateDTOs.Where(x => x.Project == "鐢佃瘽鎺ㄥ箍").FirstOrDefault();
+
+                    if (jijianixiangdianhuatuiguang != null)
                     {
-                        //鏈湀瑙勫畾
-                        dianhuatuiguangDTO.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 (decimal.Parse(dianhuatuiguangDTO.benyueshuliang) > 0 || decimal.Parse(dianhuatuiguangDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(dianhuatuiguangDTO);
-            #endregion
-
-            #region 娣诲姞寰俊瀹㈡埛
-            TongjiBaoBiaoDTO weixnDTO = new TongjiBaoBiaoDTO();
-            weixnDTO.gongzuo = "娣诲姞寰俊瀹㈡埛";
-            //鏈湀鏁伴噺
-            var cooperweixinDTOsyue = _cooperatecustomCustomerService.GetListsalaryweixin(Userid, dateminkaoqin, datemaxkaoqin);
-            var intentionweixinDTOsyue = _intentionCustomerService.GetListsalaryweixin(Userid, dateminkaoqin, datemaxkaoqin);
-            weixnDTO.benyueshuliang = (cooperweixinDTOsyue.Count + intentionweixinDTOsyue.Count).ToString();
-            //鏈棩鏁伴噺
-            var cooperweixinDTOsri = cooperweixinDTOsyue.Where(x => x.Weixintime >= chauxnshijian.Date && x.Weixintime < chauxnshijian.Date.AddDays(1)).ToList();
-            var intentionweixinDTOsri = intentionweixinDTOsyue.Where(x => x.Weixintime >= chauxnshijian.Date && x.Weixintime < chauxnshijian.Date.AddDays(1)).ToList();
-            weixnDTO.benrishuliang = (cooperweixinDTOsri.Count + intentionweixinDTOsri.Count).ToString();
-
-            var jijianiweixn = fiPiecerateDTOs.Where(x => x.Project == "娣诲姞寰俊瀹㈡埛").FirstOrDefault();
-
-            if (jijianiweixn != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiweixn.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        weixnDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        weixnDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangdianhuatuiguang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsyue.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                weixnDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                //鏈湀瑙勫畾
+                                dianhuatuiguangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                //鏈棩瑙勫畾
+                                dianhuatuiguangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = intentionVisitDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        dianhuatuiguangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+                                }
                             }
-
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        weixnDTO.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 (decimal.Parse(weixnDTO.benyueshuliang) > 0 || decimal.Parse(weixnDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(weixnDTO);
-            #endregion
-
-            #region 缇ゅ彂鐭俊
-            TongjiBaoBiaoDTO duanxinDTO = new TongjiBaoBiaoDTO();
-            duanxinDTO.gongzuo = "缇ゅ彂鐭俊";
-            //鏈湀鏁伴噺
-            var duanxinsyue = _cusFangwenjiluService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "01").ToList();
-            duanxinDTO.benyueshuliang = duanxinsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var duanxinsri = duanxinsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            duanxinDTO.benrishuliang = duanxinsri.Count.ToString();
-
-            var jijianiduanxin = fiPiecerateDTOs.Where(x => x.Project == "缇ゅ彂鐭俊").FirstOrDefault();
-
-            if (jijianiduanxin != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiduanxin.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        duanxinDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        duanxinDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = duanxinsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            else if (jixiaotichengfangan.Renwustandard == "02")
                             {
-                                duanxinDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
-                            }
+                                //鏈湀瑙勫畾
+                                dianhuatuiguangDTO.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);
+                                //    }
 
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        duanxinDTO.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 (decimal.Parse(duanxinDTO.benyueshuliang) > 0 || decimal.Parse(duanxinDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(duanxinDTO);
-            #endregion
-
-
-            #region 鍟嗕笟淇″嚱鎺ㄥ箍
-            TongjiBaoBiaoDTO xinhanDTO = new TongjiBaoBiaoDTO();
-            xinhanDTO.gongzuo = "鍟嗕笟淇″嚱鎺ㄥ箍";
-            var jijianixinhan = fiPiecerateDTOs.Where(x => x.Project == "鍟嗕笟淇″嚱鎺ㄥ箍").FirstOrDefault();
-
-            if (jijianixinhan != null)
-            {
-                //鏈湀鏁伴噺
-                var xinhansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianixinhan.Id).ToList();
-
-                xinhanDTO.benyueshuliang = (xinhansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var xinhansri = xinhansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                xinhanDTO.benrishuliang = (xinhansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                xinhanDTO.dangrijixiao = (xinhansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinhan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        xinhanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        xinhanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (xinhansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        xinhanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        xinhanDTO.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 (decimal.Parse(xinhanDTO.benyueshuliang) > 0 || decimal.Parse(xinhanDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(xinhanDTO);
-            #endregion
-
-            #region 缇ゅ彂閭欢
-            TongjiBaoBiaoDTO youjianDTO = new TongjiBaoBiaoDTO();
-            youjianDTO.gongzuo = "缇ゅ彂閭欢";
-            //鏈湀鏁伴噺
-            var youjiansyue = _cusFangwenjiluService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "02").ToList();
-            youjianDTO.benyueshuliang = youjiansyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var youjiansri = youjiansyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            youjianDTO.benrishuliang = youjiansri.Count.ToString();
-
-            var jijianiyoujian = fiPiecerateDTOs.Where(x => x.Project == "缇ゅ彂閭欢").FirstOrDefault();
-
-            if (jijianiyoujian != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiyoujian.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        youjianDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        youjianDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = youjiansri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
-                            {
-                                youjianDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
-                            }
-
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        youjianDTO.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 (decimal.Parse(youjianDTO.benyueshuliang) > 0 || decimal.Parse(youjianDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(youjianDTO);
-            #endregion
-
-            #region 缇ょ粍鎺ㄥ箍
-            TongjiBaoBiaoDTO qunzutuiguangDTO = new TongjiBaoBiaoDTO();
-            qunzutuiguangDTO.gongzuo = "缇ょ粍鎺ㄥ箍";
-            var jijianiqunzutuiguang = fiPiecerateDTOs.Where(x => x.Project == "缇ょ粍鎺ㄥ箍").FirstOrDefault();
-
-            if (jijianiqunzutuiguang != null)
-            {
-                //鏈湀鏁伴噺
-                var qunzutuiguangsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiqunzutuiguang.Id).ToList();
-
-                qunzutuiguangDTO.benyueshuliang = (qunzutuiguangsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var qunzutuiguangsri = qunzutuiguangsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                qunzutuiguangDTO.benrishuliang = (qunzutuiguangsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                qunzutuiguangDTO.dangrijixiao = (qunzutuiguangsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiqunzutuiguang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        qunzutuiguangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        qunzutuiguangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (qunzutuiguangsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        qunzutuiguangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        qunzutuiguangDTO.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 (decimal.Parse(qunzutuiguangDTO.benyueshuliang) > 0 || decimal.Parse(qunzutuiguangDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(qunzutuiguangDTO);
-            #endregion
-
-            #region 鏈嬪弸鍦堝師鍒�
-            TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
-            pengyouquanDTO.gongzuo = "鏈嬪弸鍦堝師鍒�";
-            var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堝師鍒�").FirstOrDefault();
-
-            if (jijianipengyouquan != null)
-            {
-                //鏈湀鏁伴噺
-                var pengyouquansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianipengyouquan.Id).ToList();
-
-                pengyouquanDTO.benyueshuliang = (pengyouquansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var pengyouquansri = pengyouquansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                pengyouquanDTO.benrishuliang = (pengyouquansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                pengyouquanDTO.dangrijixiao = (pengyouquansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianipengyouquan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        pengyouquanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        pengyouquanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (pengyouquansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        pengyouquanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        pengyouquanDTO.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 (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(pengyouquanDTO);
-            #endregion
-
-            #region 璁哄潧鍙戝笘
-            TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
-            luntanfatieDTO.gongzuo = "璁哄潧鍙戝笘";
-            var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鍙戝笘").FirstOrDefault();
-
-            if (jijianiluntanfatie != null)
-            {
-                //鏈湀鏁伴噺
-                var luntanfatiesyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiluntanfatie.Id).ToList();
-
-                luntanfatieDTO.benyueshuliang = (luntanfatiesyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var luntanfatiesri = luntanfatiesyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                luntanfatieDTO.benrishuliang = (luntanfatiesri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                luntanfatieDTO.dangrijixiao = (luntanfatiesri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiluntanfatie.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        luntanfatieDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        luntanfatieDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (luntanfatiesri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        luntanfatieDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        luntanfatieDTO.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 (decimal.Parse(luntanfatieDTO.benyueshuliang) > 0 || decimal.Parse(luntanfatieDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(luntanfatieDTO);
-            #endregion
-
-            #region 璺熷笘璇勮
-            TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
-            gentiepinglunDTO.gongzuo = "璺熷笘璇勮";
-            var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璺熷笘璇勮").FirstOrDefault();
-
-            if (jijianigentiepinglun != null)
-            {
-                //鏈湀鏁伴噺
-                var gentiepinglunsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianigentiepinglun.Id).ToList();
-
-                gentiepinglunDTO.benyueshuliang = (gentiepinglunsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var gentiepinglunsri = gentiepinglunsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                gentiepinglunDTO.benrishuliang = (gentiepinglunsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                gentiepinglunDTO.dangrijixiao = (gentiepinglunsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianigentiepinglun.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        gentiepinglunDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        gentiepinglunDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (gentiepinglunsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        gentiepinglunDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        gentiepinglunDTO.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 (decimal.Parse(gentiepinglunDTO.benyueshuliang) > 0 || decimal.Parse(gentiepinglunDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(gentiepinglunDTO);
-            #endregion
-
-            #region 杞彂寰俊寰崥
-            TongjiBaoBiaoDTO zhuanfaDTO = new TongjiBaoBiaoDTO();
-            zhuanfaDTO.gongzuo = "杞彂寰俊寰崥";
-            var jijianizhuanfa = fiPiecerateDTOs.Where(x => x.Project == "杞彂寰俊寰崥").FirstOrDefault();
-
-            if (jijianizhuanfa != null)
-            {
-                //鏈湀鏁伴噺
-                var zhuanfasyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhuanfa.Id).ToList();
-
-                zhuanfaDTO.benyueshuliang = (zhuanfasyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var zhuanfasri = zhuanfasyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                zhuanfaDTO.benrishuliang = (zhuanfasri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                zhuanfaDTO.dangrijixiao = (zhuanfasri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanfa.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        zhuanfaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        zhuanfaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (zhuanfasri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        zhuanfaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        zhuanfaDTO.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 (decimal.Parse(zhuanfaDTO.benyueshuliang) > 0 || decimal.Parse(zhuanfaDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(zhuanfaDTO);
-            #endregion
-
-            #region 鏂板鎰忓悜瀹㈡埛锛堣鍗曪級
-            TongjiBaoBiaoDTO yixiangDTO = new TongjiBaoBiaoDTO();
-            yixiangDTO.gongzuo = "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級";
-            //鏈湀鏁伴噺
-            var yixiangsyue = _intentionCustomerService.GetListsalaryyixiang(Userid, dateminkaoqin, datemaxkaoqin).ToList();
-            yixiangDTO.benyueshuliang = yixiangsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var yixiangsri = yixiangsyue.Where(x => x.Yixiangtime >= chauxnshijian.Date && x.Yixiangtime < chauxnshijian.Date.AddDays(1)).ToList();
-            yixiangDTO.benrishuliang = yixiangsri.Count.ToString();
-
-            var jijianiyixiang = fiPiecerateDTOs.Where(x => x.Project == "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級").FirstOrDefault();
-
-            if (jijianiyixiang != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiyixiang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        yixiangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        yixiangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = yixiangsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
-                            {
-                                yixiangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
-                            }
-
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        yixiangDTO.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 (decimal.Parse(yixiangDTO.benyueshuliang) > 0 || decimal.Parse(yixiangDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(yixiangDTO);
-            #endregion
-
-            #region 鏂板娉ㄥ唽浼氬憳
-            TongjiBaoBiaoDTO zhucehuiyuanDTO = new TongjiBaoBiaoDTO();
-            zhucehuiyuanDTO.gongzuo = "鏂板娉ㄥ唽浼氬憳";
-            var jijianizhucehuiyuan = fiPiecerateDTOs.Where(x => x.Project == "鏂板娉ㄥ唽浼氬憳").FirstOrDefault();
-
-            if (jijianizhucehuiyuan != null)
-            {
-                //鏈湀鏁伴噺
-                var zhucehuiyuansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
-
-                zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                zhucehuiyuanDTO.benrishuliang = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                zhucehuiyuanDTO.dangrijixiao = (zhucehuiyuansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhucehuiyuan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        zhucehuiyuanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        zhucehuiyuanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        zhucehuiyuanDTO.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 (decimal.Parse(zhucehuiyuanDTO.benyueshuliang) > 0 || decimal.Parse(zhucehuiyuanDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(zhucehuiyuanDTO);
-            #endregion
-
-            #region 鏂板绛剧害瀹㈡埛
-            TongjiBaoBiaoDTO qianyueDTO = new TongjiBaoBiaoDTO();
-            qianyueDTO.gongzuo = "鏂板绛剧害瀹㈡埛";
-            //鏈湀鏁伴噺
-            var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
-            qianyueDTO.benyueshuliang = qianyueDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var qianyueDTOsri = qianyueDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            qianyueDTO.benrishuliang = qianyueDTOsri.Count.ToString();
-
-            var jijianiqianyue = fiPiecerateDTOs.Where(x => x.Project == "鏂板绛剧害瀹㈡埛").FirstOrDefault();
-
-            if (jijianiqianyue != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiqianyue.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        qianyueDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        qianyueDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = qianyueDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
-                            {
-                                qianyueDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
-                            }
-
-                        }
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        qianyueDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = qianyueDTOs.Count - renwujishu;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                        //    }
-
-                        //}
-                    }
-                }
-            }
-            if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
-                tuiguangDTOs.Add(qianyueDTO);
-            #endregion
-
-
-            List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();
-
-            #region 涓婇棬鎷滆瀹㈡埛
-            TongjiBaoBiaoDTO shangmenbanfangDTO = new TongjiBaoBiaoDTO();
-            shangmenbanfangDTO.gongzuo = "涓婇棬鎷滆瀹㈡埛";
-            //鏈湀鏁伴噺
-            var shangmenbanfangDTOsyue = _intentionVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
-            var shangmenbanfangcooperDTOsyue = _cooperVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
-            shangmenbanfangDTO.benyueshuliang = (shangmenbanfangcooperDTOsyue.Count + shangmenbanfangDTOsyue.Count).ToString();
-            //鏈棩鏁伴噺
-            var shangmenbanfangDTOsri = shangmenbanfangDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
-            var shangmenbanfangcooperDTOsri = shangmenbanfangcooperDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
-            shangmenbanfangDTO.benrishuliang = (shangmenbanfangcooperDTOsri.Count + shangmenbanfangDTOsri.Count).ToString();
-
-            var jijianixiangshangmenbanfang = fiPiecerateDTOs.Where(x => x.Project == "涓婇棬鎷滆瀹㈡埛").FirstOrDefault();
-
-            if (jijianixiangshangmenbanfang != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangshangmenbanfang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-                        //鏈湀瑙勫畾
-                        shangmenbanfangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        //鏈棩瑙勫畾
-                        shangmenbanfangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
-                        {
-                            decimal youxiaojijian = shangmenbanfangcooperDTOsri.Count + shangmenbanfangDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
-                            {
-                                shangmenbanfangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                //}
                             }
                         }
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(dianhuatuiguangDTO.benyueshuliang) > 0 || decimal.Parse(dianhuatuiguangDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(dianhuatuiguangDTO);
+                    #endregion
+
+                    #region 娣诲姞寰俊瀹㈡埛
+                    TongjiBaoBiaoDTO weixnDTO = new TongjiBaoBiaoDTO();
+                    weixnDTO.gongzuo = "娣诲姞寰俊瀹㈡埛";
+                    //鏈湀鏁伴噺
+                    var cooperweixinDTOsyue = _cooperatecustomCustomerService.GetListsalaryweixin(Userid, dateminkaoqin, datemaxkaoqin);
+                    var intentionweixinDTOsyue = _intentionCustomerService.GetListsalaryweixin(Userid, dateminkaoqin, datemaxkaoqin);
+                    weixnDTO.benyueshuliang = (cooperweixinDTOsyue.Count + intentionweixinDTOsyue.Count).ToString();
+                    //鏈棩鏁伴噺
+                    var cooperweixinDTOsri = cooperweixinDTOsyue.Where(x => x.Weixintime >= chauxnshijian.Date && x.Weixintime < chauxnshijian.Date.AddDays(1)).ToList();
+                    var intentionweixinDTOsri = intentionweixinDTOsyue.Where(x => x.Weixintime >= chauxnshijian.Date && x.Weixintime < chauxnshijian.Date.AddDays(1)).ToList();
+                    weixnDTO.benrishuliang = (cooperweixinDTOsri.Count + intentionweixinDTOsri.Count).ToString();
+
+                    var jijianiweixn = fiPiecerateDTOs.Where(x => x.Project == "娣诲姞寰俊瀹㈡埛").FirstOrDefault();
+
+                    if (jijianiweixn != null)
                     {
-                        //鏈湀瑙勫畾
-                        shangmenbanfangDTO.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 (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
-                baifangkehuDTOs.Add(shangmenbanfangDTO);
-            #endregion
-
-            #region 鎺ュ緟鏉ヨ瀹㈡埛
-            TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
-            jiedailaifangDTO.gongzuo = "鎺ュ緟鏉ヨ瀹㈡埛";
-            var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "鎺ュ緟鏉ヨ瀹㈡埛").FirstOrDefault();
-
-            if (jijianijiedailaifang != null)
-            {
-                //鏈湀鏁伴噺
-                var jiedailaifangsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianijiedailaifang.Id).ToList();
-
-                jiedailaifangDTO.benyueshuliang = (jiedailaifangsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var jiedailaifangsri = jiedailaifangsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                jiedailaifangDTO.benrishuliang = (jiedailaifangsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                jiedailaifangDTO.dangrijixiao = (jiedailaifangsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianijiedailaifang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        jiedailaifangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        jiedailaifangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (jiedailaifangsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        jiedailaifangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        jiedailaifangDTO.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 (decimal.Parse(jiedailaifangDTO.benyueshuliang) > 0 || decimal.Parse(jiedailaifangDTO.benrishuliang) > 0)
-                baifangkehuDTOs.Add(jiedailaifangDTO);
-            #endregion
-
-            List<TongjiDingDanDTO> dingdanDTOs = new List<TongjiDingDanDTO>();
-
-            #region 鏂板璁㈠崟
-
-
-            //鏈湀鏁伴噺
-            var dingdanDTOsyue = _cooperOrderService.GetListtongji(Userid, dateminkaoqin, datemaxkaoqin);
-            var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
-
-            //鏈棩鏁伴噺
-            var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            foreach (var cooperOrderDTO in dingdanDTOsri)
-            {
-                TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
-                dingdanDTO.dingdanbianhao = cooperOrderDTO.OrderNo;
-                dingdanDTO.dingdanmingcheng = cooperOrderDTO.OrderTypeName + "-" + cooperOrderDTO.OrderType1Name + (string.IsNullOrEmpty(cooperOrderDTO.OrderType2) ? "" : "-" + cooperOrderDTO.OrderType2);
-                dingdanDTO.danjia = cooperOrderDTO.Price.Value.ToString("0.##");
-                dingdanDTO.shuliang = cooperOrderDTO.OrderNum.Value.ToString("0.##");
-                dingdanDTO.jine = cooperOrderDTO.Money.Value.ToString("0.##");
-                dingdanDTO.benyueleijijine = benyuezonge.ToString("0.##");
-
-                dingdanDTOs.Add(dingdanDTO);
-            }
-            if (dingdanDTOs.Count == 0)
-            {
-                TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
-                dingdanDTO.benyueleijijine = benyuezonge.ToString("0.##");
-
-                dingdanDTOs.Add(dingdanDTO);
-            }
-
-            #endregion
-
-            List<TongjiBaoBiaoDTO> ziliaoweihuDTOs = new List<TongjiBaoBiaoDTO>();
-            #region 鏂伴椈璧勮
-            TongjiBaoBiaoDTO xinwenzixunDTO = new TongjiBaoBiaoDTO();
-            xinwenzixunDTO.gongzuo = "鏂伴椈璧勮";
-            //鏈湀鏁伴噺
-            DtChannelArticleNewsDTOSearch searchEntity = new DtChannelArticleNewsDTOSearch();
-            searchEntity.EndTime = datemaxkaoqin;
-            searchEntity.AddTime = dateminkaoqin;
-            searchEntity.UserName = curentuser.UserSn;
-            searchEntity.CategoryId = 3;
-            var dtChannelArticleNewsDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
-            xinwenzixunDTO.benyueshuliang = dtChannelArticleNewsDTOs.Count.ToString();
-            //鏈棩鏁伴噺
-            var xinwenzixunsri = dtChannelArticleNewsDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
-            xinwenzixunDTO.benrishuliang = xinwenzixunsri.Count.ToString();
-
-            var jijianixinwenzixun = fiPiecerateDTOs.Where(x => x.Project == "鏂伴椈璧勮").FirstOrDefault();
-
-            if (jijianixinwenzixun != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinwenzixun.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        xinwenzixunDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        xinwenzixunDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiweixn.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = xinwenzixunsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                xinwenzixunDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                weixnDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                weixnDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = cooperweixinDTOsri.Count + intentionweixinDTOsyue.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        weixnDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                weixnDTO.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);
+                                //    }
 
+                                //}
+                            }
                         }
-
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(weixnDTO.benyueshuliang) > 0 || decimal.Parse(weixnDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(weixnDTO);
+                    #endregion
+
+                    #region 缇ゅ彂鐭俊
+                    TongjiBaoBiaoDTO duanxinDTO = new TongjiBaoBiaoDTO();
+                    duanxinDTO.gongzuo = "缇ゅ彂鐭俊";
+                    //鏈湀鏁伴噺
+                    var duanxinsyue = _cusFangwenjiluService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "01").ToList();
+                    duanxinDTO.benyueshuliang = duanxinsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var duanxinsri = duanxinsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    duanxinDTO.benrishuliang = duanxinsri.Count.ToString();
+
+                    var jijianiduanxin = fiPiecerateDTOs.Where(x => x.Project == "缇ゅ彂鐭俊").FirstOrDefault();
+
+                    if (jijianiduanxin != null)
                     {
-                        xinwenzixunDTO.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 (decimal.Parse(xinwenzixunDTO.benyueshuliang) > 0 || decimal.Parse(xinwenzixunDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(xinwenzixunDTO);
-            #endregion
-
-            #region 鍏稿瀷妗堜緥
-            TongjiBaoBiaoDTO dianxinanliDTO = new TongjiBaoBiaoDTO();
-            dianxinanliDTO.gongzuo = "鍏稿瀷妗堜緥";
-            //鏈湀鏁伴噺
-            searchEntity = new DtChannelArticleNewsDTOSearch();
-            searchEntity.EndTime = datemaxkaoqin;
-            searchEntity.AddTime = dateminkaoqin;
-            searchEntity.UserName = curentuser.UserSn;
-            searchEntity.CategoryId = 85;
-            var dianxinanDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
-            dianxinanliDTO.benyueshuliang = dianxinanDTOs.Count.ToString();
-            //鏈棩鏁伴噺
-            var dianxinanlisri = dianxinanDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
-            dianxinanliDTO.benrishuliang = dianxinanlisri.Count.ToString();
-
-            var jijianidianxinanli = fiPiecerateDTOs.Where(x => x.Project == "鍏稿瀷妗堜緥").FirstOrDefault();
-
-            if (jijianidianxinanli != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidianxinanli.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        dianxinanliDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        dianxinanliDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiduanxin.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = dianxinanlisri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                dianxinanliDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                duanxinDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                duanxinDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = duanxinsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        duanxinDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                duanxinDTO.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);
+                                //    }
 
+                                //}
+                            }
                         }
-
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(duanxinDTO.benyueshuliang) > 0 || decimal.Parse(duanxinDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(duanxinDTO);
+                    #endregion
+
+
+                    #region 鍟嗕笟淇″嚱鎺ㄥ箍
+                    TongjiBaoBiaoDTO xinhanDTO = new TongjiBaoBiaoDTO();
+                    xinhanDTO.gongzuo = "鍟嗕笟淇″嚱鎺ㄥ箍";
+                    var jijianixinhan = fiPiecerateDTOs.Where(x => x.Project == "鍟嗕笟淇″嚱鎺ㄥ箍").FirstOrDefault();
+
+                    if (jijianixinhan != null)
                     {
-                        dianxinanliDTO.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);
-                        //    }
+                        //鏈湀鏁伴噺
+                        var xinhansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianixinhan.Id).ToList();
 
-                        //}
-                    }
-                }
-            }
-            if (decimal.Parse(dianxinanliDTO.benyueshuliang) > 0 || decimal.Parse(dianxinanliDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(dianxinanliDTO);
-            #endregion
-            #region 鏀块噰鐭ヨ瘑
-            TongjiBaoBiaoDTO zhengcaizhishiDTO = new TongjiBaoBiaoDTO();
-            zhengcaizhishiDTO.gongzuo = "鏀块噰鐭ヨ瘑";
-            //鏈湀鏁伴噺
-            searchEntity = new DtChannelArticleNewsDTOSearch();
-            searchEntity.EndTime = datemaxkaoqin;
-            searchEntity.AddTime = dateminkaoqin;
-            searchEntity.UserName = curentuser.UserSn;
-            searchEntity.CategoryId = 73;
-            var zhengcaizhishiDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
-            zhengcaizhishiDTO.benyueshuliang = zhengcaizhishiDTOs.Count.ToString();
-            //鏈棩鏁伴噺
-            var zhengcaizhishisri = zhengcaizhishiDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
-            zhengcaizhishiDTO.benrishuliang = zhengcaizhishisri.Count.ToString();
+                        xinhanDTO.benyueshuliang = (xinhansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var xinhansri = xinhansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        xinhanDTO.benrishuliang = (xinhansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        xinhanDTO.dangrijixiao = (xinhansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
 
-            var jijianizhengcaizhishi = fiPiecerateDTOs.Where(x => x.Project == "鏀块噰鐭ヨ瘑").FirstOrDefault();
-
-            if (jijianizhengcaizhishi != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhengcaizhishi.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        zhengcaizhishiDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        zhengcaizhishiDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinhan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = zhengcaizhishisri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                zhengcaizhishiDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                xinhanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                xinhanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (xinhansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        xinhanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                xinhanDTO.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);
+                                //    }
 
+                                //}
+                            }
                         }
-
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(xinhanDTO.benyueshuliang) > 0 || decimal.Parse(xinhanDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(xinhanDTO);
+                    #endregion
+
+                    #region 缇ゅ彂閭欢
+                    TongjiBaoBiaoDTO youjianDTO = new TongjiBaoBiaoDTO();
+                    youjianDTO.gongzuo = "缇ゅ彂閭欢";
+                    //鏈湀鏁伴噺
+                    var youjiansyue = _cusFangwenjiluService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "02").ToList();
+                    youjianDTO.benyueshuliang = youjiansyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var youjiansri = youjiansyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    youjianDTO.benrishuliang = youjiansri.Count.ToString();
+
+                    var jijianiyoujian = fiPiecerateDTOs.Where(x => x.Project == "缇ゅ彂閭欢").FirstOrDefault();
+
+                    if (jijianiyoujian != null)
                     {
-                        zhengcaizhishiDTO.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 (decimal.Parse(zhengcaizhishiDTO.benyueshuliang) > 0 || decimal.Parse(zhengcaizhishiDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
-            #endregion
-
-            #region 鏂板鍏紬鍙峰叧娉�
-            TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
-            gongzhonghaoDTO.gongzuo = "鏂板鍏紬鍙峰叧娉�";
-            var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "鏂板鍏紬鍙峰叧娉�").FirstOrDefault();
-
-            if (jijianigongzhonghao != null)
-            {
-                //鏈湀鏁伴噺
-                var gongzhonghaosyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianigongzhonghao.Id).ToList();
-
-                gongzhonghaoDTO.benyueshuliang = (gongzhonghaosyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var gongzhonghaosri = gongzhonghaosyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                gongzhonghaoDTO.benrishuliang = (gongzhonghaosri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                gongzhonghaoDTO.dangrijixiao = (gongzhonghaosri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianigongzhonghao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        gongzhonghaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        gongzhonghaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (gongzhonghaosri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        gongzhonghaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        gongzhonghaoDTO.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 (decimal.Parse(gongzhonghaoDTO.benyueshuliang) > 0 || decimal.Parse(gongzhonghaoDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(gongzhonghaoDTO);
-            #endregion
-
-            #region 缃戦〉鍒朵綔
-            TongjiBaoBiaoDTO wangyeDTO = new TongjiBaoBiaoDTO();
-            wangyeDTO.gongzuo = "缃戦〉鍒朵綔";
-            var jijianiwangye = fiPiecerateDTOs.Where(x => x.Project == "缃戦〉鍒朵綔").FirstOrDefault();
-
-            if (jijianiwangye != null)
-            {
-                //鏈湀鏁伴噺
-                var wangyesyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiwangye.Id).ToList();
-
-                wangyeDTO.benyueshuliang = (wangyesyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var wangyesri = wangyesyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                wangyeDTO.benrishuliang = (wangyesri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                wangyeDTO.dangrijixiao = (wangyesri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiwangye.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        wangyeDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        wangyeDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (wangyesri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        wangyeDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        wangyeDTO.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 (decimal.Parse(wangyeDTO.benyueshuliang) > 0 || decimal.Parse(wangyeDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(wangyeDTO);
-            #endregion
-
-            #region 鏂板灏忛噰闂
-            TongjiBaoBiaoDTO xinzengwendaDTO = new TongjiBaoBiaoDTO();
-            xinzengwendaDTO.gongzuo = "鏂板灏忛噰闂";
-            //鏈湀鏁伴噺
-            var xinzengwendaDTOsyue = _liaotianService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
-            xinzengwendaDTO.benyueshuliang = xinzengwendaDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var xinzengwendaDTOsri = xinzengwendaDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
-            xinzengwendaDTO.benrishuliang = xinzengwendaDTOsri.Count.ToString();
-
-            var jijianixinzengwenda = fiPiecerateDTOs.Where(x => x.Project == "鏂板灏忛噰闂").FirstOrDefault();
-
-            if (jijianixinzengwenda != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinzengwenda.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        xinzengwendaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        xinzengwendaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiyoujian.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = xinzengwendaDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                xinzengwendaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                youjianDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                youjianDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = youjiansri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        youjianDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                youjianDTO.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);
+                                //    }
 
+                                //}
+                            }
                         }
-
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(youjianDTO.benyueshuliang) > 0 || decimal.Parse(youjianDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(youjianDTO);
+                    #endregion
+
+                    #region 缇ょ粍鎺ㄥ箍
+                    TongjiBaoBiaoDTO qunzutuiguangDTO = new TongjiBaoBiaoDTO();
+                    qunzutuiguangDTO.gongzuo = "缇ょ粍鎺ㄥ箍";
+                    var jijianiqunzutuiguang = fiPiecerateDTOs.Where(x => x.Project == "缇ょ粍鎺ㄥ箍").FirstOrDefault();
+
+                    if (jijianiqunzutuiguang != null)
                     {
-                        xinzengwendaDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = xinzengwendaDTOs.Count - renwujishu;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                        //    }
+                        //鏈湀鏁伴噺
+                        var qunzutuiguangsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiqunzutuiguang.Id).ToList();
 
-                        //}
-                    }
-                }
-            }
-            if (decimal.Parse(xinzengwendaDTO.benyueshuliang) > 0 || decimal.Parse(xinzengwendaDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(xinzengwendaDTO);
-            #endregion
+                        qunzutuiguangDTO.benyueshuliang = (qunzutuiguangsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var qunzutuiguangsri = qunzutuiguangsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        qunzutuiguangDTO.benrishuliang = (qunzutuiguangsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        qunzutuiguangDTO.dangrijixiao = (qunzutuiguangsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
 
-            #region 瀹℃牳灏忛噰绛旈棶
-            TongjiBaoBiaoDTO shenhewendaDTO = new TongjiBaoBiaoDTO();
-            shenhewendaDTO.gongzuo = "瀹℃牳灏忛噰绛旈棶";
-            //鏈湀鏁伴噺
-            var shenhewendaDTOsyue = _liaotianService.GetListsalaryshenhe(Userid, dateminkaoqin, datemaxkaoqin);
-            shenhewendaDTO.benyueshuliang = shenhewendaDTOsyue.Count.ToString();
-            //鏈棩鏁伴噺
-            var shenhewendaDTOsri = shenhewendaDTOsyue.Where(x => x.Shenhetime >= chauxnshijian.Date && x.Shenhetime < chauxnshijian.Date.AddDays(1)).ToList();
-            shenhewendaDTO.benrishuliang = shenhewendaDTOsri.Count.ToString();
-
-            var jijianishenhewenda = fiPiecerateDTOs.Where(x => x.Project == "瀹℃牳灏忛噰绛旈棶").FirstOrDefault();
-
-            if (jijianishenhewenda != null)
-            {
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianishenhewenda.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        shenhewendaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        shenhewendaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        if (jixiaotichengfangan.Tichengstandard == "01")
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiqunzutuiguang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
                         {
-                            decimal youxiaojijian = shenhewendaDTOsri.Count - jixiaotichengfangan.Renwu.Value;
-                            if (youxiaojijian > 0)
+                            if (jixiaotichengfangan.Renwustandard == "01")
                             {
-                                shenhewendaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+
+                                qunzutuiguangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                qunzutuiguangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (qunzutuiguangsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        qunzutuiguangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
                             }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                qunzutuiguangDTO.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);
+                                //    }
 
+                                //}
+                            }
                         }
-
                     }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
+                    if (decimal.Parse(qunzutuiguangDTO.benyueshuliang) > 0 || decimal.Parse(qunzutuiguangDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(qunzutuiguangDTO);
+                    #endregion
+
+                    #region 鏈嬪弸鍦堝師鍒�
+                    TongjiBaoBiaoDTO pengyouquanDTO = new TongjiBaoBiaoDTO();
+                    pengyouquanDTO.gongzuo = "鏈嬪弸鍦堝師鍒�";
+                    var jijianipengyouquan = fiPiecerateDTOs.Where(x => x.Project == "鏈嬪弸鍦堝師鍒�").FirstOrDefault();
+
+                    if (jijianipengyouquan != null)
                     {
-                        shenhewendaDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = shenhewendaDTOs.Count - renwujishu;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                        //    }
+                        //鏈湀鏁伴噺
+                        var pengyouquansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianipengyouquan.Id).ToList();
 
-                        //}
+                        pengyouquanDTO.benyueshuliang = (pengyouquansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var pengyouquansri = pengyouquansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        pengyouquanDTO.benrishuliang = (pengyouquansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        pengyouquanDTO.dangrijixiao = (pengyouquansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianipengyouquan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                pengyouquanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                pengyouquanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (pengyouquansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        pengyouquanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                pengyouquanDTO.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 (decimal.Parse(pengyouquanDTO.benyueshuliang) > 0 || decimal.Parse(pengyouquanDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(pengyouquanDTO);
+                    #endregion
+
+                    #region 璁哄潧鍙戝笘
+                    TongjiBaoBiaoDTO luntanfatieDTO = new TongjiBaoBiaoDTO();
+                    luntanfatieDTO.gongzuo = "璁哄潧鍙戝笘";
+                    var jijianiluntanfatie = fiPiecerateDTOs.Where(x => x.Project == "璁哄潧鍙戝笘").FirstOrDefault();
+
+                    if (jijianiluntanfatie != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var luntanfatiesyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiluntanfatie.Id).ToList();
+
+                        luntanfatieDTO.benyueshuliang = (luntanfatiesyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var luntanfatiesri = luntanfatiesyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        luntanfatieDTO.benrishuliang = (luntanfatiesri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        luntanfatieDTO.dangrijixiao = (luntanfatiesri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiluntanfatie.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                luntanfatieDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                luntanfatieDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (luntanfatiesri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        luntanfatieDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                luntanfatieDTO.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 (decimal.Parse(luntanfatieDTO.benyueshuliang) > 0 || decimal.Parse(luntanfatieDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(luntanfatieDTO);
+                    #endregion
+
+                    #region 璺熷笘璇勮
+                    TongjiBaoBiaoDTO gentiepinglunDTO = new TongjiBaoBiaoDTO();
+                    gentiepinglunDTO.gongzuo = "璺熷笘璇勮";
+                    var jijianigentiepinglun = fiPiecerateDTOs.Where(x => x.Project == "璺熷笘璇勮").FirstOrDefault();
+
+                    if (jijianigentiepinglun != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var gentiepinglunsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianigentiepinglun.Id).ToList();
+
+                        gentiepinglunDTO.benyueshuliang = (gentiepinglunsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var gentiepinglunsri = gentiepinglunsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        gentiepinglunDTO.benrishuliang = (gentiepinglunsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        gentiepinglunDTO.dangrijixiao = (gentiepinglunsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianigentiepinglun.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                gentiepinglunDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                gentiepinglunDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (gentiepinglunsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        gentiepinglunDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                gentiepinglunDTO.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 (decimal.Parse(gentiepinglunDTO.benyueshuliang) > 0 || decimal.Parse(gentiepinglunDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(gentiepinglunDTO);
+                    #endregion
+
+                    #region 杞彂寰俊寰崥
+                    TongjiBaoBiaoDTO zhuanfaDTO = new TongjiBaoBiaoDTO();
+                    zhuanfaDTO.gongzuo = "杞彂寰俊寰崥";
+                    var jijianizhuanfa = fiPiecerateDTOs.Where(x => x.Project == "杞彂寰俊寰崥").FirstOrDefault();
+
+                    if (jijianizhuanfa != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var zhuanfasyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhuanfa.Id).ToList();
+
+                        zhuanfaDTO.benyueshuliang = (zhuanfasyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var zhuanfasri = zhuanfasyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        zhuanfaDTO.benrishuliang = (zhuanfasri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        zhuanfaDTO.dangrijixiao = (zhuanfasri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhuanfa.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                zhuanfaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                zhuanfaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (zhuanfasri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        zhuanfaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                zhuanfaDTO.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 (decimal.Parse(zhuanfaDTO.benyueshuliang) > 0 || decimal.Parse(zhuanfaDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(zhuanfaDTO);
+                    #endregion
+
+                    #region 鏂板鎰忓悜瀹㈡埛锛堣鍗曪級
+                    TongjiBaoBiaoDTO yixiangDTO = new TongjiBaoBiaoDTO();
+                    yixiangDTO.gongzuo = "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級";
+                    //鏈湀鏁伴噺
+                    var yixiangsyue = _intentionCustomerService.GetListsalaryyixiang(Userid, dateminkaoqin, datemaxkaoqin).ToList();
+                    yixiangDTO.benyueshuliang = yixiangsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var yixiangsri = yixiangsyue.Where(x => x.Yixiangtime >= chauxnshijian.Date && x.Yixiangtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    yixiangDTO.benrishuliang = yixiangsri.Count.ToString();
+
+                    var jijianiyixiang = fiPiecerateDTOs.Where(x => x.Project == "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級").FirstOrDefault();
+
+                    if (jijianiyixiang != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiyixiang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                yixiangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                yixiangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = yixiangsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        yixiangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                yixiangDTO.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 (decimal.Parse(yixiangDTO.benyueshuliang) > 0 || decimal.Parse(yixiangDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(yixiangDTO);
+                    #endregion
+
+                    #region 鏂板娉ㄥ唽浼氬憳
+                    TongjiBaoBiaoDTO zhucehuiyuanDTO = new TongjiBaoBiaoDTO();
+                    zhucehuiyuanDTO.gongzuo = "鏂板娉ㄥ唽浼氬憳";
+                    var jijianizhucehuiyuan = fiPiecerateDTOs.Where(x => x.Project == "鏂板娉ㄥ唽浼氬憳").FirstOrDefault();
+
+                    if (jijianizhucehuiyuan != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var zhucehuiyuansyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhucehuiyuan.Id).ToList();
+
+                        zhucehuiyuanDTO.benyueshuliang = (zhucehuiyuansyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var zhucehuiyuansri = zhucehuiyuansyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        zhucehuiyuanDTO.benrishuliang = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        zhucehuiyuanDTO.dangrijixiao = (zhucehuiyuansri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhucehuiyuan.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                zhucehuiyuanDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                zhucehuiyuanDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (zhucehuiyuansri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        zhucehuiyuanDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                zhucehuiyuanDTO.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 (decimal.Parse(zhucehuiyuanDTO.benyueshuliang) > 0 || decimal.Parse(zhucehuiyuanDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(zhucehuiyuanDTO);
+                    #endregion
+
+                    #region 鏂板绛剧害瀹㈡埛
+                    TongjiBaoBiaoDTO qianyueDTO = new TongjiBaoBiaoDTO();
+                    qianyueDTO.gongzuo = "鏂板绛剧害瀹㈡埛";
+                    //鏈湀鏁伴噺
+                    var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+                    qianyueDTO.benyueshuliang = qianyueDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var qianyueDTOsri = qianyueDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    qianyueDTO.benrishuliang = qianyueDTOsri.Count.ToString();
+
+                    var jijianiqianyue = fiPiecerateDTOs.Where(x => x.Project == "鏂板绛剧害瀹㈡埛").FirstOrDefault();
+
+                    if (jijianiqianyue != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiqianyue.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                qianyueDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                qianyueDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = qianyueDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        qianyueDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                qianyueDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = qianyueDTOs.Count - renwujishu;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                //    }
+
+                                //}
+                            }
+                        }
+                    }
+                    if (decimal.Parse(qianyueDTO.benyueshuliang) > 0 || decimal.Parse(qianyueDTO.benrishuliang) > 0)
+                        tuiguangDTOs.Add(qianyueDTO);
+                    #endregion
+
+
+                    List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();
+
+                    #region 涓婇棬鎷滆瀹㈡埛
+                    TongjiBaoBiaoDTO shangmenbanfangDTO = new TongjiBaoBiaoDTO();
+                    shangmenbanfangDTO.gongzuo = "涓婇棬鎷滆瀹㈡埛";
+                    //鏈湀鏁伴噺
+                    var shangmenbanfangDTOsyue = _intentionVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+                    var shangmenbanfangcooperDTOsyue = _cooperVisitService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+                    shangmenbanfangDTO.benyueshuliang = (shangmenbanfangcooperDTOsyue.Count + shangmenbanfangDTOsyue.Count).ToString();
+                    //鏈棩鏁伴噺
+                    var shangmenbanfangDTOsri = shangmenbanfangDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
+                    var shangmenbanfangcooperDTOsri = shangmenbanfangcooperDTOsyue.Where(x => x.Vistime >= chauxnshijian.Date && x.Vistime < chauxnshijian.Date.AddDays(1)).ToList();
+                    shangmenbanfangDTO.benrishuliang = (shangmenbanfangcooperDTOsri.Count + shangmenbanfangDTOsri.Count).ToString();
+
+                    var jijianixiangshangmenbanfang = fiPiecerateDTOs.Where(x => x.Project == "涓婇棬鎷滆瀹㈡埛").FirstOrDefault();
+
+                    if (jijianixiangshangmenbanfang != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixiangshangmenbanfang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+                                //鏈湀瑙勫畾
+                                shangmenbanfangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                //鏈棩瑙勫畾
+                                shangmenbanfangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = shangmenbanfangcooperDTOsri.Count + shangmenbanfangDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        shangmenbanfangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+                                }
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                //鏈湀瑙勫畾
+                                shangmenbanfangDTO.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 (decimal.Parse(shangmenbanfangDTO.benyueshuliang) > 0 || decimal.Parse(shangmenbanfangDTO.benrishuliang) > 0)
+                        baifangkehuDTOs.Add(shangmenbanfangDTO);
+                    #endregion
+
+                    #region 鎺ュ緟鏉ヨ瀹㈡埛
+                    TongjiBaoBiaoDTO jiedailaifangDTO = new TongjiBaoBiaoDTO();
+                    jiedailaifangDTO.gongzuo = "鎺ュ緟鏉ヨ瀹㈡埛";
+                    var jijianijiedailaifang = fiPiecerateDTOs.Where(x => x.Project == "鎺ュ緟鏉ヨ瀹㈡埛").FirstOrDefault();
+
+                    if (jijianijiedailaifang != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var jiedailaifangsyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianijiedailaifang.Id).ToList();
+
+                        jiedailaifangDTO.benyueshuliang = (jiedailaifangsyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var jiedailaifangsri = jiedailaifangsyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        jiedailaifangDTO.benrishuliang = (jiedailaifangsri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        jiedailaifangDTO.dangrijixiao = (jiedailaifangsri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianijiedailaifang.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                jiedailaifangDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                jiedailaifangDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (jiedailaifangsri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        jiedailaifangDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                jiedailaifangDTO.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 (decimal.Parse(jiedailaifangDTO.benyueshuliang) > 0 || decimal.Parse(jiedailaifangDTO.benrishuliang) > 0)
+                        baifangkehuDTOs.Add(jiedailaifangDTO);
+                    #endregion
+
+                    List<TongjiDingDanDTO> dingdanDTOs = new List<TongjiDingDanDTO>();
+
+                    #region 鏂板璁㈠崟
+
+
+                    //鏈湀鏁伴噺
+                    var dingdanDTOsyue = _cooperOrderService.GetListtongji(Userid, dateminkaoqin, datemaxkaoqin);
+                    var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
+
+                    //鏈棩鏁伴噺
+                    var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    foreach (var cooperOrderDTO in dingdanDTOsri)
+                    {
+                        TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
+                        dingdanDTO.dingdanbianhao = cooperOrderDTO.OrderNo;
+                        dingdanDTO.dingdanmingcheng = cooperOrderDTO.OrderTypeName + "-" + cooperOrderDTO.OrderType1Name + (string.IsNullOrEmpty(cooperOrderDTO.OrderType2) ? "" : "-" + cooperOrderDTO.OrderType2);
+                        dingdanDTO.danjia = cooperOrderDTO.Price.Value.ToString("0.##");
+                        dingdanDTO.shuliang = cooperOrderDTO.OrderNum.Value.ToString("0.##");
+                        dingdanDTO.jine = cooperOrderDTO.Money.Value.ToString("0.##");
+                        dingdanDTO.benyueleijijine = benyuezonge.ToString("0.##");
+
+                        dingdanDTOs.Add(dingdanDTO);
+                    }
+                    int dingdanDTOsCount = 1;
+                    if (dingdanDTOs.Count == 0 && benyuezonge == 0)
+                    {
+                        dingdanDTOsCount = 0;
+                    }
+
+                    if (dingdanDTOs.Count == 0)
+                    {
+                        TongjiDingDanDTO dingdanDTO = new TongjiDingDanDTO();
+                        dingdanDTO.benyueleijijine = benyuezonge.ToString("0.##");
+
+                        dingdanDTOs.Add(dingdanDTO);
+                    }
+
+                    #endregion
+
+                    List<TongjiBaoBiaoDTO> ziliaoweihuDTOs = new List<TongjiBaoBiaoDTO>();
+                    #region 鏂伴椈璧勮
+                    TongjiBaoBiaoDTO xinwenzixunDTO = new TongjiBaoBiaoDTO();
+                    xinwenzixunDTO.gongzuo = "鏂伴椈璧勮";
+                    //鏈湀鏁伴噺
+                    DtChannelArticleNewsDTOSearch searchEntity = new DtChannelArticleNewsDTOSearch();
+                    searchEntity.EndTime = datemaxkaoqin;
+                    searchEntity.AddTime = dateminkaoqin;
+                    searchEntity.UserName = curentuser.UserSn;
+                    searchEntity.CategoryId = 3;
+                    var dtChannelArticleNewsDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
+                    xinwenzixunDTO.benyueshuliang = dtChannelArticleNewsDTOs.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var xinwenzixunsri = dtChannelArticleNewsDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
+                    xinwenzixunDTO.benrishuliang = xinwenzixunsri.Count.ToString();
+
+                    var jijianixinwenzixun = fiPiecerateDTOs.Where(x => x.Project == "鏂伴椈璧勮").FirstOrDefault();
+
+                    if (jijianixinwenzixun != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinwenzixun.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                xinwenzixunDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                xinwenzixunDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = xinwenzixunsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        xinwenzixunDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                xinwenzixunDTO.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 (decimal.Parse(xinwenzixunDTO.benyueshuliang) > 0 || decimal.Parse(xinwenzixunDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(xinwenzixunDTO);
+                    #endregion
+
+                    #region 鍏稿瀷妗堜緥
+                    TongjiBaoBiaoDTO dianxinanliDTO = new TongjiBaoBiaoDTO();
+                    dianxinanliDTO.gongzuo = "鍏稿瀷妗堜緥";
+                    //鏈湀鏁伴噺
+                    searchEntity = new DtChannelArticleNewsDTOSearch();
+                    searchEntity.EndTime = datemaxkaoqin;
+                    searchEntity.AddTime = dateminkaoqin;
+                    searchEntity.UserName = curentuser.UserSn;
+                    searchEntity.CategoryId = 85;
+                    var dianxinanDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
+                    dianxinanliDTO.benyueshuliang = dianxinanDTOs.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var dianxinanlisri = dianxinanDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
+                    dianxinanliDTO.benrishuliang = dianxinanlisri.Count.ToString();
+
+                    var jijianidianxinanli = fiPiecerateDTOs.Where(x => x.Project == "鍏稿瀷妗堜緥").FirstOrDefault();
+
+                    if (jijianidianxinanli != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidianxinanli.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                dianxinanliDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                dianxinanliDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = dianxinanlisri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        dianxinanliDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                dianxinanliDTO.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 (decimal.Parse(dianxinanliDTO.benyueshuliang) > 0 || decimal.Parse(dianxinanliDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(dianxinanliDTO);
+                    #endregion
+                    #region 鏀块噰鐭ヨ瘑
+                    TongjiBaoBiaoDTO zhengcaizhishiDTO = new TongjiBaoBiaoDTO();
+                    zhengcaizhishiDTO.gongzuo = "鏀块噰鐭ヨ瘑";
+                    //鏈湀鏁伴噺
+                    searchEntity = new DtChannelArticleNewsDTOSearch();
+                    searchEntity.EndTime = datemaxkaoqin;
+                    searchEntity.AddTime = dateminkaoqin;
+                    searchEntity.UserName = curentuser.UserSn;
+                    searchEntity.CategoryId = 73;
+                    var zhengcaizhishiDTOs = _dtChannelArticleNewsService.GetList(searchEntity);
+                    zhengcaizhishiDTO.benyueshuliang = zhengcaizhishiDTOs.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var zhengcaizhishisri = zhengcaizhishiDTOs.Where(x => x.AddTime >= chauxnshijian.Date && x.AddTime < chauxnshijian.Date.AddDays(1)).ToList();
+                    zhengcaizhishiDTO.benrishuliang = zhengcaizhishisri.Count.ToString();
+
+                    var jijianizhengcaizhishi = fiPiecerateDTOs.Where(x => x.Project == "鏀块噰鐭ヨ瘑").FirstOrDefault();
+
+                    if (jijianizhengcaizhishi != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhengcaizhishi.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                zhengcaizhishiDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                zhengcaizhishiDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = zhengcaizhishisri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        zhengcaizhishiDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                zhengcaizhishiDTO.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 (decimal.Parse(zhengcaizhishiDTO.benyueshuliang) > 0 || decimal.Parse(zhengcaizhishiDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(zhengcaizhishiDTO);
+                    #endregion
+
+                    #region 鏂板鍏紬鍙峰叧娉�
+                    TongjiBaoBiaoDTO gongzhonghaoDTO = new TongjiBaoBiaoDTO();
+                    gongzhonghaoDTO.gongzuo = "鏂板鍏紬鍙峰叧娉�";
+                    var jijianigongzhonghao = fiPiecerateDTOs.Where(x => x.Project == "鏂板鍏紬鍙峰叧娉�").FirstOrDefault();
+
+                    if (jijianigongzhonghao != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var gongzhonghaosyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianigongzhonghao.Id).ToList();
+
+                        gongzhonghaoDTO.benyueshuliang = (gongzhonghaosyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var gongzhonghaosri = gongzhonghaosyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        gongzhonghaoDTO.benrishuliang = (gongzhonghaosri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        gongzhonghaoDTO.dangrijixiao = (gongzhonghaosri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianigongzhonghao.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                gongzhonghaoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                gongzhonghaoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (gongzhonghaosri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        gongzhonghaoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                gongzhonghaoDTO.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 (decimal.Parse(gongzhonghaoDTO.benyueshuliang) > 0 || decimal.Parse(gongzhonghaoDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(gongzhonghaoDTO);
+                    #endregion
+
+                    #region 缃戦〉鍒朵綔
+                    TongjiBaoBiaoDTO wangyeDTO = new TongjiBaoBiaoDTO();
+                    wangyeDTO.gongzuo = "缃戦〉鍒朵綔";
+                    var jijianiwangye = fiPiecerateDTOs.Where(x => x.Project == "缃戦〉鍒朵綔").FirstOrDefault();
+
+                    if (jijianiwangye != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var wangyesyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianiwangye.Id).ToList();
+
+                        wangyeDTO.benyueshuliang = (wangyesyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var wangyesri = wangyesyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        wangyeDTO.benrishuliang = (wangyesri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        wangyeDTO.dangrijixiao = (wangyesri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianiwangye.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                wangyeDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                wangyeDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (wangyesri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        wangyeDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                wangyeDTO.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 (decimal.Parse(wangyeDTO.benyueshuliang) > 0 || decimal.Parse(wangyeDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(wangyeDTO);
+                    #endregion
+
+                    #region 鏂板灏忛噰闂
+                    TongjiBaoBiaoDTO xinzengwendaDTO = new TongjiBaoBiaoDTO();
+                    xinzengwendaDTO.gongzuo = "鏂板灏忛噰闂";
+                    //鏈湀鏁伴噺
+                    var xinzengwendaDTOsyue = _liaotianService.GetListsalary(Userid, dateminkaoqin, datemaxkaoqin);
+                    xinzengwendaDTO.benyueshuliang = xinzengwendaDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var xinzengwendaDTOsri = xinzengwendaDTOsyue.Where(x => x.Createtime >= chauxnshijian.Date && x.Createtime < chauxnshijian.Date.AddDays(1)).ToList();
+                    xinzengwendaDTO.benrishuliang = xinzengwendaDTOsri.Count.ToString();
+
+                    var jijianixinzengwenda = fiPiecerateDTOs.Where(x => x.Project == "鏂板灏忛噰闂").FirstOrDefault();
+
+                    if (jijianixinzengwenda != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianixinzengwenda.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                xinzengwendaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                xinzengwendaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = xinzengwendaDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        xinzengwendaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                xinzengwendaDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = xinzengwendaDTOs.Count - renwujishu;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                //    }
+
+                                //}
+                            }
+                        }
+                    }
+                    if (decimal.Parse(xinzengwendaDTO.benyueshuliang) > 0 || decimal.Parse(xinzengwendaDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(xinzengwendaDTO);
+                    #endregion
+
+                    #region 瀹℃牳灏忛噰绛旈棶
+                    TongjiBaoBiaoDTO shenhewendaDTO = new TongjiBaoBiaoDTO();
+                    shenhewendaDTO.gongzuo = "瀹℃牳灏忛噰绛旈棶";
+                    //鏈湀鏁伴噺
+                    var shenhewendaDTOsyue = _liaotianService.GetListsalaryshenhe(Userid, dateminkaoqin, datemaxkaoqin);
+                    shenhewendaDTO.benyueshuliang = shenhewendaDTOsyue.Count.ToString();
+                    //鏈棩鏁伴噺
+                    var shenhewendaDTOsri = shenhewendaDTOsyue.Where(x => x.Shenhetime >= chauxnshijian.Date && x.Shenhetime < chauxnshijian.Date.AddDays(1)).ToList();
+                    shenhewendaDTO.benrishuliang = shenhewendaDTOsri.Count.ToString();
+
+                    var jijianishenhewenda = fiPiecerateDTOs.Where(x => x.Project == "瀹℃牳灏忛噰绛旈棶").FirstOrDefault();
+
+                    if (jijianishenhewenda != null)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianishenhewenda.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                shenhewendaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                shenhewendaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = shenhewendaDTOsri.Count - jixiaotichengfangan.Renwu.Value;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        shenhewendaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString("0.##");
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                shenhewendaDTO.benyueqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##"); ;
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = shenhewendaDTOs.Count - renwujishu;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                //    }
+
+                                //}
+                            }
+                        }
+                    }
+                    if (decimal.Parse(shenhewendaDTO.benyueshuliang) > 0 || decimal.Parse(shenhewendaDTO.benrishuliang) > 0)
+                        ziliaoweihuDTOs.Add(shenhewendaDTO);
+                    #endregion
+
+                    List<TongjiBaoBiaoDTO> xiangmushishiDTOs = new List<TongjiBaoBiaoDTO>();
+                    #region 鏍囦功鍒朵綔
+                    TongjiBaoBiaoDTO biaoshuzhizuoDTO = new TongjiBaoBiaoDTO();
+                    biaoshuzhizuoDTO.gongzuo = "鏍囦功鍒朵綔";
+                    var jijianibiaoshuzhizuo = fiPiecerateDTOs.Where(x => x.Project == "鏍囦功鍒朵綔").FirstOrDefault();
+
+                    if (jijianibiaoshuzhizuo != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var biaoshuzhizuosyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianibiaoshuzhizuo.Id).ToList();
+
+                        biaoshuzhizuoDTO.benyueshuliang = (biaoshuzhizuosyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var biaoshuzhizuosri = biaoshuzhizuosyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        biaoshuzhizuoDTO.benrishuliang = (biaoshuzhizuosri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        biaoshuzhizuoDTO.dangrijixiao = (biaoshuzhizuosri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianibiaoshuzhizuo.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                biaoshuzhizuoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                biaoshuzhizuoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (biaoshuzhizuosri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        biaoshuzhizuoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                biaoshuzhizuoDTO.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 (decimal.Parse(biaoshuzhizuoDTO.benyueshuliang) > 0 || decimal.Parse(biaoshuzhizuoDTO.benrishuliang) > 0)
+                        xiangmushishiDTOs.Add(biaoshuzhizuoDTO);
+                    #endregion
+
+                    #region 鏍囦功妫�鏌�
+                    TongjiBaoBiaoDTO biaoshujianchaDTO = new TongjiBaoBiaoDTO();
+                    biaoshujianchaDTO.gongzuo = "鏍囦功妫�鏌�";
+                    var jijianibiaoshujiancha = fiPiecerateDTOs.Where(x => x.Project == "鏍囦功妫�鏌�").FirstOrDefault();
+
+                    if (jijianibiaoshujiancha != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var biaoshujianchasyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianibiaoshujiancha.Id).ToList();
+
+                        biaoshujianchaDTO.benyueshuliang = (biaoshujianchasyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var biaoshujianchasri = biaoshujianchasyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        biaoshujianchaDTO.benrishuliang = (biaoshujianchasri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        biaoshujianchaDTO.dangrijixiao = (biaoshujianchasri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianibiaoshujiancha.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                biaoshujianchaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                biaoshujianchaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (biaoshujianchasri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        biaoshujianchaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                biaoshujianchaDTO.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 (decimal.Parse(biaoshujianchaDTO.benyueshuliang) > 0 || decimal.Parse(biaoshujianchaDTO.benrishuliang) > 0)
+                        xiangmushishiDTOs.Add(biaoshujianchaDTO);
+                    #endregion
+
+                    #region 璧疯崏璐ㄧ枒鎶曡瘔
+                    TongjiBaoBiaoDTO zhiyiDTO = new TongjiBaoBiaoDTO();
+                    zhiyiDTO.gongzuo = "璧疯崏璐ㄧ枒鎶曡瘔涔�";
+                    var jijianizhiyi = fiPiecerateDTOs.Where(x => x.Project == "璧疯崏璐ㄧ枒鎶曡瘔涔�").FirstOrDefault();
+
+                    if (jijianizhiyi != null)
+                    {
+                        //鏈湀鏁伴噺
+                        var zhiyisyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhiyi.Id).ToList();
+
+                        zhiyiDTO.benyueshuliang = (zhiyisyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        //鏈棩鏁伴噺
+                        var zhiyisri = zhiyisyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
+                        zhiyiDTO.benrishuliang = (zhiyisri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
+                        zhiyiDTO.dangrijixiao = (zhiyisri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
+
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhiyi.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+
+                                zhiyiDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
+                                zhiyiDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
+                                //if (jixiaotichengfangan.Tichengstandard == "01")
+                                //{
+                                //    decimal youxiaojijian = (zhiyisri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
+                                //    if (youxiaojijian > 0)
+                                //    {
+                                //        zhiyiDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
+                                //    }
+
+                                //}
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                zhiyiDTO.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 (decimal.Parse(zhiyiDTO.benyueshuliang) > 0 || decimal.Parse(zhiyiDTO.benrishuliang) > 0)
+                        xiangmushishiDTOs.Add(zhiyiDTO);
+                    #endregion
+
+
+
+                    TongjibaobiaobaobiaoDTO tongjibaobiaobaobiaoDTO = new TongjibaobiaobaobiaoDTO();
+
+                    tongjibaobiaobaobiaoDTO.tuiguangDTOs = tuiguangDTOs;
+                    tongjibaobiaobaobiaoDTO.baifangkehuDTOs = baifangkehuDTOs;
+                    tongjibaobiaobaobiaoDTO.dingdanDTOs = dingdanDTOs;
+                    tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs = ziliaoweihuDTOs;
+                    tongjibaobiaobaobiaoDTO.xiangmushishiDTOs = xiangmushishiDTOs;
+                    tongjibaobiaobaobiaoDTO.dingdanDTOsCount = dingdanDTOsCount;
+                    tongjibaobiaobaobiaoDTO.UserName = userDTO.UserName;
+
+                    tongjibaobiaobaobiaoDTOs.Add(tongjibaobiaobaobiaoDTO);
+
                 }
+
+
+
             }
-            if (decimal.Parse(shenhewendaDTO.benyueshuliang) > 0 || decimal.Parse(shenhewendaDTO.benrishuliang) > 0)
-                ziliaoweihuDTOs.Add(shenhewendaDTO);
-            #endregion
 
-            List<TongjiBaoBiaoDTO> xiangmushishiDTOs = new List<TongjiBaoBiaoDTO>();
-            #region 鏍囦功鍒朵綔
-            TongjiBaoBiaoDTO biaoshuzhizuoDTO = new TongjiBaoBiaoDTO();
-            biaoshuzhizuoDTO.gongzuo = "鏍囦功鍒朵綔";
-            var jijianibiaoshuzhizuo = fiPiecerateDTOs.Where(x => x.Project == "鏍囦功鍒朵綔").FirstOrDefault();
 
-            if (jijianibiaoshuzhizuo != null)
-            {
-                //鏈湀鏁伴噺
-                var biaoshuzhizuosyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianibiaoshuzhizuo.Id).ToList();
 
-                biaoshuzhizuoDTO.benyueshuliang = (biaoshuzhizuosyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var biaoshuzhizuosri = biaoshuzhizuosyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                biaoshuzhizuoDTO.benrishuliang = (biaoshuzhizuosri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                biaoshuzhizuoDTO.dangrijixiao = (biaoshuzhizuosri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
 
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianibiaoshuzhizuo.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
 
-                        biaoshuzhizuoDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        biaoshuzhizuoDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (biaoshuzhizuosri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        biaoshuzhizuoDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
+            ViewBag.tongjibaobiaobaobiaoDTOs = tongjibaobiaobaobiaoDTOs;
 
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        biaoshuzhizuoDTO.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 (decimal.Parse(biaoshuzhizuoDTO.benyueshuliang) > 0 || decimal.Parse(biaoshuzhizuoDTO.benrishuliang) > 0)
-                xiangmushishiDTOs.Add(biaoshuzhizuoDTO);
-            #endregion
-
-            #region 鏍囦功妫�鏌�
-            TongjiBaoBiaoDTO biaoshujianchaDTO = new TongjiBaoBiaoDTO();
-            biaoshujianchaDTO.gongzuo = "鏍囦功妫�鏌�";
-            var jijianibiaoshujiancha = fiPiecerateDTOs.Where(x => x.Project == "鏍囦功妫�鏌�").FirstOrDefault();
-
-            if (jijianibiaoshujiancha != null)
-            {
-                //鏈湀鏁伴噺
-                var biaoshujianchasyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianibiaoshujiancha.Id).ToList();
-
-                biaoshujianchaDTO.benyueshuliang = (biaoshujianchasyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var biaoshujianchasri = biaoshujianchasyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                biaoshujianchaDTO.benrishuliang = (biaoshujianchasri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                biaoshujianchaDTO.dangrijixiao = (biaoshujianchasri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianibiaoshujiancha.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        biaoshujianchaDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        biaoshujianchaDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (biaoshujianchasri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        biaoshujianchaDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        biaoshujianchaDTO.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 (decimal.Parse(biaoshujianchaDTO.benyueshuliang) > 0 || decimal.Parse(biaoshujianchaDTO.benrishuliang) > 0)
-                xiangmushishiDTOs.Add(biaoshujianchaDTO);
-            #endregion
-
-            #region 璧疯崏璐ㄧ枒鎶曡瘔
-            TongjiBaoBiaoDTO zhiyiDTO = new TongjiBaoBiaoDTO();
-            zhiyiDTO.gongzuo = "璧疯崏璐ㄧ枒鎶曡瘔涔�";
-            var jijianizhiyi = fiPiecerateDTOs.Where(x => x.Project == "璧疯崏璐ㄧ枒鎶曡瘔涔�").FirstOrDefault();
-
-            if (jijianizhiyi != null)
-            {
-                //鏈湀鏁伴噺
-                var zhiyisyue = _admPieceCheckService.GetList(Userid, dateminkaoqin, datemaxkaoqin).Where(x => x.WorkPro == jijianizhiyi.Id).ToList();
-
-                zhiyiDTO.benyueshuliang = (zhiyisyue.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                //鏈棩鏁伴噺
-                var zhiyisri = zhiyisyue.Where(x => x.WorkTime >= chauxnshijian.Date && x.WorkTime < chauxnshijian.Date.AddDays(1)).ToList();
-                zhiyiDTO.benrishuliang = (zhiyisri.Sum(x => x.Shuliang) ?? 0).ToString("0.##");
-                zhiyiDTO.dangrijixiao = (zhiyisri.Sum(x => x.Gongzi) ?? 0).ToString("0.##");
-
-                var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianizhiyi.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                {
-                    if (jixiaotichengfangan.Renwustandard == "01")
-                    {
-
-                        zhiyiDTO.benyueqingkuang = (Yingchuqin * jixiaotichengfangan.Renwu.Value).ToString("0.##");
-                        zhiyiDTO.benriqingkuang = jixiaotichengfangan.Renwu.Value.ToString("0.##");
-                        //if (jixiaotichengfangan.Tichengstandard == "01")
-                        //{
-                        //    decimal youxiaojijian = (zhiyisri.Sum(x => x.Shuliang) ?? 0) - jixiaotichengfangan.Renwu.Value;
-                        //    if (youxiaojijian > 0)
-                        //    {
-                        //        zhiyiDTO.dangrijixiao = Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2).ToString();
-                        //    }
-
-                        //}
-
-                    }
-                    else if (jixiaotichengfangan.Renwustandard == "02")
-                    {
-                        zhiyiDTO.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 (decimal.Parse(zhiyiDTO.benyueshuliang) > 0 || decimal.Parse(zhiyiDTO.benrishuliang) > 0)
-                xiangmushishiDTOs.Add(zhiyiDTO);
-            #endregion
-
-            ViewBag.tuiguangDTOs = tuiguangDTOs;
-            ViewBag.baifangkehuDTOs = baifangkehuDTOs;
-            ViewBag.dingdanDTOs = dingdanDTOs;
-            ViewBag.ziliaoweihuDTOs = ziliaoweihuDTOs;
-            ViewBag.xiangmushishiDTOs = xiangmushishiDTOs;
-
+            ViewBag.Userid = Userids;
             ViewBag.Tongjitime = chauxnshijian.ToString("yyyy-MM-dd");
-            ViewBag.Userid = Userid;
-            ViewData["UserIds"] = _userService.GetList();
+          
+            ViewData["UserIds"] = userDTOs;
 
             return View();
         }
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index 859c2e8..3258c76 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -5,6 +5,7 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using System;
 using System.Collections.Generic;
@@ -26,7 +27,8 @@
         private readonly IConfiguration _configuration;
         private readonly ILiaotianService _liaotianService;
         private readonly IHttpClientFactory _clientFactory;
-        private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
+        private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
+
 
         public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
         {
@@ -34,7 +36,9 @@
             _configuration = factory.CreateScope().ServiceProvider.GetRequiredService<IConfiguration>();
             _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>();
             _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
-            _dtChannelArticleNewsService = factory.CreateScope().ServiceProvider.GetRequiredService<IDtChannelArticleNewsService>();
+            _cooperatecustomCustomerService = factory.CreateScope().ServiceProvider.GetRequiredService<ICooperatecustomCustomerService>();
+
+
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -49,7 +53,7 @@
                 _logger.LogInformation("TimerGetShopUsersService 寮�濮嬫墽琛�");
                 _logger.LogInformation(datenow.ToString("yyyy-MM-dd HH:mm:ss"));
                 //姣忎釜灏忔椂璁$畻涓�娆�
-                if (datenow.Hour <= DateTime.Now.Hour)
+                if (datenow.Hour == DateTime.Now.Hour)
                 //if (true)
                 {
 
@@ -80,17 +84,7 @@
         {
             base.Dispose();
         }
-        public   void ceshi()
-        {
-            DtChannelArticleNewsDTOSearch searchEntity = new DtChannelArticleNewsDTOSearch();
-            searchEntity.EndTime = DateTime.Parse("2021-07-15 12:06:30.893");
-            searchEntity.AddTime = DateTime.Parse("2021-07-01 12:06:30.893");
-            searchEntity.UserName = "yangjiameng";
-            searchEntity.CategoryId = 85;
-           var dtChannelArticleNewsDTOs =  _dtChannelArticleNewsService.GetList(searchEntity);
-
-            _logger.LogInformation("dtChannelArticleNewsDTOs锛�"+ dtChannelArticleNewsDTOs.Count);
-        }
+      
 
         public async Task huoquhuiyuanAsync()
         {
@@ -106,68 +100,17 @@
             resultEntity.Result = false;
 
 
-            //涔﹀煄
-            string result = string.Empty;
-            Uri getUrl = new Uri(Shuchengurl+ GetShopUsers+ "?start=2021-07-1&end=2021-07-12");
-
-            var httpClient = _clientFactory.CreateClient();
-            httpClient.Timeout = new TimeSpan(0, 0, 60);
-            var Result = await httpClient.GetAsync(getUrl);
-            result = Result.Content.ReadAsStringAsync().Result;
-
-
-            _logger.LogInformation("result:" + result);
-
-            //浼氬憳
-           
-            string result1 = string.Empty;
-            Uri postUrl = new Uri(huiyuanurl + GetDateFirstOrderUser);
-
-            JObject questions = new JObject();
-            questions.Add("start", "2021-07-12 12:36:30");
-            questions.Add("end", "2021-07-14 12:36:30");
-
-            string requestJson = questions.ToString();
-
-            using (HttpContent httpContent = new StringContent(requestJson))
-            {
-                httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-
-                var httpClient1 = _clientFactory.CreateClient();
-                httpClient1.Timeout = new TimeSpan(0, 0, 60);
-                var Result1 = await httpClient1.PostAsync(postUrl, httpContent);
-                result1 = Result1.Content.ReadAsStringAsync().Result;
-            }
-
-            _logger.LogInformation("result1:" + result1);
 
 
 
 
-            string result2 = string.Empty;
-            Uri postUrl2 = new Uri(huiyuanurl + GetUserinfoAndRule);
 
-            JObject questions2 = new JObject();
-            questions2.Add("UserID", "248768ac-d083-462a-5bb4-08d940e7bc81");
-
-            string requestJson2 = questions2.ToString();
-
-            using (HttpContent httpContent = new StringContent(requestJson2))
-            {
-                httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
-
-                var httpClient2 = _clientFactory.CreateClient();
-                httpClient2.Timeout = new TimeSpan(0, 0, 60);
-                var Result2 = await httpClient2.PostAsync(postUrl2, httpContent);
-                result2 = Result2.Content.ReadAsStringAsync().Result;
-            }
-
-            _logger.LogInformation("result2:" + result2);
+          
 
 
 
-            using (TransactionScope scope = new TransactionScope())
-            {
+            //using (TransactionScope scope = new TransactionScope())
+            //{
                 //鑾峰彇鏈�鍚庢洿鏂版椂闂�
                 DateTime start = DateTime.Now.AddYears(-10);
                 DateTime end = DateTime.Now;
@@ -182,13 +125,220 @@
                 _logger.LogInformation("end:" + end);
 
 
-                //鑾峰彇瀹㈡埛骞朵笖淇濆瓨鍒板悎浣滃鎴�
+            //鑾峰彇瀹㈡埛骞朵笖淇濆瓨鍒板悎浣滃鎴�
+
+            #region 涔﹀煄
+            string result = string.Empty;
+                Uri getUrl = new Uri(Shuchengurl + GetShopUsers + "?start="+ start.ToString("yyyy-MM-dd HH:mm:ss") + "&end="+ end.ToString("yyyy-MM-dd HH:mm:ss"));
+
+                var httpClient = _clientFactory.CreateClient();
+                httpClient.Timeout = new TimeSpan(0, 0, 60);
+                var Result = await httpClient.GetAsync(getUrl);
+                result = Result.Content.ReadAsStringAsync().Result;
+
+
+                _logger.LogInformation("result:" + result);
+            JObject jobjectresult = (JObject)JsonConvert.DeserializeObject(result);
+
+            if (jobjectresult["code"] != null && jobjectresult["code"].ToString() == "1")
+            {
+                if(jobjectresult["returnObj"] != null && jobjectresult["returnObj"].ToString() != "")
+                {
+
+
+                    JArray hits = (JArray)jobjectresult["returnObj"];
+                    foreach (var hit in hits)
+                    {
+                        string id = hit["id"].ToString().ToLower();
+                        CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.GetList(id).FirstOrDefault();
+                        //濡傛灉涓嶅瓨鍦ㄥ叧鑱斿鎴�
+                        if (cooperatecustomCustomerDTO == null)
+                        {
+
+                            string result2 = string.Empty;
+                            Uri postUrl2 = new Uri(huiyuanurl + GetUserinfoAndRule);
+
+                            JObject questions2 = new JObject();
+                            questions2.Add("UserID", id);
+
+                            string requestJson2 = questions2.ToString();
+
+                            using (HttpContent httpContent = new StringContent(requestJson2))
+                            {
+                                httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+                                var httpClient2 = _clientFactory.CreateClient();
+                                httpClient2.Timeout = new TimeSpan(0, 0, 60);
+                                var Result2 = await httpClient2.PostAsync(postUrl2, httpContent);
+                                result2 = Result2.Content.ReadAsStringAsync().Result;
+                            }
+
+                            _logger.LogInformation("result2:" + result2);
+
+                            JObject jobjectresult2 = (JObject)JsonConvert.DeserializeObject(result2);
+                            if (jobjectresult2["code"] == null && jobjectresult2["code"].ToString() != "1")
+                            {
+                                throw new Exception(jobjectresult2["msg"].ToString());
+                            }
+
+                            JObject jobjectkehu = (JObject)jobjectresult2["data"];
+                            if (jobjectkehu["Name"] == null || jobjectkehu["Name"].ToString() == "")
+                            {
+                                throw new Exception("鏈壘鍒板搴旂殑浼氬憳锛�");
+                            }
+
+
+                            cooperatecustomCustomerDTO = _cooperatecustomCustomerService.GetList("", jobjectkehu["Name"].ToString()).FirstOrDefault();
+                            //濡傛灉涓嶅瓨鍦ㄥ綋鍓嶅悕瀛楃殑瀹㈡埛
+                            if (cooperatecustomCustomerDTO == null)
+                            {
+                                cooperatecustomCustomerDTO = new CooperatecustomCustomerDTO();
+                                cooperatecustomCustomerDTO.Name = jobjectkehu["Name"].ToString();
+                                cooperatecustomCustomerDTO.Tel = jobjectkehu["phonecode"].ToString();
+                                cooperatecustomCustomerDTO.Phone = jobjectkehu["phonecode"].ToString();
+
+                                cooperatecustomCustomerDTO.HuiyuanId = id;
+                                //cooperatecustomCustomerDTO.Remark = hit["personal"].ToString() + "涓嬪崟鏃堕棿" + hit["Firsttime"].ToString();
+                                cooperatecustomCustomerDTO.Khly = "01";
+                                cooperatecustomCustomerDTO.Creater = "1";
+                                cooperatecustomCustomerDTO.Createtime = DateTime.Now;
+                                cooperatecustomCustomerDTO.Modifier = cooperatecustomCustomerDTO.Creater;
+                                cooperatecustomCustomerDTO.Modifytime = cooperatecustomCustomerDTO.Createtime;
+
+                                cooperatecustomCustomerDTO.ShrName = hit["accept_name"].ToString();
+                                cooperatecustomCustomerDTO.ShrTel = hit["mobile"].ToString();
+                                cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString();
+
+                                resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+                                if (!resultEntity.Result)
+                                {
+                                    throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�");
+                                }
+                            }
+                            else
+                            {
+                                cooperatecustomCustomerDTO.HuiyuanId = id;
+                                cooperatecustomCustomerDTO.ShrName = hit["accept_name"].ToString();
+                                cooperatecustomCustomerDTO.ShrTel = hit["mobile"].ToString();
+                                cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString();
+                                resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+                                if (!resultEntity.Result)
+                                {
+                                    throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�");
+                                }
+                            }
+                        }
+                        else
+                        {
+                            cooperatecustomCustomerDTO.HuiyuanId = id;
+                            cooperatecustomCustomerDTO.ShrName = hit["accept_name"].ToString();
+                            cooperatecustomCustomerDTO.ShrTel = hit["mobile"].ToString();
+                            cooperatecustomCustomerDTO.ShrAddress = hit["area"].ToString() + hit["address"].ToString();
+                            resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+                            if (!resultEntity.Result)
+                            {
+                                throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�");
+                            }
+                        }
+
+                    }
+
+                }
+            }
+            else
+            {
+                throw new Exception(jobjectresult["error"].ToString());
+            }
 
 
 
+              
 
-                //淇濆瓨鏈�鍚庢洿鏂版椂闂�
-                if (ssss != null)
+            #endregion
+
+
+            #region 浼氬憳
+            string result1 = string.Empty;
+            Uri postUrl = new Uri(huiyuanurl + GetDateFirstOrderUser);
+
+            JObject questions = new JObject();
+            questions.Add("start", start.ToString("yyyy-MM-dd HH:mm:ss"));
+            questions.Add("end", end.ToString("yyyy-MM-dd HH:mm:ss"));
+
+            string requestJson = questions.ToString();
+
+            using (HttpContent httpContent = new StringContent(requestJson))
+            {
+                httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/json");
+
+                var httpClient1 = _clientFactory.CreateClient();
+                httpClient1.Timeout = new TimeSpan(0, 0, 60);
+                var Result1 = await httpClient1.PostAsync(postUrl, httpContent);
+                result1 = Result1.Content.ReadAsStringAsync().Result;
+            }
+
+            _logger.LogInformation("result1:" + result1);
+            JObject jobject = (JObject)JsonConvert.DeserializeObject(result1);
+
+            if (jobject["code"] != null && jobject["code"].ToString() == "1")
+            {
+                if (jobject["data"] != null && jobject["data"].ToString() != "")
+                {
+                    JArray hits = (JArray)jobject["data"];
+                    foreach (var hit in hits)
+                    {
+                        CooperatecustomCustomerDTO cooperatecustomCustomerDTO = _cooperatecustomCustomerService.GetList(hit["ID"].ToString()).FirstOrDefault();
+                        //濡傛灉涓嶅瓨鍦ㄥ叧鑱斿鎴�
+                        if (cooperatecustomCustomerDTO == null)
+                        {
+                            cooperatecustomCustomerDTO = _cooperatecustomCustomerService.GetList("", hit["Name"].ToString()).FirstOrDefault();
+                            //濡傛灉涓嶅瓨鍦ㄥ綋鍓嶅悕瀛楃殑瀹㈡埛
+                            if (cooperatecustomCustomerDTO == null)
+                            {
+                                cooperatecustomCustomerDTO = new CooperatecustomCustomerDTO();
+                                cooperatecustomCustomerDTO.Name = hit["Name"].ToString();
+                                cooperatecustomCustomerDTO.Tel = hit["PhoneCode"].ToString();
+                                cooperatecustomCustomerDTO.Phone = hit["PhoneCode"].ToString();
+
+                                cooperatecustomCustomerDTO.HuiyuanId = hit["ID"].ToString();
+                                cooperatecustomCustomerDTO.Remark = hit["personal"].ToString() + "涓嬪崟鏃堕棿" + hit["Firsttime"].ToString();
+                                cooperatecustomCustomerDTO.Khly = "01";
+                                cooperatecustomCustomerDTO.Creater = "1";
+                                cooperatecustomCustomerDTO.Createtime = DateTime.Now;
+                                cooperatecustomCustomerDTO.Modifier = cooperatecustomCustomerDTO.Creater;
+                                cooperatecustomCustomerDTO.Modifytime = cooperatecustomCustomerDTO.Createtime;
+
+                                resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+                                if (!resultEntity.Result)
+                                {
+                                    throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�");
+                                }
+                            }
+                            else
+                            {
+                                cooperatecustomCustomerDTO.HuiyuanId = hit["ID"].ToString();
+                                resultEntity = _cooperatecustomCustomerService.save(cooperatecustomCustomerDTO);
+                                if (!resultEntity.Result)
+                                {
+                                    throw new Exception("淇濆瓨鍚堜綔瀹㈡埛:" + cooperatecustomCustomerDTO.Name + "鍑洪敊锛�");
+                                }
+                            }
+                        }
+
+                    }
+                }
+                    
+            }
+            else
+            {
+                throw new Exception(jobject["msg"].ToString());
+            }
+
+            #endregion
+
+
+            //淇濆瓨鏈�鍚庢洿鏂版椂闂�
+            if (ssss != null)
                 {
                     ssss.Updatetime = end;
                 }
@@ -204,8 +354,8 @@
                     throw new Exception("淇濆瓨鏇存柊鏃堕棿鍑洪敊锛�");
                 }
 
-                scope.Complete();
-            }
+            //    scope.Complete();
+            //}
 
              
 
diff --git a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
index 7f88f99..d498739 100644
--- a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
@@ -12,7 +12,16 @@
 
     string Tongjitime = ViewBag.Tongjitime as string;
 
+    string UserName = ViewBag.UserName as string;
+
     int nookcount = dingdanDTOs == null ? 0 : dingdanDTOs.Count;
+
+    int dingdanDTOsCount = ViewBag.dingdanDTOsCount;
+    int tuiguangDTOsCount = tuiguangDTOs.Count;
+    int baifangkehuDTOsCount = baifangkehuDTOs.Count;
+    int ziliaoweihuDTOsCount = ziliaoweihuDTOs.Count;
+    int xiangmushishiDTOsCount = xiangmushishiDTOs.Count;
+    int aaa = 1;
 }
 
 <!DOCTYPE html>
@@ -180,7 +189,7 @@
 </head>
 <body class="gray-bg" style="overflow:auto">
     <button type="button" id="printl" onclick="onprint()">鎵撳嵃</button>
-    <div id="printArea">
+   
         <div class="wrapper wrapper-content" id="ibox-content" style="padding:15px;">
             <div class="row">
                 <div class="col-sm-12">
@@ -193,7 +202,7 @@
 
                             </div>*@
                             <div class="row">
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                <div class="clearfix layer-area" style="padding-bottom:15px;" id="chaxunxiashi">
 
                                     <label class="text-right col-sm-1 col-md-1 control-label">缁熻鏃堕棿</label>
                                     <div class="col-sm-2 col-md-2">
@@ -206,292 +215,322 @@
                                         </a>
                                     </div>
                                 </div>
-                                <div class="">
+                                <div id="printArea">
+                                    <div class="">
 
-                                    <h3>涓�銆佹帹骞�</h3>
+                                        <h3> @UserName </h3>
 
-                                </div>
+                                    </div>
+
+                                    @if (tuiguangDTOsCount > 0)
+                                    {
+                                        <div class="">
+
+                                            <h3>@aaa 銆佹帹骞�</h3>
+
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鎺ㄥ箍宸ヤ綔
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鎺ㄥ箍鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩鎺ㄥ箍鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鎺ㄥ箍宸ヤ綔
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鎺ㄥ箍鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩鎺ㄥ箍鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (tuiguangDTOs != null && tuiguangDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < tuiguangDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@tuiguangDTOs[i].gongzuo</td>
-                                                            <td>@(tuiguangDTOs[i].benyueshuliang=="0"?"":tuiguangDTOs[i].benyueshuliang)</td>
-                                                            <td>@(tuiguangDTOs[i].benyueqingkuang=="0"?"":tuiguangDTOs[i].benyueqingkuang)</td>
-                                                            <td>@(tuiguangDTOs[i].benrishuliang=="0"?"":tuiguangDTOs[i].benrishuliang)</td>
-                                                            <td>@(tuiguangDTOs[i].benriqingkuang=="0"?"":tuiguangDTOs[i].benriqingkuang)</td>
-                                                            <td>@(tuiguangDTOs[i].dangrijixiao=="0"?"":tuiguangDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tuiguangDTOs != null && tuiguangDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tuiguangDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tuiguangDTOs[i].gongzuo</td>
+                                                                    <td>@(tuiguangDTOs[i].benyueshuliang=="0"?"":tuiguangDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(tuiguangDTOs[i].benyueqingkuang=="0"?"":tuiguangDTOs[i].benyueqingkuang)</td>
+                                                                    <td>@(tuiguangDTOs[i].benrishuliang=="0"?"":tuiguangDTOs[i].benrishuliang)</td>
+                                                                    <td>@(tuiguangDTOs[i].benriqingkuang=="0"?"":tuiguangDTOs[i].benriqingkuang)</td>
+                                                                    <td>@(tuiguangDTOs[i].dangrijixiao=="0"?"":tuiguangDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
 
-                                <div class="">
+                                    }
+                                    @if (baifangkehuDTOsCount > 0)
+                                    {
+                                        <div class="">
 
-                                    <h3>浜屻�佹嫓璁垮鎴�</h3>
+                                            <h3>@aaa  銆佹嫓璁垮鎴�</h3>
 
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鎷滆绫诲瀷
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鎷滆鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩鎷滆鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鎷滆绫诲瀷
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鎷滆鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩鎷滆鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (baifangkehuDTOs != null && baifangkehuDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < baifangkehuDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@baifangkehuDTOs[i].gongzuo</td>
-                                                            <td>@(baifangkehuDTOs[i].benyueshuliang=="0"?"": baifangkehuDTOs[i].benyueshuliang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benyueqingkuang=="0"?"": baifangkehuDTOs[i].benyueqingkuang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benrishuliang=="0"?"": baifangkehuDTOs[i].benrishuliang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benriqingkuang=="0"?"": baifangkehuDTOs[i].benriqingkuang)</td>
-                                                            <td>@(baifangkehuDTOs[i].dangrijixiao=="0"?"": baifangkehuDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (baifangkehuDTOs != null && baifangkehuDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < baifangkehuDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@baifangkehuDTOs[i].gongzuo</td>
+                                                                    <td>@(baifangkehuDTOs[i].benyueshuliang=="0"?"": baifangkehuDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(baifangkehuDTOs[i].benyueqingkuang=="0"?"": baifangkehuDTOs[i].benyueqingkuang)</td>
+                                                                    <td>@(baifangkehuDTOs[i].benrishuliang=="0"?"": baifangkehuDTOs[i].benrishuliang)</td>
+                                                                    <td>@(baifangkehuDTOs[i].benriqingkuang=="0"?"": baifangkehuDTOs[i].benriqingkuang)</td>
+                                                                    <td>@(baifangkehuDTOs[i].dangrijixiao=="0"?"": baifangkehuDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
 
-                                <div class="">
+                                    @if (dingdanDTOsCount > 0)
+                                    {
+                                        <div class="">
 
-                                    <h3>涓夈�佹柊澧炶鍗�</h3>
+                                            <h3>@aaa  銆佹柊澧炶鍗�</h3>
 
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    璁㈠崟缂栧彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    璁㈠崟鍚嶇О
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鍗曚环
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    閲戦
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀绱閲戦
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            璁㈠崟缂栧彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            璁㈠崟鍚嶇О
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鍗曚环
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            閲戦
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀绱閲戦
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (dingdanDTOs != null && dingdanDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < dingdanDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@dingdanDTOs[i].dingdanbianhao</td>
-                                                            <td>@dingdanDTOs[i].dingdanmingcheng</td>
-                                                            <td>@(dingdanDTOs[i].danjia == "0"?"": dingdanDTOs[i].danjia)</td>
-                                                            <td>@(dingdanDTOs[i].shuliang == "0"?"": dingdanDTOs[i].shuliang)</td>
-                                                            <td>@(dingdanDTOs[i].jine == "0"?"": dingdanDTOs[i].jine)</td>
-                                                            <td>@(dingdanDTOs[i].benyueleijijine == "0"?"": dingdanDTOs[i].benyueleijijine)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (dingdanDTOs != null && dingdanDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < dingdanDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@dingdanDTOs[i].dingdanbianhao</td>
+                                                                    <td>@dingdanDTOs[i].dingdanmingcheng</td>
+                                                                    <td>@(dingdanDTOs[i].danjia == "0"?"": dingdanDTOs[i].danjia)</td>
+                                                                    <td>@(dingdanDTOs[i].shuliang == "0"?"": dingdanDTOs[i].shuliang)</td>
+                                                                    <td>@(dingdanDTOs[i].jine == "0"?"": dingdanDTOs[i].jine)</td>
+                                                                    <td>@(dingdanDTOs[i].benyueleijijine == "0"?"": dingdanDTOs[i].benyueleijijine)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <div class="">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
+                                    @if (ziliaoweihuDTOsCount > 0)
+                                    {
+                                        <div class="">
 
-                                    <h3>鍥涖�佽祫鏂欑淮鎶�</h3>
+                                            <h3>@aaa 銆佽祫鏂欑淮鎶�</h3>
 
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    璧勬枡绫诲埆
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鏁伴噺
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            璧勬枡绫诲埆
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鏁伴噺
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    鏈棩鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            鏈棩鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (ziliaoweihuDTOs != null && ziliaoweihuDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < ziliaoweihuDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@ziliaoweihuDTOs[i].gongzuo</td>
-                                                            <td>@(ziliaoweihuDTOs[i].benyueshuliang=="0"?"": ziliaoweihuDTOs[i].benyueshuliang)</td>
-                                                            <td>@(ziliaoweihuDTOs[i].benrishuliang=="0"?"": ziliaoweihuDTOs[i].benrishuliang)</td>
-                                                            <td>@(ziliaoweihuDTOs[i].dangrijixiao=="0"?"": ziliaoweihuDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (ziliaoweihuDTOs != null && ziliaoweihuDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < ziliaoweihuDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@ziliaoweihuDTOs[i].gongzuo</td>
+                                                                    <td>@(ziliaoweihuDTOs[i].benyueshuliang=="0"?"": ziliaoweihuDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(ziliaoweihuDTOs[i].benrishuliang=="0"?"": ziliaoweihuDTOs[i].benrishuliang)</td>
+                                                                    <td>@(ziliaoweihuDTOs[i].dangrijixiao=="0"?"": ziliaoweihuDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                    }
 
 
+                                    @if (xiangmushishiDTOsCount > 0)
+                                    {
+                                        <div class="">
 
-                                <div class="">
+                                            <h3>@aaa  銆侀」鐩疄鏂�</h3>
 
-                                    <h3>浜斻�侀」鐩疄鏂�</h3>
-
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    瀹炴柦绫诲埆
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鏁伴噺
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            瀹炴柦绫诲埆
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鏁伴噺
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    鏈棩鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            鏈棩鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (xiangmushishiDTOs != null && xiangmushishiDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < xiangmushishiDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@xiangmushishiDTOs[i].gongzuo</td>
-                                                            <td>@(xiangmushishiDTOs[i].benyueshuliang=="0"?"": xiangmushishiDTOs[i].benyueshuliang)</td>
-                                                            <td>@(xiangmushishiDTOs[i].benrishuliang=="0"?"": xiangmushishiDTOs[i].benrishuliang)</td>
-                                                            <td>@(xiangmushishiDTOs[i].dangrijixiao=="0"?"": xiangmushishiDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (xiangmushishiDTOs != null && xiangmushishiDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < xiangmushishiDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@xiangmushishiDTOs[i].gongzuo</td>
+                                                                    <td>@(xiangmushishiDTOs[i].benyueshuliang=="0"?"": xiangmushishiDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(xiangmushishiDTOs[i].benrishuliang=="0"?"": xiangmushishiDTOs[i].benrishuliang)</td>
+                                                                    <td>@(xiangmushishiDTOs[i].dangrijixiao=="0"?"": xiangmushishiDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
                                 </div>
+                                   
 
 
+
+                                </div>
                             </div>
-                        </div>
                     </div>
                 </div>
             </div>
@@ -500,13 +539,10 @@
         <div class="ibox-content" id="top" style="z-index:100; position:fixed; height:50px; width:100%;bottom:0; text-align: right; padding-top:8px ">
 
         </div>
-    </div>
+     
 </body>
 <script type="text/javascript">
-
-     var hh = document.body.clientHeight+700+(60*@nookcount);;
-        $("#div_content").height(hh);
-
+   
         toastr.options = {
             "closeButton": true,
             "debug": false,
@@ -536,13 +572,17 @@
         //var bodyHtml = document.body.innerHTML;
         //document.body.innerHTML = html;
         $("#printl").hide();
+        $("#chaxunxiashi").hide();
         window.print();
         //document.body.innerHTML = bodyHtml;
         $("#printl").show();
+        $("#chaxunxiashi").show();
     }
     function onprint() {
+     
         var html = $("#printArea").html();
         printHtml(html);
+      
     }
 </script>
 </html>
diff --git a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml
index 4605b3c..0a25a81 100644
--- a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/IndexSuoyou.cshtml
@@ -3,17 +3,36 @@
 @{
     ViewBag.Title = "ServiceCharge";
     Layout = null;
-    List<TongjiBaoBiaoDTO> tuiguangDTOs = ViewBag.tuiguangDTOs as List<TongjiBaoBiaoDTO>;
-    List<TongjiBaoBiaoDTO> baifangkehuDTOs = ViewBag.baifangkehuDTOs as List<TongjiBaoBiaoDTO>;
-    List<TongjiDingDanDTO> dingdanDTOs = ViewBag.dingdanDTOs as List<TongjiDingDanDTO>;
-    List<TongjiBaoBiaoDTO> ziliaoweihuDTOs = ViewBag.ziliaoweihuDTOs as List<TongjiBaoBiaoDTO>;
-    List<TongjiBaoBiaoDTO> xiangmushishiDTOs = ViewBag.xiangmushishiDTOs as List<TongjiBaoBiaoDTO>;
+
 
     List<PltUserDTO> UserIds = ViewData["UserIds"] as List<PltUserDTO>; //鍛樺伐
-
     string Tongjitime = ViewBag.Tongjitime as string;
-    string  Userid = ViewBag.Userid as string;
-    int nookcount = dingdanDTOs == null ? 0 : dingdanDTOs.Count;
+    string[] Userid = ViewBag.Userid as string[];
+
+    List<TongjibaobiaobaobiaoDTO> tongjibaobiaobaobiaoDTOs = ViewBag.tongjibaobiaobaobiaoDTOs as List<TongjibaobiaobaobiaoDTO>;
+
+
+
+
+    //List<TongjiBaoBiaoDTO> tuiguangDTOs = ViewBag.tuiguangDTOs as List<TongjiBaoBiaoDTO>;
+    //List<TongjiBaoBiaoDTO> baifangkehuDTOs = ViewBag.baifangkehuDTOs as List<TongjiBaoBiaoDTO>;
+    //List<TongjiDingDanDTO> dingdanDTOs = ViewBag.dingdanDTOs as List<TongjiDingDanDTO>;
+    //List<TongjiBaoBiaoDTO> ziliaoweihuDTOs = ViewBag.ziliaoweihuDTOs as List<TongjiBaoBiaoDTO>;
+    //List<TongjiBaoBiaoDTO> xiangmushishiDTOs = ViewBag.xiangmushishiDTOs as List<TongjiBaoBiaoDTO>;
+
+
+
+
+    //int dingdanDTOsCount = ViewBag.dingdanDTOsCount;
+    //int tuiguangDTOsCount = tuiguangDTOs.Count;
+    //int baifangkehuDTOsCount = baifangkehuDTOs.Count;
+    //int ziliaoweihuDTOsCount = ziliaoweihuDTOs.Count;
+    //int xiangmushishiDTOsCount = xiangmushishiDTOs.Count;
+    //int aaa = 1;
+
+
+
+
 }
 
 <!DOCTYPE html>
@@ -187,14 +206,14 @@
                 <div class="col-sm-12">
                     <div class="ibox float-e-margins">
 
-                        <div id="div_content" class="ibox-content" style="background-color:white;">
+                        <div id="div_content" class="ibox-content" style="background-color:white;" >
                             @*<div class="" style="text-align: center;">
 
                                     <h1>缁╂晥缁熻</h1>
 
                                 </div>*@
                             <div class="row">
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                <div class="clearfix layer-area" style="padding-bottom:15px;" id="chaxunxiashi">
 
                                     <label class="text-right col-sm-1 col-md-1 control-label">缁熻鏃堕棿</label>
                                     <div class="col-sm-2 col-md-2">
@@ -204,25 +223,25 @@
 
                                     <label class="text-right col-sm-1 col-md-1 control-label">鍛樺伐</label>
                                     <div class="col-sm-2 col-md-2">
-                                        <select id="UserId" class="form-control" name="UserId" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;">
+                                        <select id="UserId" class="form-control" name="UserId" data-placeholder="閫夋嫨 搴忓垪 ..." style="font-weight:normal;" multiple>
                                             <option value="" hassubinfo="true">璇烽�夋嫨</option>
                                             @foreach (var item in UserIds)
                                             {
-                                                @if (!item.Id.Equals(Userid))
-                                                {
-                                                    <option value="@item.Id" hassubinfo="true">
-                                                        @item.UserName
-                                                    </option>
-                                                }
-                                                else
+                                                @if (Userid.Contains(item.Id))
                                                 {
                                                     <option value="@item.Id" hassubinfo="true" selected="selected">
                                                         @item.UserName
                                                     </option>
                                                 }
+                                                else
+                                                {
+                                                    <option value="@item.Id" hassubinfo="true">
+                                                        @item.UserName
+                                                    </option>
+                                                }
 
                                             }
-                                            }
+
 
                                         </select>
 
@@ -234,292 +253,338 @@
                                         </a>
                                     </div>
                                 </div>
-                                <div class="">
 
-                                    <h3>涓�銆佹帹骞�</h3>
+                                @foreach (var tongjibaobiaobaobiaoDTO in tongjibaobiaobaobiaoDTOs)
+                                {
+                                    int aaa = 1;
 
-                                </div>
+                                    <div class="">
+
+                                        <h3> @tongjibaobiaobaobiaoDTO.UserName </h3>
+
+                                    </div>
+
+                                    @if (tongjibaobiaobaobiaoDTO.tuiguangDTOs.Count > 0)
+                                    {
+                                        <div class="">
+
+                                            <h3>@aaa 銆佹帹骞�</h3>
+
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鎺ㄥ箍宸ヤ綔
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鎺ㄥ箍鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩鎺ㄥ箍鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鎺ㄥ箍宸ヤ綔
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鎺ㄥ箍鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩鎺ㄥ箍鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (tuiguangDTOs != null && tuiguangDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < tuiguangDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@tuiguangDTOs[i].gongzuo</td>
-                                                            <td>@(tuiguangDTOs[i].benyueshuliang=="0"?"":tuiguangDTOs[i].benyueshuliang)</td>
-                                                            <td>@(tuiguangDTOs[i].benyueqingkuang=="0"?"":tuiguangDTOs[i].benyueqingkuang)</td>
-                                                            <td>@(tuiguangDTOs[i].benrishuliang=="0"?"":tuiguangDTOs[i].benrishuliang)</td>
-                                                            <td>@(tuiguangDTOs[i].benriqingkuang=="0"?"":tuiguangDTOs[i].benriqingkuang)</td>
-                                                            <td>@(tuiguangDTOs[i].dangrijixiao=="0"?"":tuiguangDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tongjibaobiaobaobiaoDTO.tuiguangDTOs != null && tongjibaobiaobaobiaoDTO.tuiguangDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tongjibaobiaobaobiaoDTO.tuiguangDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].gongzuo</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benyueshuliang=="0"?"": tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benyueqingkuang=="0"?"": tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benyueqingkuang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benrishuliang=="0"?"": tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benrishuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benriqingkuang=="0"?"": tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].benriqingkuang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].dangrijixiao=="0"?"": tongjibaobiaobaobiaoDTO.tuiguangDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
 
-                                <div class="">
+                                    }
 
-                                    <h3>浜屻�佹嫓璁垮鎴�</h3>
 
-                                </div>
+                                    @if (tongjibaobiaobaobiaoDTO.baifangkehuDTOs.Count > 0)
+                                    {
+                                        <div class="">
+
+                                            <h3>@aaa 銆佹嫓璁垮鎴�</h3>
+
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鎷滆绫诲瀷
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鎷滆鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩鎷滆鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈棩浠诲姟
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鎷滆绫诲瀷
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鎷滆鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩鎷滆鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈棩浠诲姟
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (baifangkehuDTOs != null && baifangkehuDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < baifangkehuDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@baifangkehuDTOs[i].gongzuo</td>
-                                                            <td>@(baifangkehuDTOs[i].benyueshuliang=="0"?"": baifangkehuDTOs[i].benyueshuliang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benyueqingkuang=="0"?"": baifangkehuDTOs[i].benyueqingkuang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benrishuliang=="0"?"": baifangkehuDTOs[i].benrishuliang)</td>
-                                                            <td>@(baifangkehuDTOs[i].benriqingkuang=="0"?"": baifangkehuDTOs[i].benriqingkuang)</td>
-                                                            <td>@(baifangkehuDTOs[i].dangrijixiao=="0"?"": baifangkehuDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tongjibaobiaobaobiaoDTO.baifangkehuDTOs != null && tongjibaobiaobaobiaoDTO.baifangkehuDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tongjibaobiaobaobiaoDTO.baifangkehuDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].gongzuo</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benyueshuliang=="0"?"": tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benyueqingkuang=="0"?"": tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benyueqingkuang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benrishuliang=="0"?"": tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benrishuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benriqingkuang=="0"?"": tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].benriqingkuang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].dangrijixiao=="0"?"": tongjibaobiaobaobiaoDTO.baifangkehuDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
 
-                                <div class="">
+                                    @if (tongjibaobiaobaobiaoDTO.dingdanDTOsCount > 0)
+                                    {
+                                        <div class="">
 
-                                    <h3>涓夈�佹柊澧炶鍗�</h3>
+                                            <h3>@aaa  銆佹柊澧炶鍗�</h3>
 
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    璁㈠崟缂栧彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    璁㈠崟鍚嶇О
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鍗曚环
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    閲戦
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀绱閲戦
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            璁㈠崟缂栧彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            璁㈠崟鍚嶇О
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鍗曚环
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            閲戦
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀绱閲戦
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (dingdanDTOs != null && dingdanDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < dingdanDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@dingdanDTOs[i].dingdanbianhao</td>
-                                                            <td>@dingdanDTOs[i].dingdanmingcheng</td>
-                                                            <td>@(dingdanDTOs[i].danjia == "0"?"": dingdanDTOs[i].danjia)</td>
-                                                            <td>@(dingdanDTOs[i].shuliang == "0"?"": dingdanDTOs[i].shuliang)</td>
-                                                            <td>@(dingdanDTOs[i].jine == "0"?"": dingdanDTOs[i].jine)</td>
-                                                            <td>@(dingdanDTOs[i].benyueleijijine == "0"?"": dingdanDTOs[i].benyueleijijine)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tongjibaobiaobaobiaoDTO.dingdanDTOs != null && tongjibaobiaobaobiaoDTO.dingdanDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tongjibaobiaobaobiaoDTO.dingdanDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.dingdanDTOs[i].dingdanbianhao</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.dingdanDTOs[i].dingdanmingcheng</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.dingdanDTOs[i].danjia == "0"?"": tongjibaobiaobaobiaoDTO.dingdanDTOs[i].danjia)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.dingdanDTOs[i].shuliang == "0"?"": tongjibaobiaobaobiaoDTO.dingdanDTOs[i].shuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.dingdanDTOs[i].jine == "0"?"": tongjibaobiaobaobiaoDTO.dingdanDTOs[i].jine)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.dingdanDTOs[i].benyueleijijine == "0"?"": tongjibaobiaobaobiaoDTO.dingdanDTOs[i].benyueleijijine)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
-                                <div class="">
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
+                                    @if (tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs.Count > 0)
+                                    {
+                                        <div class="">
 
-                                    <h3>鍥涖�佽祫鏂欑淮鎶�</h3>
+                                            <h3>@aaa  銆佽祫鏂欑淮鎶�</h3>
 
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    璧勬枡绫诲埆
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鏁伴噺
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            璧勬枡绫诲埆
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鏁伴噺
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    鏈棩鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            鏈棩鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (ziliaoweihuDTOs != null && ziliaoweihuDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < ziliaoweihuDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@ziliaoweihuDTOs[i].gongzuo</td>
-                                                            <td>@(ziliaoweihuDTOs[i].benyueshuliang=="0"?"": ziliaoweihuDTOs[i].benyueshuliang)</td>
-                                                            <td>@(ziliaoweihuDTOs[i].benrishuliang=="0"?"": ziliaoweihuDTOs[i].benrishuliang)</td>
-                                                            <td>@(ziliaoweihuDTOs[i].dangrijixiao=="0"?"": ziliaoweihuDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs != null && tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].gongzuo</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].benyueshuliang=="0"?"": tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].benrishuliang=="0"?"": tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].benrishuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].dangrijixiao=="0"?"": tongjibaobiaobaobiaoDTO.ziliaoweihuDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
+
+                                    }
 
 
+                                    @if (tongjibaobiaobaobiaoDTO.xiangmushishiDTOs.Count > 0)
+                                    {
+                                        <div class="">
 
-                                <div class="">
+                                            <h3>@aaa  銆侀」鐩疄鏂�</h3>
 
-                                    <h3>浜斻�侀」鐩疄鏂�</h3>
-
-                                </div>
+                                        </div>
 
 
 
 
-                                <div class="clearfix layer-area" style="padding-bottom:15px;">
-                                    <table class="pure-table pure-table-bordered" style="width:100%;">
-                                        <thead>
-                                            <tr>
-                                                <th style="width:8%;">
-                                                    搴忓彿
-                                                </th>
-                                                <th style="width:15%;">
-                                                    瀹炴柦绫诲埆
-                                                </th>
-                                                <th style="width:15%;">
-                                                    鏈湀鏁伴噺
-                                                </th>
+                                        <div class="clearfix layer-area" style="padding-bottom:15px;">
+                                            <table class="pure-table pure-table-bordered" style="width:100%;">
+                                                <thead>
+                                                    <tr>
+                                                        <th style="width:8%;">
+                                                            搴忓彿
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            瀹炴柦绫诲埆
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            鏈湀鏁伴噺
+                                                        </th>
 
-                                                <th style="width:15%;">
-                                                    鏈棩鏁伴噺
-                                                </th>
-                                                <th style="width:15%;">
-                                                    褰撴棩缁╂晥鑰冩牳
-                                                </th>
-                                            </tr>
+                                                        <th style="width:15%;">
+                                                            鏈棩鏁伴噺
+                                                        </th>
+                                                        <th style="width:15%;">
+                                                            褰撴棩缁╂晥鑰冩牳
+                                                        </th>
+                                                    </tr>
 
-                                        </thead>
-                                        <tbody>
-                                            @{
-                                                if (xiangmushishiDTOs != null && xiangmushishiDTOs.Count > 0)
-                                                {
-                                                    for (int i = 0; i < xiangmushishiDTOs.Count; i++)
-                                                    {
-                                                        <tr>
-                                                            <td>@(i+1)</td>
-                                                            <td>@xiangmushishiDTOs[i].gongzuo</td>
-                                                            <td>@(xiangmushishiDTOs[i].benyueshuliang=="0"?"": xiangmushishiDTOs[i].benyueshuliang)</td>
-                                                            <td>@(xiangmushishiDTOs[i].benrishuliang=="0"?"": xiangmushishiDTOs[i].benrishuliang)</td>
-                                                            <td>@(xiangmushishiDTOs[i].dangrijixiao=="0"?"": xiangmushishiDTOs[i].dangrijixiao)</td>
-                                                        </tr>
+                                                </thead>
+                                                <tbody>
+                                                    @{
+                                                        if (tongjibaobiaobaobiaoDTO.xiangmushishiDTOs != null && tongjibaobiaobaobiaoDTO.xiangmushishiDTOs.Count > 0)
+                                                        {
+                                                            for (int i = 0; i < tongjibaobiaobaobiaoDTO.xiangmushishiDTOs.Count; i++)
+                                                            {
+                                                                <tr>
+                                                                    <td>@(i+1)</td>
+                                                                    <td>@tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].gongzuo</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].benyueshuliang=="0"?"": tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].benyueshuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].benrishuliang=="0"?"": tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].benrishuliang)</td>
+                                                                    <td>@(tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].dangrijixiao=="0"?"": tongjibaobiaobaobiaoDTO.xiangmushishiDTOs[i].dangrijixiao)</td>
+                                                                </tr>
+                                                            }
+                                                        }
+                                                        aaa = aaa + 1;
                                                     }
-                                                }
-                                            }
-                                        </tbody>
-                                    </table>
-                                </div>
+                                                </tbody>
+                                            </table>
+                                        </div>
+                                    }
 
+
+
+                                }
+
+
+
+
+
+
+
+                            <div class="clearfix layer-area" style="padding-bottom:15px;">
 
                             </div>
-                        </div>
+
+                                </div>
+                            </div>
                     </div>
                 </div>
             </div>
@@ -532,8 +597,8 @@
 </body>
 <script type="text/javascript">
 
-     var hh = document.body.clientHeight+700+(60*@nookcount);;
-        $("#div_content").height(hh);
+     //var hh = document.body.clientHeight+700;
+     //   $("#div_content").height(hh);
 
         toastr.options = {
             "closeButton": true,
@@ -556,7 +621,6 @@
     // 淇濆瓨宀椾綅淇℃伅
     var chaxun = function () {
 
-
         window.location = "/TongjiBaoBiao/IndexSuoyou?Tongjitime=" + $("#Tongjitime").val() + "&userid=" + $("#UserId").val();
     }
 
@@ -564,9 +628,11 @@
         //var bodyHtml = document.body.innerHTML;
         //document.body.innerHTML = html;
         $("#printl").hide();
+        $("#chaxunxiashi").hide();
         window.print();
         //document.body.innerHTML = bodyHtml;
         $("#printl").show();
+        $("#chaxunxiashi").show();
     }
     function onprint() {
         var html = $("#printArea").html();

--
Gitblit v1.9.1