From 265f38a3f69276ae97690da64fb8e42be3a940e5 Mon Sep 17 00:00:00 2001
From: username@email.com <yzy2002yzy@163.com>
Date: 星期五, 16 七月 2021 14:02:28 +0800
Subject: [PATCH] 提交

---
 zhengcaioa/Services/CusFangwenjiluService.cs                       |   17 
 zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs | 1696 ++++++++++++++++++++++++
 zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml   |    2 
 zhengcaioa/IServices/zcweb/IDtChannelArticleNewsService.cs         |   13 
 zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml          |   80 +
 zhengcaioa/zhengcaioa/Startup.cs                                   |   11 
 zhengcaioa/Model/zcweb/DtArticleCategory.cs                        |   27 
 zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml             |   10 
 zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs   |   49 
 zhengcaioa/DTO/TongjiBaoBiaoDTO.cs                                 |   28 
 zhengcaioa/Services/CooperOrderService.cs                          |  174 ++
 zhengcaioa/DTO/zcweb/DtChannelArticleNewsDTO.cs                    |   49 
 zhengcaioa/IServices/IIntentionCustomerService.cs                  |    5 
 zhengcaioa/IServices/ICooperOrderService.cs                        |    3 
 zhengcaioa/Services/LiaotianService.cs                             |   21 
 zhengcaioa/Services/ProjectService.cs                              |   11 
 zhengcaioa/Services/zcweb/DtChannelArticleNewsService.cs           |   48 
 zhengcaioa/Model/zcweb/DtChannelArticleNews.cs                     |   40 
 zhengcaioa/Services/CooperatecustomCustomerService.cs              |   14 
 zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml             |  524 +++++++
 zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs            |   15 
 zhengcaioa/IServices/ILiaotianService.cs                           |    5 
 zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml                 |    8 
 zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs                    |    5 
 zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml             |   10 
 zhengcaioa/IServices/ICusFangwenjiluService.cs                     |    2 
 zhengcaioa/Model/zcweb/zcwebContext.cs                             |  228 +++
 zhengcaioa/Services/FiAccountRecordService.cs                      |    3 
 zhengcaioa/IServices/IProjectService.cs                            |    3 
 zhengcaioa/zhengcaioa/appsettings.Development.json                 |    3 
 zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs              |  951 +++++++++++--
 zhengcaioa/Services/IntentionCustomerService.cs                    |   28 
 zhengcaioa/IServices/ICooperatecustomCustomerService.cs            |    2 
 zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml         |    2 
 zhengcaioa/zhengcaioa/appsettings.json                             |    3 
 35 files changed, 3,891 insertions(+), 199 deletions(-)

diff --git a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
index 9556863..d3d580b 100644
--- a/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
+++ b/zhengcaioa/CommonToolsCore/AutoMapperConfigs.cs
@@ -220,6 +220,11 @@
 
             CreateMap<IntentionVisitDuanxin, IntentionVisitDuanxinDTO>();
             CreateMap<IntentionVisitDuanxinDTO, IntentionVisitDuanxin>();
+
+
+            CreateMap<DtChannelArticleNews, DtChannelArticleNewsDTO>();
+            CreateMap<DtChannelArticleNewsDTO, DtChannelArticleNews>();
+            
         }
     }
 }
diff --git a/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs b/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
new file mode 100644
index 0000000..6c605ef
--- /dev/null
+++ b/zhengcaioa/DTO/TongjiBaoBiaoDTO.cs
@@ -0,0 +1,28 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+    public class TongjiBaoBiaoDTO
+    {
+        public string gongzuo { get; set; }
+        public string benyueshuliang { get; set; }
+        public string benyueqingkuang { get; set; }
+        public string benrishuliang { get; set; }
+        public string benriqingkuang { get; set; }
+        public string dangrijixiao { get; set; }
+    }
+
+
+
+    public class TongjiDingDanDTO
+    {
+        public string dingdanbianhao { get; set; }
+        public string dingdanmingcheng { get; set; }
+        public string danjia { get; set; }
+        public string shuliang { get; set; }
+        public string jine { get; set; }
+        public string benyueleijijine { get; set; }
+    }
+}
diff --git a/zhengcaioa/DTO/zcweb/DtChannelArticleNewsDTO.cs b/zhengcaioa/DTO/zcweb/DtChannelArticleNewsDTO.cs
new file mode 100644
index 0000000..3a492a3
--- /dev/null
+++ b/zhengcaioa/DTO/zcweb/DtChannelArticleNewsDTO.cs
@@ -0,0 +1,49 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace DTO
+{
+    public class DtChannelArticleNewsDTO
+    {
+        public int Id { get; set; }
+        public int SiteId { get; set; }
+        public int ChannelId { get; set; }
+        public int CategoryId { get; set; }
+        public string CallIndex { get; set; }
+        public string Title { get; set; }
+        public string LinkUrl { get; set; }
+        public string ImgUrl { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeywords { get; set; }
+        public string SeoDescription { get; set; }
+        public string Tags { get; set; }
+        public string Zhaiyao { get; set; }
+        public string Content { get; set; }
+        public int SortId { get; set; }
+        public int Click { get; set; }
+        public int Status { get; set; }
+        public int IsMsg { get; set; }
+        public int IsTop { get; set; }
+        public int IsRed { get; set; }
+        public int IsHot { get; set; }
+        public int IsSlide { get; set; }
+        public int IsSys { get; set; }
+        public string UserName { get; set; }
+        public int LikeCount { get; set; }
+        public DateTime AddTime { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public string Source { get; set; }
+        public string Author { get; set; }
+    }
+
+
+    public class DtChannelArticleNewsDTOSearch : SearchEntity
+    {
+        public string UserName { get; set; }
+        public DateTime? AddTime { get; set; }
+
+        public DateTime? EndTime { get; set; }
+        public int CategoryId { get; set; }
+    }
+}
diff --git a/zhengcaioa/IServices/ICooperOrderService.cs b/zhengcaioa/IServices/ICooperOrderService.cs
index 806d3c8..1b0f091 100644
--- a/zhengcaioa/IServices/ICooperOrderService.cs
+++ b/zhengcaioa/IServices/ICooperOrderService.cs
@@ -33,5 +33,8 @@
 
         List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax);
 
+
+        List<CooperOrderDTO> GetListtongji(string userid, DateTime datemin, DateTime datemax);
+
     }
 }
diff --git a/zhengcaioa/IServices/ICooperatecustomCustomerService.cs b/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
index 047e0fb..ed87fca 100644
--- a/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
+++ b/zhengcaioa/IServices/ICooperatecustomCustomerService.cs
@@ -22,5 +22,7 @@
 
 
         List<CooperatecustomCustomerDTO> GetListsalaryqiandan(string userid, DateTime datemin, DateTime datemax);
+
+        List<CooperatecustomCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax);
     }
 }
diff --git a/zhengcaioa/IServices/ICusFangwenjiluService.cs b/zhengcaioa/IServices/ICusFangwenjiluService.cs
index f49e30c..10a4dcc 100644
--- a/zhengcaioa/IServices/ICusFangwenjiluService.cs
+++ b/zhengcaioa/IServices/ICusFangwenjiluService.cs
@@ -17,5 +17,7 @@
         ResultEntity ModifyStatus(string id, string userid);
 
         List<CusFangwenjiluDTO> GetList();
+
+        List<CusFangwenjiluDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
     }
 }
diff --git a/zhengcaioa/IServices/IIntentionCustomerService.cs b/zhengcaioa/IServices/IIntentionCustomerService.cs
index 157ea7f..ff1959d 100644
--- a/zhengcaioa/IServices/IIntentionCustomerService.cs
+++ b/zhengcaioa/IServices/IIntentionCustomerService.cs
@@ -32,5 +32,10 @@
 
         List<IntentionCustomerDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
 
+
+        List<IntentionCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax);
+
+        List<IntentionCustomerDTO> GetListsalaryyixiang(string userid, DateTime datemin, DateTime datemax);
+
     }
 }
diff --git a/zhengcaioa/IServices/ILiaotianService.cs b/zhengcaioa/IServices/ILiaotianService.cs
index 91446d7..64e8b89 100644
--- a/zhengcaioa/IServices/ILiaotianService.cs
+++ b/zhengcaioa/IServices/ILiaotianService.cs
@@ -31,5 +31,10 @@
 
         ResultEntity saveSysUpdatetime(SysUpdatetime sysUpdatetime);
 
+
+        List<LiaotianDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
+
+        List<LiaotianDTO> GetListsalaryshenhe(string userid, DateTime datemin, DateTime datemax);
+
     }
 }
diff --git a/zhengcaioa/IServices/IProjectService.cs b/zhengcaioa/IServices/IProjectService.cs
index 7654fe2..c486381 100644
--- a/zhengcaioa/IServices/IProjectService.cs
+++ b/zhengcaioa/IServices/IProjectService.cs
@@ -36,5 +36,8 @@
 
         List<ProjectDTO> GetList();
 
+
+        List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax);
+
     }
 }
diff --git a/zhengcaioa/IServices/zcweb/IDtChannelArticleNewsService.cs b/zhengcaioa/IServices/zcweb/IDtChannelArticleNewsService.cs
new file mode 100644
index 0000000..bc770b8
--- /dev/null
+++ b/zhengcaioa/IServices/zcweb/IDtChannelArticleNewsService.cs
@@ -0,0 +1,13 @@
+锘縰sing DTO;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using zhengcaioa.Models;
+
+namespace IServices
+{
+    public interface IDtChannelArticleNewsService
+    {
+        List<DtChannelArticleNewsDTO> GetList(DtChannelArticleNewsDTOSearch searchEntity);
+    }
+}
diff --git a/zhengcaioa/Model/zcweb/DtArticleCategory.cs b/zhengcaioa/Model/zcweb/DtArticleCategory.cs
new file mode 100644
index 0000000..720211d
--- /dev/null
+++ b/zhengcaioa/Model/zcweb/DtArticleCategory.cs
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class DtArticleCategory
+    {
+        public int Id { get; set; }
+        public int? SiteId { get; set; }
+        public int ChannelId { get; set; }
+        public string Title { get; set; }
+        public string CallIndex { get; set; }
+        public int? ParentId { get; set; }
+        public string ClassList { get; set; }
+        public int? ClassLayer { get; set; }
+        public int? SortId { get; set; }
+        public string LinkUrl { get; set; }
+        public string ImgUrl { get; set; }
+        public string Content { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeywords { get; set; }
+        public string SeoDescription { get; set; }
+        public byte? IsLock { get; set; }
+    }
+}
diff --git a/zhengcaioa/Model/zcweb/DtChannelArticleNews.cs b/zhengcaioa/Model/zcweb/DtChannelArticleNews.cs
new file mode 100644
index 0000000..6df3e74
--- /dev/null
+++ b/zhengcaioa/Model/zcweb/DtChannelArticleNews.cs
@@ -0,0 +1,40 @@
+锘縰sing System;
+using System.Collections.Generic;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class DtChannelArticleNews
+    {
+        public int Id { get; set; }
+        public int SiteId { get; set; }
+        public int ChannelId { get; set; }
+        public int CategoryId { get; set; }
+        public string CallIndex { get; set; }
+        public string Title { get; set; }
+        public string LinkUrl { get; set; }
+        public string ImgUrl { get; set; }
+        public string SeoTitle { get; set; }
+        public string SeoKeywords { get; set; }
+        public string SeoDescription { get; set; }
+        public string Tags { get; set; }
+        public string Zhaiyao { get; set; }
+        public string Content { get; set; }
+        public int SortId { get; set; }
+        public int Click { get; set; }
+        public int Status { get; set; }
+        public int IsMsg { get; set; }
+        public int IsTop { get; set; }
+        public int IsRed { get; set; }
+        public int IsHot { get; set; }
+        public int IsSlide { get; set; }
+        public int IsSys { get; set; }
+        public string UserName { get; set; }
+        public int LikeCount { get; set; }
+        public DateTime AddTime { get; set; }
+        public DateTime? UpdateTime { get; set; }
+        public string Source { get; set; }
+        public string Author { get; set; }
+    }
+}
diff --git a/zhengcaioa/Model/zcweb/zcwebContext.cs b/zhengcaioa/Model/zcweb/zcwebContext.cs
new file mode 100644
index 0000000..40074bb
--- /dev/null
+++ b/zhengcaioa/Model/zcweb/zcwebContext.cs
@@ -0,0 +1,228 @@
+锘縰sing System;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata;
+
+#nullable disable
+
+namespace zhengcaioa.Models
+{
+    public partial class zcwebContext : DbContext
+    {
+        public zcwebContext()
+        {
+        }
+
+        public zcwebContext(DbContextOptions<zcwebContext> options)
+            : base(options)
+        {
+        }
+
+        public virtual DbSet<DtArticleCategory> DtArticleCategories { get; set; }
+        public virtual DbSet<DtChannelArticleNews> DtChannelArticleNews { get; set; }
+
+        protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+        {
+            if (!optionsBuilder.IsConfigured)
+            {
+#warning To protect potentially sensitive information in your connection string, you should move it out of source code. You can avoid scaffolding the connection string by using the Name= syntax to read it from configuration - see https://go.microsoft.com/fwlink/?linkid=2131148. For more guidance on storing connection strings, see http://go.microsoft.com/fwlink/?LinkId=723263.
+                optionsBuilder.UseSqlServer("Data Source=.;Initial Catalog=zcweb;User ID=sa;Password=123456");
+            }
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            modelBuilder.HasAnnotation("Relational:Collation", "Chinese_PRC_CI_AS");
+
+            modelBuilder.Entity<DtArticleCategory>(entity =>
+            {
+                entity.ToTable("dt_article_category");
+
+                entity.HasComment("鏂囩珷绫诲埆琛�");
+
+                entity.Property(e => e.Id)
+                    .HasColumnName("id")
+                    .HasComment("鑷ID");
+
+                entity.Property(e => e.CallIndex)
+                    .HasMaxLength(50)
+                    .HasColumnName("call_index")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("璋冪敤鍒悕");
+
+                entity.Property(e => e.ChannelId)
+                    .HasColumnName("channel_id")
+                    .HasComment("棰戦亾ID");
+
+                entity.Property(e => e.ClassLayer)
+                    .HasColumnName("class_layer")
+                    .HasDefaultValueSql("((0))")
+                    .HasComment("绫诲埆娣卞害");
+
+                entity.Property(e => e.ClassList)
+                    .HasMaxLength(500)
+                    .HasColumnName("class_list")
+                    .HasComment("绫诲埆ID鍒楄〃(閫楀彿鍒嗛殧寮�)");
+
+                entity.Property(e => e.Content)
+                    .HasColumnType("ntext")
+                    .HasColumnName("content")
+                    .HasComment("澶囨敞璇存槑");
+
+                entity.Property(e => e.ImgUrl)
+                    .HasMaxLength(255)
+                    .HasColumnName("img_url")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("鍥剧墖鍦板潃");
+
+                entity.Property(e => e.IsLock)
+                    .HasColumnName("is_lock")
+                    .HasDefaultValueSql("((0))")
+                    .HasComment("鐘舵��0姝ｅ父1绂佺敤");
+
+                entity.Property(e => e.LinkUrl)
+                    .HasMaxLength(255)
+                    .HasColumnName("link_url")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("URL璺宠浆鍦板潃");
+
+                entity.Property(e => e.ParentId)
+                    .HasColumnName("parent_id")
+                    .HasDefaultValueSql("((0))")
+                    .HasComment("鐖剁被鍒獻D");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_description")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("SEO鎻忚堪");
+
+                entity.Property(e => e.SeoKeywords)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_keywords")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("SEO鍏冲仴瀛�");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_title")
+                    .HasDefaultValueSql("('')")
+                    .HasComment("SEO鏍囬");
+
+                entity.Property(e => e.SiteId)
+                    .HasColumnName("site_id")
+                    .HasDefaultValueSql("((0))")
+                    .HasComment("绔欑偣ID");
+
+                entity.Property(e => e.SortId)
+                    .HasColumnName("sort_id")
+                    .HasDefaultValueSql("((99))")
+                    .HasComment("鎺掑簭鏁板瓧");
+
+                entity.Property(e => e.Title)
+                    .HasMaxLength(100)
+                    .HasColumnName("title")
+                    .HasComment("绫诲埆鏍囬");
+            });
+
+            modelBuilder.Entity<DtChannelArticleNews>(entity =>
+            {
+                entity.ToTable("dt_channel_article_news");
+
+                entity.Property(e => e.Id).HasColumnName("id");
+
+                entity.Property(e => e.AddTime)
+                    .HasColumnType("datetime")
+                    .HasColumnName("add_time")
+                    .HasDefaultValueSql("(getdate())");
+
+                entity.Property(e => e.Author)
+                    .HasMaxLength(50)
+                    .HasColumnName("author");
+
+                entity.Property(e => e.CallIndex)
+                    .HasMaxLength(50)
+                    .HasColumnName("call_index");
+
+                entity.Property(e => e.CategoryId).HasColumnName("category_id");
+
+                entity.Property(e => e.ChannelId).HasColumnName("channel_id");
+
+                entity.Property(e => e.Click).HasColumnName("click");
+
+                entity.Property(e => e.Content)
+                    .HasColumnType("ntext")
+                    .HasColumnName("content");
+
+                entity.Property(e => e.ImgUrl)
+                    .HasMaxLength(255)
+                    .HasColumnName("img_url");
+
+                entity.Property(e => e.IsHot).HasColumnName("is_hot");
+
+                entity.Property(e => e.IsMsg).HasColumnName("is_msg");
+
+                entity.Property(e => e.IsRed).HasColumnName("is_red");
+
+                entity.Property(e => e.IsSlide).HasColumnName("is_slide");
+
+                entity.Property(e => e.IsSys).HasColumnName("is_sys");
+
+                entity.Property(e => e.IsTop).HasColumnName("is_top");
+
+                entity.Property(e => e.LikeCount).HasColumnName("like_count");
+
+                entity.Property(e => e.LinkUrl)
+                    .HasMaxLength(255)
+                    .HasColumnName("link_url");
+
+                entity.Property(e => e.SeoDescription)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_description");
+
+                entity.Property(e => e.SeoKeywords)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_keywords");
+
+                entity.Property(e => e.SeoTitle)
+                    .HasMaxLength(255)
+                    .HasColumnName("seo_title");
+
+                entity.Property(e => e.SiteId).HasColumnName("site_id");
+
+                entity.Property(e => e.SortId)
+                    .HasColumnName("sort_id")
+                    .HasDefaultValueSql("((99))");
+
+                entity.Property(e => e.Source)
+                    .HasMaxLength(50)
+                    .HasColumnName("source");
+
+                entity.Property(e => e.Status).HasColumnName("status");
+
+                entity.Property(e => e.Tags)
+                    .HasMaxLength(500)
+                    .HasColumnName("tags");
+
+                entity.Property(e => e.Title)
+                    .HasMaxLength(100)
+                    .HasColumnName("title");
+
+                entity.Property(e => e.UpdateTime)
+                    .HasColumnType("datetime")
+                    .HasColumnName("update_time");
+
+                entity.Property(e => e.UserName)
+                    .HasMaxLength(100)
+                    .HasColumnName("user_name");
+
+                entity.Property(e => e.Zhaiyao)
+                    .HasMaxLength(255)
+                    .HasColumnName("zhaiyao");
+            });
+
+            OnModelCreatingPartial(modelBuilder);
+        }
+
+        partial void OnModelCreatingPartial(ModelBuilder modelBuilder);
+    }
+}
diff --git a/zhengcaioa/Services/CooperOrderService.cs b/zhengcaioa/Services/CooperOrderService.cs
index ad7f7a2..3025329 100644
--- a/zhengcaioa/Services/CooperOrderService.cs
+++ b/zhengcaioa/Services/CooperOrderService.cs
@@ -720,7 +720,7 @@
         public List<CooperOrderDTO> GetList(string userid, DateTime datemin, DateTime datemax)
         {
 
-            var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Creater == userid && x.Shoulitime >= datemin && x.Shoulitime < datemax).ToList();
+            var entity = _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax).ToList();
 
 
 
@@ -729,5 +729,177 @@
 
             return result;
         }
+
+        public List<CooperOrderDTO> GetListtongji(string userid, DateTime datemin, DateTime datemax)
+        {
+            var listCode = (from a in _context.SysCodeDtls
+                            join b in _context.SysCodes
+                            on a.CodeId equals b.Id
+                            where a.RecStatus == "A"
+                                          && b.RecStatus == "A"
+                            select new CodeDataEntity()
+                            {
+                                CodeId = b.Id,
+                                CodeTable = b.CodeTable,
+                                CodeField = b.CodeField,
+                                CodeSn = a.CodeSn,
+                                Comments = a.Comments,
+                                Contents = a.Contents,
+                                RecStatus = a.RecStatus,
+                                Sort = a.Sort
+                            });
+
+
+
+
+            var entity = (from a in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.ShouliStatus != "0" && x.Creater == userid && x.Createtime >= datemin && x.Createtime < datemax)
+
+                                          join b in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "shouli_status")
+                                         on a.ShouliStatus equals b.CodeSn
+                                         into bsss
+                                         from bbb in bsss.DefaultIfEmpty()
+
+                                         join c in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "huifang_status")
+                                        on a.HuifangStatus equals c.CodeSn
+                                        into csss
+                                         from ccc in csss.DefaultIfEmpty()
+
+                                         join d in listCode.Where(x => x.CodeTable == "CooperOrder" && x.CodeField == "pingjia_status")
+                                       on a.PingjiaStatus equals d.CodeSn
+                                       into dsss
+                                         from ddd in dsss.DefaultIfEmpty()
+
+                                         join e in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
+                                        on a.ChedanStatus equals e.CodeSn
+                                        into esssss
+                                         from eee in esssss.DefaultIfEmpty()
+
+                                         join f in listCode.Where(x => x.CodeTable == "CooperVisit" && x.CodeField == "jtype")
+                                         on a.OrderType equals f.CodeSn
+                                          into fsssss
+                                         from fff in fsssss.DefaultIfEmpty()
+
+
+                                         join g in _context.CooperatecustomCustomers.Where(x => x.RecStatus == "A")
+                                          on a.Khdw equals g.Id
+                                         into gsss
+                                         from ggg in gsss.DefaultIfEmpty()
+
+                                         join h in _context.Projects.Where(x => x.RecStatus == "A")
+                                        on a.OrderPro equals h.Id
+                                       into hsss
+                                         from hhh in hsss.DefaultIfEmpty()
+
+                                         join i in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
+                                       on a.WangongStatus equals i.CodeSn
+                                       into isssss
+                                         from iii in isssss.DefaultIfEmpty()
+
+                                         join j in listCode.Where(x => x.CodeTable == "system" && x.CodeField == "shifou")
+                                       on a.SonghuoStatus equals j.CodeSn
+                                       into jsssss
+                                         from jjj in jsssss.DefaultIfEmpty()
+
+                                         join k in _context.Oayouhuis.Where(x => x.Recstatus == "A")
+                                      on a.Id equals k.CooperOrderId
+                                      into ksssss
+                                         from kkk in ksssss.DefaultIfEmpty()
+
+                                         join l in _context.FiBooks
+                                    on a.OrderType1 equals l.Id
+                                    into lsssss
+                                         from lll in lsssss.DefaultIfEmpty()
+
+                                         join m in _context.FiMembers
+                                   on a.OrderType1 equals m.Id
+                                   into msssss
+                                         from mmm in msssss.DefaultIfEmpty()
+
+                                     
+                                         
+
+
+
+                                         select new CooperOrderDTO
+                                         {
+                                             Id = a.Id,
+                                             XdTime = a.XdTime,
+                                             XdTimeName = a.XdTime.ToString("yyyy-MM-dd"),
+                                             OrderNo = a.OrderNo,
+                                             Khdw = a.Khdw,
+                                             KhdwName = ggg.Name,
+                                             OrderType = a.OrderType,
+                                             OrderTypeName = fff.Comments,
+
+                                             OrderPro = a.OrderPro,
+                                             OrderProName = hhh.Name,
+                                             OrderNum = a.OrderNum,
+
+                                             Price = a.Price,
+                                             Money = a.Money,
+                                             Shr = a.Shr,
+                                             ShrAddress = a.ShrAddress,
+                                             ShrTel = a.ShrTel,
+
+                                             Remark = a.Remark,
+
+                                             Creater = a.Creater,
+                                             Createtime = a.Createtime,
+
+                                             RecStatus = a.RecStatus,
+                                             Modifier = a.Modifier,
+                                             Modifytime = a.Modifytime,
+
+                                             ShouliStatus = a.ShouliStatus,
+                                             ShouliStatusName = bbb.Comments,
+                                             Shoulier = a.Shoulier,
+                                             Shoulitime = a.Shoulitime,
+                                             ChedanStatus = a.ChedanStatus,
+                                             ChedanStatusName = eee.Comments,
+                                             Chedaner = a.Chedaner,
+                                             Chedantime = a.Chedantime,
+                                             Chedan = a.Chedan,
+                                             HuifangStatus = a.HuifangStatus,
+                                             HuifangStatusName = ccc.Comments,
+                                             Huifanger = a.Huifanger,
+                                             Huifangtime = a.Huifangtime,
+                                             Huifangremark = a.Huifangremark,
+                                             PingjiaStatus = a.PingjiaStatus,
+                                             PingjiaStatusName = ddd.Comments,
+                                             Pingjiaer = a.Pingjiaer,
+                                             Pingjiatime = a.Pingjiatime,
+                                             Youhui = a.Youhui,
+                                             Youhuier = a.Youhuier,
+                                             Youhuitime = a.Youhuitime,
+                                             SonghuoStatusName = jjj.Comments,
+                                             SonghuoStatus = a.SonghuoStatus,
+                                             Songhuoer = a.Songhuoer,
+                                             Songhuotime = a.Songhuotime,
+                                             WangongStatusName = iii.Comments,
+                                             WangongStatus = a.WangongStatus,
+                                             Wangonger = a.Wangonger,
+                                             Wangongtime = a.Wangongtime,
+                                             YouhuiStatus = kkk.Id,
+                                             OrderType1 = a.OrderType1,
+                                             OrderType2 = a.OrderType2,
+                                             OrderType1Name = string.IsNullOrEmpty(lll.BookName) ? string.IsNullOrEmpty(mmm.MemberType) ? a.OrderType1 : mmm.MemberType : lll.BookName,
+
+                                             SonghuoGongsi = a.SonghuoGongsi,
+                                             SonghuoDanhao = a.SonghuoDanhao,
+                                             SonghuoTime1 = a.SonghuoTime1,
+                                             HuifangJdr = a.HuifangJdr,
+                                             HuifangKehuyijian = a.HuifangKehuyijian,
+                                         }
+                ).OrderByDescending(x => x.OrderNo).ToList();
+
+
+          
+
+
+            return entity;
+        }
+
+
+        
     }
 }
diff --git a/zhengcaioa/Services/CooperatecustomCustomerService.cs b/zhengcaioa/Services/CooperatecustomCustomerService.cs
index f71cf68..6612153 100644
--- a/zhengcaioa/Services/CooperatecustomCustomerService.cs
+++ b/zhengcaioa/Services/CooperatecustomCustomerService.cs
@@ -205,7 +205,7 @@
                               && (string.IsNullOrWhiteSpace(searchEntity.Sheng) || a.Sheng == searchEntity.Sheng.Trim())
                                && (string.IsNullOrWhiteSpace(searchEntity.City) || a.City == searchEntity.City.Trim())
                                 && (string.IsNullOrWhiteSpace(searchEntity.AreaId) || a.AreaId == searchEntity.AreaId.Trim())
-                                 && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null) )
+                                 && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) ||  a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
                                  && (string.IsNullOrWhiteSpace(searchEntity.HuiyuanId) || a.HuiyuanId == searchEntity.HuiyuanId.Trim())
 
                          select new CooperatecustomCustomerDTO
@@ -328,7 +328,7 @@
 
 
             var listPosition =( from a in _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Creater == userid)
-                                join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Shoulitime >= datemin && x.Shoulitime < datemax)
+                                join b in _context.CooperOrders.Where(x => x.RecStatus == "A" && x.Createtime >= datemin && x.Createtime < datemax)
                                 on a.Id equals b.Khdw 
 
                                 select a
@@ -337,5 +337,15 @@
             var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
             return list;
         }
+
+        public List<CooperatecustomCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.CooperatecustomCustomers.Where(r => r.RecStatus == "A" && r.Weixiner == userid && r.Weixintime >= datemin && r.Weixintime < datemax).ToList();
+
+            var list = _mapper.Map<List<CooperatecustomCustomerDTO>>(listPosition);
+            return list;
+        }
     }
 }
diff --git a/zhengcaioa/Services/CusFangwenjiluService.cs b/zhengcaioa/Services/CusFangwenjiluService.cs
index cdf636d..4db882f 100644
--- a/zhengcaioa/Services/CusFangwenjiluService.cs
+++ b/zhengcaioa/Services/CusFangwenjiluService.cs
@@ -110,5 +110,22 @@
             var list = _mapper.Map<List<CusFangwenjiluDTO>>(listPosition);
             return list;
         }
+
+
+
+        /// <summary>
+        /// 鑾峰彇鎵�鏈夋湁鏁堣鑹�
+        /// </summary>
+        /// <returns></returns>
+        public List<CusFangwenjiluDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.CusFangwenjilus.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+            var list = _mapper.Map<List<CusFangwenjiluDTO>>(listPosition);
+            return list;
+        }
+
     }
 }
diff --git a/zhengcaioa/Services/FiAccountRecordService.cs b/zhengcaioa/Services/FiAccountRecordService.cs
index 3c209b2..2c9013b 100644
--- a/zhengcaioa/Services/FiAccountRecordService.cs
+++ b/zhengcaioa/Services/FiAccountRecordService.cs
@@ -132,7 +132,8 @@
                                   && (string.IsNullOrWhiteSpace(searchEntity.PaymentUnit) || a.PaymentUnit.Contains(searchEntity.PaymentUnit.Trim()))
                                      && (string.IsNullOrWhiteSpace(searchEntity.CreaterName) || y.UserName.Contains(searchEntity.CreaterName.Trim()))
                                         && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
-                                           
+                                           && (string.IsNullOrWhiteSpace(searchEntity.RecordTypeId) || a.RecordTypeId == searchEntity.RecordTypeId.Trim())
+
                          select new FiAccountRecordDTO
                          {
                              Id = a.Id,
diff --git a/zhengcaioa/Services/IntentionCustomerService.cs b/zhengcaioa/Services/IntentionCustomerService.cs
index 7ffaf19..e942f17 100644
--- a/zhengcaioa/Services/IntentionCustomerService.cs
+++ b/zhengcaioa/Services/IntentionCustomerService.cs
@@ -232,7 +232,7 @@
                                 
                                     && (string.IsNullOrWhiteSpace(searchEntity.Yixiangtime) || (a.Yixiangtime >= Yixiangtimestart && a.Yixiangtime <= Yixiangtimeend))
                                       && (string.IsNullOrWhiteSpace(searchEntity.Yixiang) || ( a.Yixiang == searchEntity.Yixiang.Trim() && (a.Ywjl == null || a.Ywjl == searchEntity.YwjlYx) ))
-                                       && (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || (searchEntity.Shifouweixin == "A" && a.Weixin != null) || (searchEntity.Shifouweixin != "A" && a.Weixin == null))
+                                      //&& (string.IsNullOrWhiteSpace(searchEntity.Shifouweixin) || a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim())
                          select new IntentionCustomerDTO
                      {
                          Id = a.Id,
@@ -291,7 +291,10 @@
                              }
                     ).OrderByDescending(x => x.Modifytime).ToList();
 
-
+            if (!string.IsNullOrWhiteSpace(searchEntity.Shifouweixin))
+            {
+                query = query.Where( a=>a.Shifoutianjiaweixin == searchEntity.Shifouweixin.Trim()).ToList();
+            }
 
         if (searchEntity.totalrows == 0)
             searchEntity.totalrows = query.Count();
@@ -371,5 +374,26 @@
             var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
             return list;
         }
+
+        public List<IntentionCustomerDTO> GetListsalaryweixin(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Weixiner == userid && r.Weixintime >= datemin && r.Weixintime < datemax).ToList();
+
+            var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+            return list;
+        }
+
+        public List<IntentionCustomerDTO> GetListsalaryyixiang(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.IntentionCustomers.Where(r => r.RecStatus == "A" && r.Dianxiaozhuanyuan == userid && r.Yixiangtime >= datemin && r.Yixiangtime < datemax).ToList();
+
+            var list = _mapper.Map<List<IntentionCustomerDTO>>(listPosition);
+            return list;
+        }
+
     }
 }
diff --git a/zhengcaioa/Services/LiaotianService.cs b/zhengcaioa/Services/LiaotianService.cs
index 360cf22..f69be5d 100644
--- a/zhengcaioa/Services/LiaotianService.cs
+++ b/zhengcaioa/Services/LiaotianService.cs
@@ -386,5 +386,26 @@
 
             return entity;
         }
+
+
+        public List<LiaotianDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+            var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+            return list;
+        }
+
+        public List<LiaotianDTO> GetListsalaryshenhe(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.Liaotians.Where(r => r.RecStatus == "A" && r.Shenheer == userid && r.Shenhetime >= datemin && r.Shenhetime < datemax).ToList();
+
+            var list = _mapper.Map<List<LiaotianDTO>>(listPosition);
+            return list;
+        }
     }
 }
diff --git a/zhengcaioa/Services/ProjectService.cs b/zhengcaioa/Services/ProjectService.cs
index 37a38d7..05fd927 100644
--- a/zhengcaioa/Services/ProjectService.cs
+++ b/zhengcaioa/Services/ProjectService.cs
@@ -636,5 +636,16 @@
             CacheHelperNetCore.CacheInsert("Projects", list);
             return list;
         }
+
+
+        public List<ProjectDTO> GetListsalary(string userid, DateTime datemin, DateTime datemax)
+        {
+
+
+            var listPosition = _context.Projects.Where(r => r.RecStatus == "A" && r.Creater == userid && r.Createtime >= datemin && r.Createtime < datemax).ToList();
+
+            var list = _mapper.Map<List<ProjectDTO>>(listPosition);
+            return list;
+        }
     }
 }
diff --git a/zhengcaioa/Services/zcweb/DtChannelArticleNewsService.cs b/zhengcaioa/Services/zcweb/DtChannelArticleNewsService.cs
new file mode 100644
index 0000000..c7aa13b
--- /dev/null
+++ b/zhengcaioa/Services/zcweb/DtChannelArticleNewsService.cs
@@ -0,0 +1,48 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.EntityFrameworkCore;
+using zhengcaioa.Models;
+
+namespace Services
+{
+    public class DtChannelArticleNewsService: IDtChannelArticleNewsService
+    {
+        private readonly zcwebContext _context;
+        private readonly IMapper _mapper;
+        public DtChannelArticleNewsService(zcwebContext context, IMapper mapper)
+        {
+            _context = context;
+            _mapper = mapper;
+        }
+
+
+        public List<DtChannelArticleNewsDTO> GetList(DtChannelArticleNewsDTOSearch searchEntity)
+        {
+
+            var entity = (from a in _context.DtChannelArticleNews.Where(x => x.Status == 0)
+                          join b in _context.DtArticleCategories on a.CategoryId equals b.Id
+
+
+                          where a.Status == 0
+                              && (string.IsNullOrWhiteSpace(searchEntity.UserName) || a.UserName == searchEntity.UserName.Trim())
+                                 && ( !searchEntity.AddTime.HasValue || a.AddTime >= searchEntity.AddTime.Value.Date )
+                                  && (!searchEntity.EndTime.HasValue || a.AddTime < searchEntity.EndTime.Value.Date )
+                                 
+                                  && (searchEntity.CategoryId <= 0 || b.ParentId == searchEntity.CategoryId )
+                          select a
+                          ).ToList();
+ 
+
+            var result = _mapper.Map<List<DtChannelArticleNewsDTO>>(entity);
+
+
+            return result;
+        }
+    }
+}
diff --git a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
index a73818b..233c683 100644
--- a/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
+++ b/zhengcaioa/zhengcaioa/Controllers/Finance/FiAccountController.cs
@@ -20,15 +20,20 @@
         private readonly ILogger<FiAccountController> _logger;
         private readonly IFiAccountService _fiAccountService;
         private readonly ILiaotianService _liaotianService;
+        private readonly IFiSubjectService _ifiSubjectService;
+        private readonly IFiAccountRecordService _iFiAccountRecordService;
 
 
 
 
-        public FiAccountController(ILogger<FiAccountController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService)
+        public FiAccountController(ILogger<FiAccountController> logger, IFiAccountService fiAccountService, ILiaotianService liaotianService, IFiSubjectService ifiSubjectService
+            , IFiAccountRecordService iFiAccountRecordService)
         {
             _logger = logger;
             _fiAccountService = fiAccountService;
             _liaotianService = liaotianService;
+            _ifiSubjectService = ifiSubjectService;
+            _iFiAccountRecordService = iFiAccountRecordService;
         }
 
         public IActionResult Index()
@@ -127,8 +132,19 @@
             data.RecStatus = "A";
             if (String.IsNullOrEmpty(data.Id))
             {
+            
                 data.Creater = curentuser.Id;
                 data.Createtime = DateTime.Now;
+              
+
+            }
+            else
+            {
+                var sss = _fiAccountService.Get(data.Id);
+                data.Balance = sss.Balance;
+
+                data.AllIncome = sss.AllIncome;
+                data.AllExpenses = sss.AllExpenses;
             }
             data.Modifier = curentuser.Id;
             data.Modifytime = DateTime.Now;
@@ -152,5 +168,36 @@
             ViewData["curentuser"] = curentuser;
             return new JsonResult(_fiAccountService.ModifyStatus(Id, curentuser.Id));
         }
+
+
+
+
+        public IActionResult Liushuizhang(string id)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            List<ActionEntity> actionlist = new List<ActionEntity>();
+            ActionEntity actionEntity = new ActionEntity();
+            actionEntity.OpenType = 0;
+            actionEntity.ActionUrl = "";
+            actionEntity.ActionFun = "Search";
+            actionEntity.PageIco = "fa fa-search";
+            actionEntity.ActionName = "鏌ヨ";
+            actionlist.Add(actionEntity);
+            
+            ViewData["ActionInfo"] = actionlist;
+            ViewBag.FiSubject = _ifiSubjectService.GetList()/*.Where(x => x.Subjecttype == "02")*/.Select(x => new { code = x.Id, label = x.Subjectname }).ToList();
+            ViewBag.id = id;
+            return View();
+        }
+
+
+        public IActionResult GetListLiushuizhang(FiAccountRecordDTOSearch search)
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+            //search.RecordTypeId = "2";
+            return new JsonResult(_iFiAccountRecordService.SearchByPaging(search));
+        }
     }
 }
diff --git a/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
new file mode 100644
index 0000000..4e5fde7
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Controllers/admin/TongjiBaoBiaoController.cs
@@ -0,0 +1,1696 @@
+锘�
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using AutoMapper;
+using AngleSharp.Html.Parser;
+using DTO;
+using IServices;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Bot.Builder.Integration.AspNet.Core;
+using Microsoft.Extensions.Logging;
+using Newtonsoft.Json;
+using System.Net.Http;
+using System.Threading.Tasks;
+using zhengcaioa.Models;
+using zhengcaioa.IService;
+using CommonToolsCore;
+using Services;
+using System.IO;
+using Microsoft.AspNetCore.Hosting;
+using Grpc.Core;
+using System;
+using System.Transactions;
+
+namespace zhengcaioa.Controllers.Finance
+{
+    [CheckLogin]
+    public class TongjiBaoBiaoController : Controller
+    {
+        private readonly ILogger<TongjiBaoBiaoController> _logger;
+        private readonly IAdmAttendanceRuleService _attendanceRuleService;
+        private readonly IUserService _userService;
+        private readonly IAdmSigninService _signinService;
+        private readonly IAdmAttendanceService _admAttendanceService;
+        private readonly IAdmAttendanceDtlService _admAttendanceDtlService;
+        private readonly IHrSalaryService _hrSalaryService;
+        private readonly IHrJibengongziService _JibengongziService;
+        private readonly ISimService _simService;
+        private readonly IDailyManagementService _DailyManageService;
+        private readonly IAdmBreakPrecedentService _admBreakPrecedentService;
+        private readonly IHrJixiaotichengService _hrJixiaotichengService;
+        private readonly IFiPiecerateService _fiPiecerateService;
+        private readonly IAdmPieceCheckService _admPieceCheckService;
+        private readonly ICooperOrderService _cooperOrderService;
+        private readonly ICooperatecustomCustomerService _cooperatecustomCustomerService;
+        private readonly IGroupTopicService _groupTopicService;
+        private readonly ICooperVisitService _cooperVisitService;
+        private readonly IIntentionCustomerService _intentionCustomerService;
+        private readonly IIntentionVisitService _intentionVisitService;
+        private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
+        private readonly IProjectService _projectService;
+        private readonly ICusFangwenjiluService _cusFangwenjiluService;
+        private readonly ILiaotianService _liaotianService;
+
+
+        public TongjiBaoBiaoController(ILogger<TongjiBaoBiaoController> logger
+            , IAdmAttendanceRuleService attendanceRuleService
+            , IUserService userService
+            , IAdmSigninService signinService
+            , IAdmAttendanceService admAttendanceService
+            , IAdmAttendanceDtlService admAttendanceDtlService
+            , IHrSalaryService hrSalaryService
+            , IHrJibengongziService JibengongziService
+            , ISimService simService
+            , IDailyManagementService DailyManageService
+            , IAdmBreakPrecedentService admBreakPrecedentService
+            , IHrJixiaotichengService hrJixiaotichengService
+            , IFiPiecerateService fiPiecerateService
+            , IAdmPieceCheckService admPieceCheckService
+            , ICooperOrderService cooperOrderService
+            , ICooperatecustomCustomerService cooperatecustomCustomerService
+            , IGroupTopicService groupTopicService
+            , ICooperVisitService cooperVisitService
+            , IIntentionCustomerService intentionCustomerService
+            , IIntentionVisitService intentionVisitService
+            , IDtChannelArticleNewsService dtChannelArticleNewsService
+            , IProjectService projectService
+            , ICusFangwenjiluService cusFangwenjiluService
+            ,ILiaotianService liaotianService)
+        {
+            _logger = logger;
+            _attendanceRuleService = attendanceRuleService;
+            _userService = userService;
+            _signinService = signinService;
+            _admAttendanceService = admAttendanceService;
+            _admAttendanceDtlService = admAttendanceDtlService;
+            _hrSalaryService = hrSalaryService;
+            _JibengongziService = JibengongziService;
+            _simService = simService;
+            _DailyManageService = DailyManageService;
+            _admBreakPrecedentService = admBreakPrecedentService;
+            _hrJixiaotichengService = hrJixiaotichengService;
+            _fiPiecerateService = fiPiecerateService;
+            _admPieceCheckService = admPieceCheckService;
+            _cooperOrderService = cooperOrderService;
+            _cooperatecustomCustomerService = cooperatecustomCustomerService;
+            _groupTopicService = groupTopicService;
+            _cooperVisitService = cooperVisitService;
+            _intentionCustomerService = intentionCustomerService;
+            _intentionVisitService = intentionVisitService;
+            _dtChannelArticleNewsService = dtChannelArticleNewsService;
+            _projectService = projectService;
+            _cusFangwenjiluService = cusFangwenjiluService;
+            _liaotianService = liaotianService;
+        }
+
+        public IActionResult Index()
+        {
+            var curentuser = JsonConvert.DeserializeObject<PltUser>(HttpContext.Session.GetString("User"));
+            ViewData["curentuser"] = curentuser;
+
+          
+
+
+
+
+
+           
+            DateTime dateminkaoqin = new DateTime(DateTime.Now.Year, DateTime.Now.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 == curentuser.HrPosition).ToList();
+
+
+            //璁＄畻姣忔湀宸ヤ綔鏃�
+            while (dateminkaoqin < datemaxkaoqin)
+            {
+                _logger.LogInformation("dateminkaoqin " + dateminkaoqin);
+                //bool iswork = false;
+
+              
+
+                if ((int)dateminkaoqin.DayOfWeek >= admAttendanceRuleDTO.WeekStart && (int)dateminkaoqin.DayOfWeek <= admAttendanceRuleDTO.WeekEnd)
+                {
+                    //鏄惁鑺傚亣鏃�
+                    if (jiejiari.Exists(x => x.ValueStart <= dateminkaoqin && x.ValueEnd >= dateminkaoqin))
+                    {
+                        Offdays += 1;
+                    }
+                    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(DateTime.Now.Year, DateTime.Now.Month, 1);
+
+            List<TongjiBaoBiaoDTO> tuiguangDTOs = new List<TongjiBaoBiaoDTO>();
+
+            #region 閲囪喘椤圭洰褰曞叆
+            TongjiBaoBiaoDTO xiangmuDTO = new TongjiBaoBiaoDTO();
+            xiangmuDTO.gongzuo = "閲囪喘椤圭洰褰曞叆";
+            //鏈湀鏁伴噺
+            var projectDTOsyue = _projectService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            xiangmuDTO.benyueshuliang = projectDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var projectDTOsri = projectDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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")
+                        {
+                            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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(xiangmuDTO);
+            #endregion
+
+
+            #region 瀹㈡埛璧勬枡褰曞叆
+            TongjiBaoBiaoDTO kehuluruDTO = new TongjiBaoBiaoDTO();
+            kehuluruDTO.gongzuo = "瀹㈡埛璧勬枡褰曞叆";
+            //鏈湀鏁伴噺
+            var intentionCustomerDTOsyue = _intentionCustomerService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            kehuluruDTO.benyueshuliang = intentionCustomerDTOsyue.Count .ToString();
+            //鏈棩鏁伴噺
+            var intentionCustomerDTOsri = intentionCustomerDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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")
+                        {
+                            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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(kehuluruDTO);
+            #endregion
+
+            #region 鏂板姞缇ょ粍
+            TongjiBaoBiaoDTO qunzuDTO = new TongjiBaoBiaoDTO();
+            qunzuDTO.gongzuo = "鏂板姞缇ょ粍";
+            //鏈湀鏁伴噺
+            var groupTopicDTOsyue = _groupTopicService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            qunzuDTO.benyueshuliang = groupTopicDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var groupTopicDTOsri = groupTopicDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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)
+                            {
+                                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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(qunzuDTO);
+            #endregion
+
+            #region 鐢佃瘽鎺ㄥ箍
+            TongjiBaoBiaoDTO dianhuatuiguangDTO = new TongjiBaoBiaoDTO();
+            dianhuatuiguangDTO.gongzuo = "鐢佃瘽鎺ㄥ箍";
+            //鏈湀鏁伴噺
+            var intentionVisitDTOsyue = _intentionVisitService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "01").ToList();
+            dianhuatuiguangDTO.benyueshuliang = intentionVisitDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var intentionVisitDTOsri = intentionVisitDTOsyue.Where(x => x.Vistime >= DateTime.Now.Date && x.Vistime < DateTime.Now.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")
+                        {
+                            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")
+                    {
+                        //鏈湀瑙勫畾
+                        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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(dianhuatuiguangDTO);
+            #endregion
+
+            #region 娣诲姞寰俊瀹㈡埛
+            TongjiBaoBiaoDTO weixnDTO = new TongjiBaoBiaoDTO();
+            weixnDTO.gongzuo = "娣诲姞寰俊瀹㈡埛";
+            //鏈湀鏁伴噺
+            var cooperweixinDTOsyue = _cooperatecustomCustomerService.GetListsalaryweixin(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            var intentionweixinDTOsyue = _intentionCustomerService.GetListsalaryweixin(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            weixnDTO.benyueshuliang = (cooperweixinDTOsyue.Count + intentionweixinDTOsyue.Count).ToString();
+            //鏈棩鏁伴噺
+            var cooperweixinDTOsri = cooperweixinDTOsyue.Where(x => x.Weixintime >= DateTime.Now.Date && x.Weixintime < DateTime.Now.Date.AddDays(1)).ToList();
+            var intentionweixinDTOsri = intentionweixinDTOsyue.Where(x => x.Weixintime >= DateTime.Now.Date && x.Weixintime < DateTime.Now.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")
+                        {
+                            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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(weixnDTO);
+            #endregion
+
+            #region 缇ゅ彂鐭俊
+            TongjiBaoBiaoDTO duanxinDTO = new TongjiBaoBiaoDTO();
+            duanxinDTO.gongzuo = "缇ゅ彂鐭俊";
+            //鏈湀鏁伴噺
+            var duanxinsyue = _cusFangwenjiluService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "01").ToList();
+            duanxinDTO.benyueshuliang = duanxinsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var duanxinsri = duanxinsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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)
+                            {
+                                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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(xinhanDTO);
+            #endregion
+
+            #region 缇ゅ彂閭欢
+            TongjiBaoBiaoDTO youjianDTO = new TongjiBaoBiaoDTO();
+            youjianDTO.gongzuo = "缇ゅ彂閭欢";
+            //鏈湀鏁伴噺
+            var youjiansyue = _cusFangwenjiluService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "02").ToList();
+            youjianDTO.benyueshuliang = youjiansyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var youjiansri = youjiansyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(zhuanfaDTO);
+            #endregion
+
+            #region 鏂板鎰忓悜瀹㈡埛锛堣鍗曪級
+            TongjiBaoBiaoDTO yixiangDTO = new TongjiBaoBiaoDTO();
+            yixiangDTO.gongzuo = "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級";
+            //鏈湀鏁伴噺
+            var yixiangsyue = _intentionCustomerService.GetListsalaryyixiang(curentuser.Id, dateminkaoqin, datemaxkaoqin).ToList();
+            yixiangDTO.benyueshuliang = yixiangsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var yixiangsri = yixiangsyue.Where(x => x.Yixiangtime >= DateTime.Now.Date && x.Yixiangtime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(zhucehuiyuanDTO);
+            #endregion
+
+            #region 鏂板绛剧害瀹㈡埛
+            TongjiBaoBiaoDTO qianyueDTO = new TongjiBaoBiaoDTO();
+            qianyueDTO.gongzuo = "鏂板绛剧害瀹㈡埛";
+            //鏈湀鏁伴噺
+            var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            qianyueDTO.benyueshuliang = qianyueDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var qianyueDTOsri = qianyueDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            tuiguangDTOs.Add(qianyueDTO);
+            #endregion
+
+
+            List<TongjiBaoBiaoDTO> baifangkehuDTOs = new List<TongjiBaoBiaoDTO>();
+
+            #region 涓婇棬鎷滆瀹㈡埛
+            TongjiBaoBiaoDTO shangmenbanfangDTO = new TongjiBaoBiaoDTO();
+            shangmenbanfangDTO.gongzuo = "涓婇棬鎷滆瀹㈡埛";
+            //鏈湀鏁伴噺
+            var shangmenbanfangDTOsyue = _intentionVisitService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+            var shangmenbanfangcooperDTOsyue = _cooperVisitService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+            shangmenbanfangDTO.benyueshuliang = (shangmenbanfangcooperDTOsyue.Count + shangmenbanfangDTOsyue.Count).ToString();
+            //鏈棩鏁伴噺
+            var shangmenbanfangDTOsri = shangmenbanfangDTOsyue.Where(x => x.Vistime >= DateTime.Now.Date && x.Vistime < DateTime.Now.Date.AddDays(1)).ToList();
+            var shangmenbanfangcooperDTOsri = shangmenbanfangcooperDTOsyue.Where(x => x.Vistime >= DateTime.Now.Date && x.Vistime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            baifangkehuDTOs.Add(jiedailaifangDTO);
+            #endregion
+
+            List<TongjiDingDanDTO> dingdanDTOs = new List<TongjiDingDanDTO>();
+
+            #region 鏂板璁㈠崟
+          
+           
+            //鏈湀鏁伴噺
+            var dingdanDTOsyue = _cooperOrderService.GetListtongji(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            var benyuezonge = dingdanDTOsyue.Sum(x => x.Money) ?? 0;
+
+            //鏈棩鏁伴噺
+            var dingdanDTOsri = dingdanDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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 >= DateTime.Now.Date && x.AddTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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 >= DateTime.Now.Date && x.AddTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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 >= DateTime.Now.Date && x.AddTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            ziliaoweihuDTOs.Add(wangyeDTO);
+            #endregion
+
+            #region 鏂板灏忛噰闂
+            TongjiBaoBiaoDTO xinzengwendaDTO = new TongjiBaoBiaoDTO();
+            xinzengwendaDTO.gongzuo = "鏂板灏忛噰闂";
+            //鏈湀鏁伴噺
+            var xinzengwendaDTOsyue = _liaotianService.GetListsalary(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            xinzengwendaDTO.benyueshuliang = xinzengwendaDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var xinzengwendaDTOsri = xinzengwendaDTOsyue.Where(x => x.Createtime >= DateTime.Now.Date && x.Createtime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            ziliaoweihuDTOs.Add(xinzengwendaDTO);
+            #endregion
+
+            #region 瀹℃牳灏忛噰绛旈棶
+            TongjiBaoBiaoDTO shenhewendaDTO = new TongjiBaoBiaoDTO();
+            shenhewendaDTO.gongzuo = "瀹℃牳灏忛噰绛旈棶";
+            //鏈湀鏁伴噺
+            var shenhewendaDTOsyue = _liaotianService.GetListsalaryshenhe(curentuser.Id, dateminkaoqin, datemaxkaoqin);
+            shenhewendaDTO.benyueshuliang = shenhewendaDTOsyue.Count.ToString();
+            //鏈棩鏁伴噺
+            var shenhewendaDTOsri = shenhewendaDTOsyue.Where(x => x.Shenhetime >= DateTime.Now.Date && x.Shenhetime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            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(curentuser.Id, 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 >= DateTime.Now.Date && x.WorkTime < DateTime.Now.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);
+                        //    }
+
+                        //}
+                    }
+                }
+            }
+            xiangmushishiDTOs.Add(zhiyiDTO);
+            #endregion
+
+            ViewBag.tuiguangDTOs = tuiguangDTOs;
+            ViewBag.baifangkehuDTOs = baifangkehuDTOs;
+            ViewBag.dingdanDTOs = dingdanDTOs;
+            ViewBag.ziliaoweihuDTOs = ziliaoweihuDTOs;
+            ViewBag.xiangmushishiDTOs = xiangmushishiDTOs;
+
+            return View();
+        }
+    }
+}
diff --git a/zhengcaioa/zhengcaioa/Startup.cs b/zhengcaioa/zhengcaioa/Startup.cs
index 53de1cf..b14aef3 100644
--- a/zhengcaioa/zhengcaioa/Startup.cs
+++ b/zhengcaioa/zhengcaioa/Startup.cs
@@ -68,7 +68,12 @@
 
             var connectionString = Configuration.GetConnectionString("DefaultConnection");
             services.AddDbContext<zhengcaioaContext>(options =>
-            options.UseSqlServer(connectionString));            
+            options.UseSqlServer(connectionString));
+
+            var connectionString1 = Configuration.GetConnectionString("zcwebConnection");
+            services.AddDbContext<zcwebContext>(options =>
+            options.UseSqlServer(connectionString1));
+
             services.AddControllersWithViews();
 
             services.AddScoped(typeof(ISimService), typeof(SimService));
@@ -139,7 +144,9 @@
             services.AddScoped(typeof(IOrderBanciDtlService), typeof(OrderBanciDtlService));
             services.AddScoped(typeof(IOrderBanciService), typeof(OrderBanciService));
             services.AddScoped(typeof(IOrderBanciOrderService), typeof(OrderBanciOrderService));
-            
+
+            //zcweb
+            services.AddScoped(typeof(IDtChannelArticleNewsService), typeof(DtChannelArticleNewsService)); 
 
             //定时执行
             services.AddHostedService<TimedBackgroundService>();
diff --git a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
index fcac78b..7470711 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimedBackgroundService.cs
@@ -37,6 +37,10 @@
         private readonly ICooperVisitService _cooperVisitService;
         private readonly IIntentionCustomerService _intentionCustomerService;
         private readonly IIntentionVisitService _intentionVisitService;
+        private readonly IProjectService _projectService;
+        private readonly ICusFangwenjiluService _cusFangwenjiluService;
+        private readonly ILiaotianService _liaotianService;
+        private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
 
         private readonly decimal jiabangongzibiaozhun = new decimal(21.5);
         public TimedBackgroundService(ILogger<TimedBackgroundService> logger, IServiceScopeFactory factory)
@@ -61,6 +65,11 @@
             _cooperVisitService = factory.CreateScope().ServiceProvider.GetRequiredService<ICooperVisitService>();
             _intentionCustomerService = factory.CreateScope().ServiceProvider.GetRequiredService<IIntentionCustomerService>();
             _intentionVisitService = factory.CreateScope().ServiceProvider.GetRequiredService<IIntentionVisitService>();
+
+            _projectService = factory.CreateScope().ServiceProvider.GetRequiredService<IProjectService>();
+            _cusFangwenjiluService = factory.CreateScope().ServiceProvider.GetRequiredService<ICusFangwenjiluService>();
+            _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>();
+            _dtChannelArticleNewsService = factory.CreateScope().ServiceProvider.GetRequiredService<IDtChannelArticleNewsService>();
         }
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         {
@@ -1574,13 +1583,12 @@
                     //var feijijiandengji = fiPiecerateDTOs.Where(x => x.Standard == "A");
                     //var  jijiandengji =    fiPiecerateDTOs.Where(x => x.Standard == "A");
 
-                    #region 涓婇棬鎷滆瀹㈡埛
+                    #region 閲囪喘椤圭洰褰曞叆
 
-                    var cooperVisitDTOs = _cooperVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
-                    var intentionVisitDTOs = _intentionVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin); 
-                    if (  cooperVisitDTOs.Count > 0 || intentionVisitDTOs.Count > 0)
+                    var projectDTOsyue = _projectService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (projectDTOsyue!=null && projectDTOsyue.Count > 0 )
                     {
-                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "涓婇棬鎷滆瀹㈡埛").FirstOrDefault();
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "閲囪喘椤圭洰褰曞叆").FirstOrDefault();
                         if (jijianidddd != null)
                         {
                             var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1591,7 +1599,7 @@
                                     decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
                                     if (jixiaotichengfangan.Tichengstandard == "01")
                                     {
-                                        decimal youxiaojijian = intentionVisitDTOs.Count + cooperVisitDTOs.Count - renwujishu;
+                                        decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
                                         if (youxiaojijian > 0)
                                         {
                                             hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1605,51 +1613,7 @@
                                     decimal renwujishu = jixiaotichengfangan.Renwu.Value;
                                     if (jixiaotichengfangan.Tichengstandard == "01")
                                     {
-                                        decimal youxiaojijian = intentionVisitDTOs.Count + cooperVisitDTOs.Count - renwujishu;
-                                        if (youxiaojijian > 0)
-                                        {
-                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                                        }
-
-                                    }
-                                }
-                            }
-
-                        }
-                    }
-                    #endregion
-
-                    #region 鏂板姞缇ょ粍
-
-                    var groupTopicDTOs = _groupTopicService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
-                    if (groupTopicDTOs != null && groupTopicDTOs.Count > 0)
-                    {
-                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鏂板姞缇ょ粍").FirstOrDefault();
-                        if (jijianidddd != null)
-                        {
-                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                            {
-                                if (jixiaotichengfangan.Renwustandard == "01")
-                                {
-                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
-                                    if (jixiaotichengfangan.Tichengstandard == "01")
-                                    {
-                                        decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
-                                        if (youxiaojijian > 0)
-                                        {
-                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                                        }
-
-                                    }
-
-                                }
-                                else if (jixiaotichengfangan.Renwustandard == "02")
-                                {
-                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
-                                    if (jixiaotichengfangan.Tichengstandard == "01")
-                                    {
-                                        decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
+                                        decimal youxiaojijian = projectDTOsyue.Count - renwujishu;
                                         if (youxiaojijian > 0)
                                         {
                                             hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1664,58 +1628,11 @@
                     #endregion
 
                     #region 瀹㈡埛璧勬枡褰曞叆
-                    var cooperatecustomCustomerDTOs = _cooperatecustomCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
-                    var _intentionCustomerDTOs = _intentionCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
-                    if ( cooperatecustomCustomerDTOs.Count > 0 || _intentionCustomerDTOs.Count > 0)
-                    {
-                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "瀹㈡埛璧勬枡褰曞叆").FirstOrDefault();
-                        if (jijianidddd != null)
-                        {
-                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
-                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
-                            {
-                                if (jixiaotichengfangan.Renwustandard == "01")
-                                {
-                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
-                                    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")
-                                {
-                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
-                                    if (jixiaotichengfangan.Tichengstandard == "01")
-                                    {
-                                        decimal youxiaojijian = _intentionCustomerDTOs.Count +  cooperatecustomCustomerDTOs.Count - renwujishu;
-                                        if (youxiaojijian > 0)
-                                        {
-                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
-                                        }
-
-                                    }
-                                }
-                            }
-                        }     
-                    }
-                   
-                     
                     
-                    #endregion
-
-
-                    #region 褰曞叆瀹㈡埛绛惧崟
-
-                   var cooperatecustomCustomers = _cooperatecustomCustomerService.GetListsalaryqiandan(userList[i].Id, dateminkaoqin, datemaxkaoqin);
-                    if (cooperatecustomCustomers != null && cooperatecustomCustomers.Count > 0)
+                    var _intentionCustomerDTOs = _intentionCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (_intentionCustomerDTOs!=null && _intentionCustomerDTOs.Count > 0)
                     {
-                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "褰曞叆瀹㈡埛绛惧崟").FirstOrDefault();
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "瀹㈡埛璧勬枡褰曞叆").FirstOrDefault();
                         if (jijianidddd != null)
                         {
                             var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1726,7 +1643,7 @@
                                     decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
                                     if (jixiaotichengfangan.Tichengstandard == "01")
                                     {
-                                        decimal youxiaojijian = cooperatecustomCustomers.Count - renwujishu;
+                                        decimal youxiaojijian = _intentionCustomerDTOs.Count   - renwujishu;
                                         if (youxiaojijian > 0)
                                         {
                                             hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1740,7 +1657,7 @@
                                     decimal renwujishu = jixiaotichengfangan.Renwu.Value;
                                     if (jixiaotichengfangan.Tichengstandard == "01")
                                     {
-                                        decimal youxiaojijian = cooperatecustomCustomers.Count - renwujishu;
+                                        decimal youxiaojijian = _intentionCustomerDTOs.Count   - renwujishu;
                                         if (youxiaojijian > 0)
                                         {
                                             hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
@@ -1751,6 +1668,599 @@
                             }
                         }
                     }
+
+
+
+                    #endregion
+
+                    #region 鏂板姞缇ょ粍
+
+                    var groupTopicDTOs = _groupTopicService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (groupTopicDTOs != null && groupTopicDTOs.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>   x.Project == "鏂板姞缇ょ粍").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = groupTopicDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鐢佃瘽鎺ㄥ箍
+
+                    var intentionVisitDTOs = _intentionVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "01").ToList();
+                    if (intentionVisitDTOs != null && intentionVisitDTOs.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "鐢佃瘽鎺ㄥ箍").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = intentionVisitDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = intentionVisitDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 缇ゅ彂鐭俊
+
+                    var duanxinsyue = _cusFangwenjiluService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "01").ToList();
+                    if (duanxinsyue != null && duanxinsyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x => x.Project == "缇ゅ彂鐭俊").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = duanxinsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = duanxinsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 缇ゅ彂閭欢
+
+                    var youjiansyue = _cusFangwenjiluService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.Fasongfangshi == "02").ToList();
+                    if (youjiansyue != null && youjiansyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>   x.Project == "缇ゅ彂閭欢").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = youjiansyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = youjiansyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鏂板鎰忓悜瀹㈡埛锛堣鍗曪級
+
+                    var yixiangsyue = _intentionCustomerService.GetListsalaryyixiang(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (yixiangsyue != null && yixiangsyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鏂板鎰忓悜瀹㈡埛锛堣鍗曪級").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = yixiangsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = yixiangsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鏂板绛剧害瀹㈡埛
+
+                    var qianyueDTOsyue = _cooperatecustomCustomerService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (qianyueDTOsyue != null && qianyueDTOsyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鏂板绛剧害瀹㈡埛").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = qianyueDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = qianyueDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 涓婇棬鎷滆瀹㈡埛
+
+                    var cooperVisitDTOs = _cooperVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+                    var intentionVisitDTOsshangmen = _intentionVisitService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin).Where(x => x.VisType == "02").ToList();
+                    if (  cooperVisitDTOs.Count > 0 || intentionVisitDTOsshangmen.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "涓婇棬鎷滆瀹㈡埛").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = intentionVisitDTOsshangmen.Count + cooperVisitDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = intentionVisitDTOsshangmen.Count + cooperVisitDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鏂伴椈璧勮
+                    //鏈湀鏁伴噺
+                    DtChannelArticleNewsDTOSearch searchEntity1 = new DtChannelArticleNewsDTOSearch();
+                    searchEntity1.EndTime = datemaxkaoqin;
+                    searchEntity1.AddTime = dateminkaoqin;
+                    searchEntity1.UserName = userList[i].UserSn;
+                    searchEntity1.CategoryId = 3;
+                    var dtChannelArticleNewsDTOs = _dtChannelArticleNewsService.GetList(searchEntity1);
+
+                    if (dtChannelArticleNewsDTOs != null && dtChannelArticleNewsDTOs.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鏂伴椈璧勮").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = dtChannelArticleNewsDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = dtChannelArticleNewsDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鍏稿瀷妗堜緥
+                    //鏈湀鏁伴噺
+                    searchEntity1 = new DtChannelArticleNewsDTOSearch();
+                    searchEntity1.EndTime = datemaxkaoqin;
+                    searchEntity1.AddTime = dateminkaoqin;
+                    searchEntity1.UserName = userList[i].UserSn;
+                    searchEntity1.CategoryId = 85;
+                    var dianxinanDTOs = _dtChannelArticleNewsService.GetList(searchEntity1);
+
+                    if (dianxinanDTOs != null && dianxinanDTOs.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鍏稿瀷妗堜緥").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = dianxinanDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = dianxinanDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鏀块噰鐭ヨ瘑
+                    //鏈湀鏁伴噺
+                    searchEntity1 = new DtChannelArticleNewsDTOSearch();
+                    searchEntity1.EndTime = datemaxkaoqin;
+                    searchEntity1.AddTime = dateminkaoqin;
+                    searchEntity1.UserName = userList[i].UserSn;
+                    searchEntity1.CategoryId = 73;
+                    var zhengcaizhishiDTOs = _dtChannelArticleNewsService.GetList(searchEntity1);
+
+                    if (zhengcaizhishiDTOs != null && zhengcaizhishiDTOs.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鏀块噰鐭ヨ瘑").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = zhengcaizhishiDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = zhengcaizhishiDTOs.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 鏂板灏忛噰闂
+
+                    var xinzengwendaDTOsyue = _liaotianService.GetListsalary(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (xinzengwendaDTOsyue != null && xinzengwendaDTOsyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "鏂板灏忛噰闂").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = xinzengwendaDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = xinzengwendaDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 瀹℃牳灏忛噰绛旈棶
+
+                    var shenhewendaDTOsyue = _liaotianService.GetListsalaryshenhe(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    if (shenhewendaDTOsyue != null && shenhewendaDTOsyue.Count > 0)
+                    {
+                        var jijianidddd = fiPiecerateDTOs.Where(x =>  x.Project == "瀹℃牳灏忛噰绛旈棶").FirstOrDefault();
+                        if (jijianidddd != null)
+                        {
+                            var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                            if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                            {
+                                if (jixiaotichengfangan.Renwustandard == "01")
+                                {
+                                    decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = shenhewendaDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+
+                                }
+                                else if (jixiaotichengfangan.Renwustandard == "02")
+                                {
+                                    decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                    if (jixiaotichengfangan.Tichengstandard == "01")
+                                    {
+                                        decimal youxiaojijian = shenhewendaDTOsyue.Count - renwujishu;
+                                        if (youxiaojijian > 0)
+                                        {
+                                            hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                        }
+
+                                    }
+                                }
+                            }
+
+                        }
+                    }
+                    #endregion
+
+                    #region 褰曞叆瀹㈡埛绛惧崟
+
+                    //var cooperatecustomCustomers = _cooperatecustomCustomerService.GetListsalaryqiandan(userList[i].Id, dateminkaoqin, datemaxkaoqin);
+                    // if (cooperatecustomCustomers != null && cooperatecustomCustomers.Count > 0)
+                    // {
+                    //     var jijianidddd = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "褰曞叆瀹㈡埛绛惧崟").FirstOrDefault();
+                    //     if (jijianidddd != null)
+                    //     {
+                    //         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianidddd.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                    //         if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                    //         {
+                    //             if (jixiaotichengfangan.Renwustandard == "01")
+                    //             {
+                    //                 decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                    //                 if (jixiaotichengfangan.Tichengstandard == "01")
+                    //                 {
+                    //                     decimal youxiaojijian = cooperatecustomCustomers.Count - renwujishu;
+                    //                     if (youxiaojijian > 0)
+                    //                     {
+                    //                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                    //                     }
+
+                    //                 }
+
+                    //             }
+                    //             else if (jixiaotichengfangan.Renwustandard == "02")
+                    //             {
+                    //                 decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                    //                 if (jixiaotichengfangan.Tichengstandard == "01")
+                    //                 {
+                    //                     decimal youxiaojijian = cooperatecustomCustomers.Count - renwujishu;
+                    //                     if (youxiaojijian > 0)
+                    //                     {
+                    //                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                    //                     }
+
+                    //                 }
+                    //             }
+                    //         }
+                    //     }
+                    // }
                     #endregion
 
 
@@ -1773,7 +2283,7 @@
 
                     #region 鍥句功閿�鍞�
                     var cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "01").ToList();
-                    var jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鍥句功閿�鍞�").FirstOrDefault();
+                    var jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "鍥句功閿�鍞�").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count>0)
                     {
                       var jixiaotichengfangan =    hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1813,10 +2323,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian* new decimal(0.01), 2);
@@ -1831,10 +2341,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -1847,7 +2357,7 @@
 
                     #region   鏀块噰鍜ㄨ
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "02").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鏀块噰鍜ㄨ").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "鏀块噰鍜ㄨ").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1887,10 +2397,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -1905,10 +2415,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -1922,7 +2432,7 @@
 
                     #region   鏍囦功鍒朵綔璁㈠崟
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "03").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鏍囦功鍒朵綔璁㈠崟").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "鏍囦功鍒朵綔璁㈠崟").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -1962,10 +2472,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -1980,10 +2490,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -1997,7 +2507,7 @@
 
                     #region   鍩硅
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "04").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鍩硅").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "鍩硅").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2037,10 +2547,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2055,10 +2565,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2071,8 +2581,8 @@
                     #endregion
 
                     #region  濂楅浼氬憳
-                    cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "05").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "濂楅浼氬憳").FirstOrDefault();
+                    cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "05").OrderBy(x=>x.Createtime).ToList();
+                    jijianid = fiPiecerateDTOs.Where(x =>  x.Project == "濂楅浼氬憳").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2104,6 +2614,21 @@
                                     }
 
                                 }
+                                else if (jixiaotichengfangan.Tichengstandard == "02")
+                                {
+
+                                    if (cooperOrdertushu.Count > renwujishu)
+                                    {
+                                        List<CooperOrderDTO> cooperOrdertushuyouxiao = new List<CooperOrderDTO>();
+                                        for (int j = Convert.ToInt32(renwujishu); j < cooperOrdertushu.Count; j++)
+                                        {
+                                            cooperOrdertushuyouxiao.Add(cooperOrdertushu[j]);
+                                        }
+                                        var dingdanjine = cooperOrdertushuyouxiao.Sum(x => x.Money);
+                                        var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * dingdanjinezhenshi * new decimal(0.01), 2);
+                                    }
+                                }
                             }
                             else if (jixiaotichengfangan.Renwustandard == "03")
                             {
@@ -2112,10 +2637,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2130,15 +2655,15 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
                                     }
-                                }
+                                } 
                             }
                         }
                     }
@@ -2147,7 +2672,7 @@
 
                     #region 涓撳鐢宠
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "06").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "涓撳鐢宠").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "涓撳鐢宠").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2187,10 +2712,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2205,10 +2730,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2222,7 +2747,7 @@
 
                     #region 灞ョ害绾犵悍
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "07").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "灞ョ害绾犵悍").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>  x.Project == "灞ョ害绾犵悍").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2262,10 +2787,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2280,10 +2805,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2297,7 +2822,7 @@
 
                     #region 椋庨櫓浠ｇ悊
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "08").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "椋庨櫓浠ｇ悊").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>  x.Project == "椋庨櫓浠ｇ悊").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2337,10 +2862,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2355,10 +2880,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2372,7 +2897,7 @@
 
                     #region 杞欢閿�鍞彁鎴�
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "09").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "杞欢閿�鍞彁鎴�").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "杞欢閿�鍞彁鎴�").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2412,10 +2937,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2430,10 +2955,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2447,7 +2972,7 @@
 
                     #region 鍏朵粬涓氬姟
                     cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "10").ToList();
-                    jijianid = fiPiecerateDTOs.Where(x => x.Standard == "D" && x.Project == "鍏朵粬涓氬姟").FirstOrDefault();
+                    jijianid = fiPiecerateDTOs.Where(x =>   x.Project == "鍏朵粬涓氬姟").FirstOrDefault();
                     if (jijianid != null && cooperOrdertushu.Count > 0)
                     {
                         var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
@@ -2487,10 +3012,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2505,10 +3030,10 @@
                                 {
                                     var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
                                     var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
-                                    var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
-                                    var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
 
-                                    decimal youxiaojijian = dingdanjinezhenshi - dingdanyouhuizhenshi - renwujishu;
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
                                     if (youxiaojijian > 0)
                                     {
                                         hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
@@ -2519,6 +3044,82 @@
                     }
 
                     #endregion
+
+                    #region 鏁版嵁鍒嗘瀽
+                    cooperOrdertushu = cooperOrderDTOs.Where(x => x.OrderType == "11").ToList();
+                    jijianid = fiPiecerateDTOs.Where(x => x.Project == "鏁版嵁鍒嗘瀽").FirstOrDefault();
+                    if (jijianid != null && cooperOrdertushu.Count > 0)
+                    {
+                        var jixiaotichengfangan = hrJixiaotichengThis.Where(x => x.PiecerateId == jijianid.Id).OrderByDescending(x => x.Effecttime).FirstOrDefault();
+                        if (jixiaotichengfangan != null && jixiaotichengfangan.Ticheng.HasValue && jixiaotichengfangan.Renwu.HasValue)
+                        {
+                            if (jixiaotichengfangan.Renwustandard == "01")
+                            {
+                                decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                    }
+
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "02")
+                            {
+                                decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                if (jixiaotichengfangan.Tichengstandard == "01")
+                                {
+                                    decimal youxiaojijian = cooperOrdertushu.Count - renwujishu;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian, 2);
+                                    }
+
+                                }
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "03")
+                            {
+                                decimal renwujishu = admAttendanceDTO.Yingchuqin * jixiaotichengfangan.Renwu.Value;
+                                if (jixiaotichengfangan.Tichengstandard == "02")
+                                {
+                                    var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+                                    var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+                                    }
+                                }
+
+                            }
+                            else if (jixiaotichengfangan.Renwustandard == "04")
+                            {
+                                decimal renwujishu = jixiaotichengfangan.Renwu.Value;
+                                if (jixiaotichengfangan.Tichengstandard == "02")
+                                {
+                                    var dingdanjine = cooperOrdertushu.Sum(x => x.Money);
+                                    var dingdanjinezhenshi = dingdanjine.HasValue ? dingdanjine.Value : 0;
+                                    //var dingdanyouhui = cooperOrdertushu.Sum(x => x.Youhui);
+                                    //var dingdanyouhuizhenshi = dingdanyouhui.HasValue ? dingdanyouhui.Value : 0;
+
+                                    decimal youxiaojijian = dingdanjinezhenshi - renwujishu;
+                                    if (youxiaojijian > 0)
+                                    {
+                                        hrSalaryDTO.Jixiaoticheng += Math.Round(jixiaotichengfangan.Ticheng.Value * youxiaojijian * new decimal(0.01), 2);
+                                    }
+                                }
+                            }
+                        }
+                    }
+
+                    #endregion
+
                 }
 
 
diff --git a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
index 8b61db4..859c2e8 100644
--- a/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
+++ b/zhengcaioa/zhengcaioa/Timer/TimerGetShopUsersService.cs
@@ -1,5 +1,6 @@
 锘縰sing DTO;
 using IServices;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -25,6 +26,7 @@
         private readonly IConfiguration _configuration;
         private readonly ILiaotianService _liaotianService;
         private readonly IHttpClientFactory _clientFactory;
+        private readonly IDtChannelArticleNewsService _dtChannelArticleNewsService;
 
         public TimerGetShopUsersService(ILogger<TimerGetShopUsersService> logger, IServiceScopeFactory factory)
         {
@@ -32,6 +34,7 @@
             _configuration = factory.CreateScope().ServiceProvider.GetRequiredService<IConfiguration>();
             _liaotianService = factory.CreateScope().ServiceProvider.GetRequiredService<ILiaotianService>();
             _clientFactory = factory.CreateScope().ServiceProvider.GetRequiredService<IHttpClientFactory>();
+            _dtChannelArticleNewsService = factory.CreateScope().ServiceProvider.GetRequiredService<IDtChannelArticleNewsService>();
         }
 
         protected override async Task ExecuteAsync(CancellationToken stoppingToken)
@@ -52,6 +55,7 @@
 
                     try
                     {
+                        
                         await this.huoquhuiyuanAsync();
 
                     }
@@ -76,6 +80,17 @@
         {
             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()
         {
diff --git a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
index 963813d..15af9c4 100644
--- a/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/CooperatecustomCustomer/Index.cshtml
@@ -46,7 +46,7 @@
             { label: '鍖哄幙', name: 'AreaId', labtype: 'combox', hidden: false, data: JSON.parse('[]'), cwidth: '2%', cccwidth: '8%' },
             { label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
             { label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
-            { label: '鏄惁鏈夊井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
+            { label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
 
         ];
         var _pageAdd = function () {
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
index ce45768..cc3efc0 100644
--- a/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/FiAccount/Index.cshtml
@@ -21,7 +21,13 @@
             { label: '鎬绘敹鍏�', name: 'AllIncome', labtype: 'txt', hidden: false },
             { label: '鎬绘敮鍑�', name: 'AllExpenses', labtype: 'txt', hidden: false },
             { label: '浣欓', name: 'Balance', labtype: 'txt', hidden: false },
-            { label: '澶囨敞', name: 'Remark', labtype: 'txt', hidden: false },
+            {
+                label: '娴佹按璐�', name: 'Remark', labtype: 'txt', hidden: false,
+                formatter: function (cellvalue, options, rowObject) {
+                    return "<a onclick=\"OpenWindow('" + rowObject.Accountname + "','98%','100%', '/FiAccount/Liushuizhang?id=" + rowObject.Id + "')\"  >娴佹按璐�</a>";
+                }
+            },
+
             { label: '鐘舵��', name: 'RecStatus', labtype: 'txt', hidden: true },
             { label: '鍒涘缓浜�', name: 'Creater', labtype: 'txt', hidden: true },
             { label: '鍒涘缓鏃堕棿', name: 'Createtimetxt', labtype: 'txt', hidden: true },
diff --git a/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml b/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml
new file mode 100644
index 0000000..0675390
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/FiAccount/Liushuizhang.cshtml
@@ -0,0 +1,80 @@
+锘緻{
+    ViewBag.Title = "FiAccountExpenses";
+    Layout = "~/Views/Shared/_Layout_Search.cshtml";
+}
+@section headerStyle{
+    <script type="text/javascript">
+        var FiSubject = '@Html.Raw(Newtonsoft.Json.JsonConvert.SerializeObject(ViewBag.FiSubject))';
+        dataCol = [
+            { label: 'id', name: 'Id', labtype: 'txt', hidden: true, width: 60},
+            { label: '璐︽埛绫诲瀷', name: 'AccounttypeName', labtype: 'txt', hidden: false, width: 60 },
+            {
+                label: '璐︽埛鍚嶇О', name: 'AccountName', labtype: 'txt', hidden: false, width: 60
+            },
+            { label: '绉戠洰鍚嶇О', name: 'SubjectName', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鏀跺叆鏀嚭', name: 'RecordTypeName', labtype: 'txt', hidden: false, width: 60 },
+            
+            { label: '閲戦', name: 'Money', labtype: 'txt', hidden: false, width: 60},
+            { label: '璐︽埛浣欓', name: 'AccountMoney', labtype: 'txt', hidden: false, width: 60 },
+            { label: '閮ㄩ棬', name: 'Department', labtype: 'txt', hidden: false, width: 60 },
+            { label: '鏀朵粯娆句汉(鍗曚綅)', name: 'PaymentUnit', labtype: 'txt', hidden: false, width: 100 },
+            { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false, width: 200},
+            { label: '鎿嶄綔鏃堕棿', name: 'CreatetimeName', labtype: 'txt', hidden: false, width: 100},
+            {
+                label: '鎿嶄綔', name: 'RecStatus', labtype: 'txt', hidden: false ,
+                formatter: function (cellvalue, options, rowObject) {
+                    return "<a onclick=\"OpenWindow('鏌ョ湅','98%','100%', '/FiAccountExpenses/Check?id=" + rowObject.Id + "')\"  >鏌ョ湅</a>";
+                }, width: 60
+            },
+        ];
+        dataUrl = "/FiAccount/GetListLiushuizhang?AccountId=@ViewBag.id";
+        searchCol = [
+            { label: '鎿嶄綔鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
+             
+            { label: '绉戠洰鍚嶇О', name: 'SubjectId', labtype: 'combox', hidden: false, data: JSON.parse(FiSubject) },
+            { label: '鎽樿', name: 'OperationalMatters', labtype: 'txt', hidden: false },
+
+            { label: '鏀朵粯娆句汉', name: 'PaymentUnit', labtype: 'txt', hidden: false },
+            { label: '鎿嶄綔浜�', name: 'CreaterName', labtype: 'txt', hidden: false },
+
+
+
+
+        ];
+       
+
+       
+
+        var _afterSave = function (result) {
+            if (result) {
+                toastr.success("淇濆瓨鎴愬姛");
+            } else {
+                toastr.error("淇濆瓨澶辫触");
+            }
+        }
+
+        var _afterDel = function (result) {
+            if (result) {
+                toastr.success("鍒犻櫎鎴愬姛");
+            } else {
+                /**/
+                toastr.error("鍒犻櫎鎴愬姛");
+        /**/
+    }
+}
+    </script>
+}
+
+
+@section footerScripts{
+    <script type="text/javascript">
+
+        
+
+
+
+
+
+    </script>
+}
+
diff --git a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
index 4514ede..f832d7e 100644
--- a/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/IntentionCustomer/Index.cshtml
@@ -50,7 +50,7 @@
             { label: '瀹㈡埛鍗曚綅', name: 'Name', labtype: 'txt', hidden: false },
             { label: '寤烘。鏃堕棿', name: 'Createtime', labtype: 'datearea', hidden: false },
             { label: '褰曞叆浜�', name: 'Creater', labtype: 'combox', hidden: false, data: JSON.parse(Creater), cwidth: '5%', cccwidth: '8%' },
-            { label: '鏄惁鏈夊井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
+            { label: '鏄惁鍔犲井淇�', name: 'Shifouweixin', labtype: 'combox', hidden: false, data: JSON.parse(shifou), cwidth: '5%', cccwidth: '8%' },
 
 
 
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
index 3fb51d1..4f709c1 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Index.cshtml
@@ -654,7 +654,7 @@
                                         </tbody>
                                     </table>
                                 </div>
-                                <div class="">
+                                @*<div class="">
 
                                     <h3>鍏�侀闄╀唬鐞�</h3>
 
@@ -663,10 +663,10 @@
 
                                     <label class="text-left col-sm-1 col-md-1 control-label">闈㈣</label>
 
-                                </div>
+                                </div>*@
                                 <div class="">
 
-                                    <h3>涔濄�佽蒋浠�</h3>
+                                    <h3>鍏�佽蒋浠�</h3>
 
                                 </div>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -709,11 +709,11 @@
                                     </table>
                                 </div>
 
-                                <div class="">
+                                @*<div class="">
 
                                     <h3>鍗併�佸叾浠�</h3>
 
-                                </div>
+                                </div>*@
 
 
 
diff --git a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
index b3af9bd..9ce574e 100644
--- a/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
+++ b/zhengcaioa/zhengcaioa/Views/ServiceCharge/Print.cshtml
@@ -615,7 +615,7 @@
                                         </tbody>
                                     </table>
                                 </div>
-                                <div class="">
+                                @*<div class="">
 
                                     <h3>鍏�侀闄╀唬鐞�</h3>
 
@@ -624,10 +624,10 @@
 
                                     <label class="text-left col-sm-1 col-md-1 control-label">闈㈣</label>
 
-                                </div>
+                                </div>*@
                                 <div class="">
 
-                                    <h3>涔濄�佽蒋浠�</h3>
+                                    <h3>鍏�佽蒋浠�</h3>
 
                                 </div>
                                 <div class="clearfix layer-area" style="padding-bottom:15px;">
@@ -670,11 +670,11 @@
                                     </table>
                                 </div>
 
-                                <div class="">
+                                @*<div class="">
 
                                     <h3>鍗併�佸叾浠�</h3>
 
-                                </div>
+                                </div>*@
 
 
 
diff --git a/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
new file mode 100644
index 0000000..2420d22
--- /dev/null
+++ b/zhengcaioa/zhengcaioa/Views/TongjiBaoBiao/Index.cshtml
@@ -0,0 +1,524 @@
+锘緻model DTO.ServiceChargeDTO
+@using DTO;
+@{
+    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>;
+
+    int nookcount = dingdanDTOs == null ? 0 : dingdanDTOs.Count;
+}
+
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta http-equiv="Pragma" content="no-cache">
+    <meta http-equiv="Cache-Control" content="no-siteapp" />
+    <meta http-equiv="Cache-Control" content="no-cache">
+    <meta http-equiv="Expires" content="0">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
+    <meta name="renderer" content="webkit">
+    <title>@SiteConfig.SiteName</title>
+    <meta name="keywords" content="@SiteConfig.Keywords">
+    <meta name="description" content="@SiteConfig.Description">
+    <meta name="author" content="@SiteConfig.Author">
+    <link rel="icon" type="image/x-icon" href="@SiteConfig.ShortcutIcon">
+    <!-- uc寮哄埗绔栧睆 -->
+    <meta name="screen-orientation" content="portrait">
+    <!-- QQ寮哄埗绔栧睆 -->
+    <meta name="x5-orientation" content="portrait">
+    <!-- UC寮哄埗鍏ㄥ睆 -->
+    <meta name="full-screen" content="yes">
+    <!-- QQ寮哄埗鍏ㄥ睆 -->
+    <meta name="x5-fullscreen" content="true">
+    <!--[if lt IE 9]>
+    <meta http-equiv="refresh" content="0;ie.html" />
+    <![endif]-->
+    <script src="~/js/jquery.min.js"></script>
+    <link href="~/css/bootstrap.min.css" rel="stylesheet">
+    <link href="~/css/font-awesome.min.css" rel="stylesheet">
+    <link href="~/css/animate.min.css" rel="stylesheet">
+
+    @*<link href="~/css/plugins/iCheck/custom.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/chosen/chosen.css" rel="stylesheet">
+    @*<link href="~/js/plugins/layer/skin/layer.css" rel="stylesheet">*@
+    @*<link href="~/css/plugins/datapicker/datepicker3.css" rel="stylesheet">*@
+    <link href="~/css/style.min.css" rel="stylesheet">
+    <link href="~/css/plugins/toastr/toastr.min.css" rel="stylesheet" />
+    <link href="~/css/plugins/webuploader/webuploader.css" rel="stylesheet" />
+
+    <style type="text/css">
+        .webuploader-pick {
+            position: relative;
+            display: inline-block;
+            cursor: pointer;
+            background: #00b7ee;
+            padding: 8px 14px 7px 14px;
+            color: #fff;
+            text-align: center;
+            border-radius: 3px;
+            overflow: hidden;
+        }
+
+        div.clearfix > label {
+            padding-top: 8px;
+        }
+
+        .chosen-container {
+            border-radius: 1px;
+            border: 1px solid #e5e6e7;
+        }
+
+        .col-md-1.control-label {
+            padding-right: 0px;
+            font-weight: 400;
+        }
+
+        html {
+            font-family: sans-serif;
+            -ms-text-size-adjust: 100%;
+            -webkit-text-size-adjust: 100%;
+        }
+
+        body {
+            margin: 10px;
+        }
+
+        table {
+            border-collapse: collapse;
+            border-spacing: 0;
+        }
+
+        td, th {
+            padding: 0;
+        }
+
+        .pure-table {
+            border-collapse: collapse;
+            border-spacing: 0;
+            empty-cells: show;
+            border: 1px solid #cbcbcb;
+        }
+
+            .pure-table caption {
+                color: #000;
+                font: italic 85%/1 arial,sans-serif;
+                padding: 1em 0;
+                text-align: center;
+            }
+
+            .pure-table td, .pure-table th {
+                border-left: 1px solid #cbcbcb;
+                border-width: 0 0 0 1px;
+                font-size: inherit;
+                margin: 0;
+                overflow: visible;
+                padding: .5em 1em;
+            }
+
+            .pure-table thead {
+                background-color: #e0e0e0 !important;
+                color: #000;
+                text-align: left;
+                vertical-align: bottom;
+                -webkit-print-color-adjust: exact;
+            }
+
+            .pure-table td {
+                background-color: transparent;
+            }
+
+        .pure-table-bordered td {
+            border-bottom: 1px solid #cbcbcb;
+        }
+
+        .pure-table-bordered tbody > tr:last-child > td {
+            border-bottom-width: 0;
+        }
+
+        /* .pure-table-bordered th {
+            border-bottom: 1px solid #cbcbcb;
+        }
+
+        .pure-table-bordered tbody > tr:last-child > th {
+            border-bottom-width: 0;
+        }*/
+    </style>
+
+    <!-- jqgrid-->
+    @*<link href="~/css/plugins/jqgrid/ui.jqgrid.css" rel="stylesheet">*@
+    <script language="javascript" src="~/js/jquery.min.js" type="text/javascript"></script>
+    <script src="~/js/bootstrap.min.js"></script>
+    @*<script src="~/js/plugins/bootstro/bootstro.js"></script>*@
+
+    <!--瀹瑰櫒-->
+    @*<script language="javascript" src="~/js/datehelper.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/query/jquery.query-object.js" type="text/javascript"></script>*@
+    @*<script language="javascript" src="~/js/plugins/iCheck/icheck.min.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/chosen/chosen.jquery.js" type="text/javascript"></script>
+    @*<script language="javascript" src="~/js/plugins/datapicker/bootstrap-datepicker.js" type="text/javascript"></script>*@
+    <script language="javascript" src="~/js/plugins/layer/layer.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/jqgrid/jquery.jqGrid.min.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/jqgrid/i18n/grid.locale-cn.js" type="text/javascript"></script>*@
+    <script src="~/js/plugins/toastr/toastr.min.js" type="text/javascript"></script>
+    <script src="~/js/plugins/webuploader/webuploader.min.js"></script>
+
+    <script language="javascript" src="~/js/common-layout.js" type="text/javascript"></script>
+    <script src="~/js/plugins/layer/laydate/laydate.js" type="text/javascript"></script>
+    @*<script src="~/js/plugins/iTexbox/itextbox.js" type="text/javascript"></script>*@
+    @*<script src="~/js/plugins/iuploader/iuploader.js"></script>*@
+    <script src="~/js/TUJS.js"></script>
+</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">
+                    <div class="ibox float-e-margins">
+
+                        <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="">
+
+                                    <h3>涓�銆佹帹骞�</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>
+
+                                        </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>
+                                                    }
+                                                }
+                                            }
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <div class="">
+
+                                    <h3>浜屻�佹嫓璁垮鎴�</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>
+
+                                        </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>
+                                                    }
+                                                }
+                                            }
+                                        </tbody>
+                                    </table>
+                                </div>
+
+                                <div class="">
+
+                                    <h3>涓夈�佹柊澧炶鍗�</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>
+
+                                        </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>
+                                                    }
+                                                }
+                                            }
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="">
+
+                                    <h3>鍥涖�佽祫鏂欑淮鎶�</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>
+                                            </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>
+                                                    }
+                                                }
+                                            }
+                                        </tbody>
+                                    </table>
+                                </div>
+
+
+
+                                <div class="">
+
+                                    <h3>浜斻�侀」鐩疄鏂�</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>
+                                            </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>
+                                                    }
+                                                }
+                                            }
+                                        </tbody>
+                                    </table>
+                                </div>
+
+
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div class="wrapper wrapper-content" style="margin-top:0px"></div>
+        <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,
+            "progressBar": true,
+            "positionClass": "toast-bottom-right",
+            "onclick": null,
+            "showDuration": "300",
+            "hideDuration": "600",
+            "timeOut": "4500",
+            "extendedTimeOut": "600",
+            "showEasing": "swing",
+            "hideEasing": "linear",
+            "showMethod": "fadeIn",
+            "hideMethod": "fadeOut"
+        };
+
+
+    function printHtml(html) {
+        //var bodyHtml = document.body.innerHTML;
+        //document.body.innerHTML = html;
+        $("#printl").hide();
+        window.print();
+        //document.body.innerHTML = bodyHtml;
+        $("#printl").show();
+    }
+    function onprint() {
+        var html = $("#printArea").html();
+        printHtml(html);
+    }
+</script>
+</html>
diff --git a/zhengcaioa/zhengcaioa/appsettings.Development.json b/zhengcaioa/zhengcaioa/appsettings.Development.json
index e94c623..4379b72 100644
--- a/zhengcaioa/zhengcaioa/appsettings.Development.json
+++ b/zhengcaioa/zhengcaioa/appsettings.Development.json
@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=.;database=zhengcaioa;uid=sa;pwd=123456;"
+    "DefaultConnection": "server=.;database=zhengcaioa;uid=sa;pwd=123456;",
+    "zcwebConnection": "server=localhost;database=zcweb;uid=sa;pwd=123456;"
   },
   "Logging": {
     "LogLevel": {
diff --git a/zhengcaioa/zhengcaioa/appsettings.json b/zhengcaioa/zhengcaioa/appsettings.json
index 0e96c47..49a8fff 100644
--- a/zhengcaioa/zhengcaioa/appsettings.json
+++ b/zhengcaioa/zhengcaioa/appsettings.json
@@ -1,6 +1,7 @@
 {
   "ConnectionStrings": {
-    "DefaultConnection": "server=localhost;database=zhengcaioa;uid=sa;pwd=123456;"
+    "DefaultConnection": "server=localhost;database=zhengcaioa;uid=sa;pwd=123456;",
+    "zcwebConnection": "server=localhost;database=zcweb;uid=sa;pwd=123456;"
   },
   "Logging": {
     "LogLevel": {

--
Gitblit v1.9.1