知识库序号，历史工单屏蔽，

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Wiki/ProfessorController.cs

@@ -74,7 +74,7 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             if (isdc > 0)
             {
-                string cols = "(case when a.F_Id <100 then RIGHT ('00'+CONVERT (varchar(10),a.F_Id),3)   else  CONVERT(varchar(10), a.F_Id) end) as 序号,F_HangYe as 所属行业 ,F_DanWei as 专家单位,F_XingMing as 专家姓名,F_KeShi as 科室,F_ZhiWu as 职务,F_ShouJi as 手机号码,F_DianHua as 办公电话,F_FaBuShiJian as 发布日期,F_FaBuRen as 发布人,F_FaBuDanWei as 上报单位,F_BiaoShiBianMa as 标识编码";
+                string cols = "'A'+ RIGHT ('00000'+CONVERT (varchar(10),a.F_Id),6) as 序号,F_HangYe as 所属行业 ,F_DanWei as 专家单位,F_XingMing as 专家姓名,F_KeShi as 科室,F_ZhiWu as 职务,F_ShouJi as 手机号码,F_DianHua as 办公电话,F_FaBuShiJian as 发布日期,F_FaBuRen as 发布人,F_FaBuDanWei as 上报单位,F_BiaoShiBianMa as 标识编码";
                 var dtdc = DbHelperSQL.Query(" select " + cols + " from T_Wiki_Professor a with(nolock) where 1=1 " + sql).Tables[0];
                 var msg = new NPOIHelper().ExportToExcel("政策专家", dtdc);
                 if (msg == "")
@@ -89,9 +89,9 @@ namespace CallCenterApi.Interface.Controllers.Wiki
 
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
-                "T_Wiki_Professor with(nolock)",
+                "T_Wiki_Professor a with(nolock)",
                 "F_Id",
-                "*",
+                "a.*,'A'+ RIGHT ('00000'+CONVERT (varchar(10),a.F_Id),6) as 序号",
                 sql,
                 "ORDER BY F_DianJiLiang,F_CreateTime DESC",
                 pagesize,

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YSReportController.cs

@@ -19,6 +19,36 @@ namespace CallCenterApi.Interface.Controllers.report
     [Authority]
     public class YSReportController : BaseController
     {
-       
+        /// <summary>
+        /// 营商统计工作报表
+        /// </summary>
+        /// <param name="starttime"></param>
+        /// <param name="endtime"></param>
+        /// <returns></returns>
+        public ActionResult TJGongZuo(DateTime ?  starttime, DateTime? endtime, bool isdc = false)
+        {
+            string strdate = ""; string edate = "";
+            if (starttime==null )
+            {
+                strdate = new DateTime(DateTime .Now .Year, DateTime.Now.Month, 1) .ToString("yyyy-MM-dd HH:mm:ss");
+            }
+            else
+            {
+                strdate = starttime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+
+            }
+            if (endtime == null)
+            {
+                edate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+
+
+            }
+            else
+            {
+                edate = endtime.Value.ToString("yyyy-MM-dd HH:mm:ss");
+            }
+
+            return Success("");
+        }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/APPSController.cs

@@ -1349,7 +1349,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             else
                 return Error("请选择收藏人");
-           
+            sql += "and F_CreateTime>='2019-08-15 00:00:00'";
           //  sql += "and F_Administrative='00'";
             string orderby = "ORDER BY F_CreateTime DESC";
             int recordCount = 0;
@@ -3143,7 +3143,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (strstarttime.Trim() != "" && strstarttime != "undefined")
             {
-                sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                try
+                {
+                    if (DateTime.Parse(strstarttime) > DateTime.Parse("2021-08-15 00:00:00"))
+                    {
+                        sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                    }
+                    else
+                    {
+                        sql += " and datediff(day,F_CreateTime,'2019-08-15 00:00:00')<=0 ";
+                    }
+                }
+                catch
+                {
+                    sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                }
+            }
+            else
+            {
+                sql += " and datediff(day,F_CreateTime,'2019-08-15 00:00:00')<=0 ";
+               
             }
             if (strendtime.Trim() != "" && strendtime != "undefined")
             {
@@ -3540,7 +3559,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (strstarttime.Trim() != "" && strstarttime != "undefined")
             {
-                sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                try
+                {
+                    if (DateTime.Parse(strstarttime) > DateTime.Parse("2021-08-15 00:00:00"))
+                    {
+                        sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                    }
+                    else
+                    {
+                        sql += " and datediff(day,F_CreateTime,'2019-08-15 00:00:00')<=0 ";
+                    }
+                }
+                catch
+                {
+                    sql += " and datediff(day,F_CreateTime,'" + strstarttime + "')<=0 ";
+                }
+            }
+            else
+            {
+                sql += " and datediff(day,F_CreateTime,'2019-08-15 00:00:00')<=0 ";
+
             }
             if (strendtime.Trim() != "" && strendtime != "undefined")
             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -1067,7 +1067,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
-                                    sql += "and F_WorkOrderID  in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0 and  (F_Content != '推诿工单' or F_Content is null  ) and F_State!=2 and F_IsExamine=1)";
+                                    sql += "and F_WorkOrderID  in (select F_WorkOrderID from T_Bus_RemindRecord where F_Type=1 and F_IsDelete=0 and  (F_Content != '推诿工单' or F_Content is null  ) and F_State not in (0,2) and F_IsExamine=1 )";
 
                                 }
                             }
@@ -1558,6 +1558,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         btns.Remove(butt);
                     if (Int32.Parse(strtab) == 0 && state == 6)
                     {
+                        if (User.F_RoleCode.ToUpper() != "ZXHWY")
                         btns.Add(ButtonGroup.turnsee());
                     }
                     if (Int32.Parse(strtab) == 0 && state == 3)

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -902,7 +902,7 @@ namespace CallCenter.Utility
 
 
 
-        private string [] Merger = {"来电量", "接通量", "未接通","主动放弃","接通率"};
+       
         //
        
         /// <summary>