增加筛选项，大屏修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/WOReportController.cs

@@ -1842,7 +1842,9 @@ namespace CallCenterApi.Interface.Controllers.report
         /// 市场投诉处理时效明细表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetPrescriptionList(string stime, string endtime, string salesBase, string channel, int page = 1, int limit = 10)
+        public ActionResult GetPrescriptionList(string stime, string endtime, string salesBase, string channel, string
+
+question, int page = 1, int limit = 10)
         {
             string sql = $" and F_IsDelete=0";
             DataTable dt = new DataTable();
@@ -1856,6 +1858,10 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
+            if (!string.IsNullOrEmpty(question))
+            {
+                sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'" + question + "'") + "') "; ;
+            }
             if (!string.IsNullOrWhiteSpace(salesBase))//销售基地
                 sql += $" and F_SalesBase like '%" + salesBase.Trim() + "%'";
             if (!string.IsNullOrWhiteSpace(channel))
@@ -2423,6 +2429,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 foreach (var it in modlelist)
                 {
                     var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID + "and F_WoState=1" + " order by F_ID desc");
+                    
                     if (itemList.Count > 0)
                     {
                         if (itemList[0].F_NextDept > 0)
@@ -2978,7 +2985,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataTable QuestionManage = DbHelperSQL.Query(Queststr).Tables[0];
             List<Model.T_Wo_QuestionManage> categorylist = quesBLL.DataTableToList(QuestionManage);
             List<Complainthandling> modeNamelList = new List<Complainthandling>(categorylist.Count);
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal+ "order by F_ID desc ");
+      //var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal+ "order by F_ID desc ");
             if (modellist !=null )
             {
                 for (int i=0;i < categorylist.Count; i++)
@@ -3041,26 +3048,36 @@ namespace CallCenterApi.Interface.Controllers.report
                                     worker.F_SalesBase = it.F_SalesBase;
                                     worker.F_Description = it.F_Description;
                                     string timeover = "", timeover2 = ""; int x = 0, y = 0;
+                                    var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID + "and F_WoState=1" + " order by F_ID desc");
+                             
+                                   
+                                    if (itemList[0].F_NextDept > 0)
+                                    {
+                                        var deptmodel = departmentBLL.GetModel(int.Parse(itemList[0].F_NextDept.ToString()));
+                                        if (deptmodel != null)
+                                        {
+                                            worker.F_Responsibility = deptmodel.F_DeptName;
+                                        }
+
+                                    }
                                     int limit =0;
-                                    if (itemlasts != null )
+                                    if (itemList != null )
                                     {
-                                     for (int z = 0; z < itemlasts.Count; z++)
-                                      {
-                                             if (it.F_ID == itemlasts[z].F_WoID)
-                                              {
-                                                if (itemlasts[z].F_WoState >= 1)
+                                       for (int z = 0; z < itemList.Count; z++)
+                                        {
+                                                if (itemList[z].F_WoState >= 1)
                                                 {
-                                                    if (itemlasts[z].F_WoState == 1)
+                                                    if (itemList[z].F_WoState == 1)
                                                     {
                                                         x = z;
-                                                        timeover = itemlasts[z].F_CreateTime.ToString();
-                                                        limit =int .Parse ( itemlasts[z].F_LimitTime);
+                                                        timeover = itemList[z].F_CreateTime.ToString();
+                                                        limit =int .Parse (itemList[z].F_LimitTime);
                                                     }
-                                                    if (itemlasts[z].F_WoState == 10)
+                                                    if (itemList[z].F_WoState == 10)
                                                     {
                                                         y = z;
-                                                        timeover2 = itemlasts[z].F_CreateTime.ToString();
-                                                        limit = int.Parse(itemlasts[z].F_LimitTime);
+                                                        timeover2 = itemList[z].F_CreateTime.ToString();
+                                                        limit = int.Parse(itemList[z].F_LimitTime);
                                                     }
                                                 }
                                                 if (timeover2 != "")
@@ -3073,14 +3090,14 @@ namespace CallCenterApi.Interface.Controllers.report
                                                             double a = id.TotalHours;
                                                             worker.overtime = string .Format ("{0:f2}h", a - limit);
                                                             worker.time = a - limit;
-                                                            if (itemlasts[x].F_NextDept > 0)
-                                                            {
-                                                                var deptment = departmentBLL.GetModel(int.Parse(itemlasts[x].F_NextDept.ToString()));
-                                                                if (deptment != null)
-                                                                {
-                                                                    worker.F_Responsibility = deptment.F_DeptName;
-                                                                }
-                                                            }
+                                                            //if (itemList[x].F_NextDept > 0)
+                                                            //{
+                                                            //    var deptment = departmentBLL.GetModel(int.Parse(itemList[x].F_NextDept.ToString()));
+                                                            //    if (deptment != null)
+                                                            //    {
+                                                            //        worker.F_Responsibility = deptment.F_DeptName;
+                                                            //    }
+                                                            //}
 
                                                         }
                                                         else
@@ -3089,15 +3106,15 @@ namespace CallCenterApi.Interface.Controllers.report
                                                             double a = id.TotalHours;
                                                             worker.overtime = string.Format("{0:f2}h", a - limit);
                                                             worker.time = a - limit;
-                                                            if (itemlasts[y].F_NextDept > 0)
-                                                            {
-                                                                var deptment = departmentBLL.GetModel(int.Parse(itemlasts[y].F_NextDept.ToString()));
-                                                                if (deptment != null)
-                                                                {
-                                                                    worker.F_Responsibility = deptment.F_DeptName;
-                                                                }
+                                                            //if (itemList[y].F_NextDept > 0)
+                                                            //{
+                                                            //    var deptment = departmentBLL.GetModel(int.Parse(itemList[y].F_NextDept.ToString()));
+                                                            //    if (deptment != null)
+                                                            //    {
+                                                            //        worker.F_Responsibility = deptment.F_DeptName;
+                                                            //    }
 
-                                                            }
+                                                            //}
 
                                                         }
                                                     }
@@ -3109,18 +3126,18 @@ namespace CallCenterApi.Interface.Controllers.report
                                                     double a = id.TotalHours;
                                                     worker.overtime = string.Format("{0:f2}h", a - limit);
                                                     worker.time = a - limit;
-                                                    if (itemlasts[x].F_NextDept > 0)
-                                                    {
-                                                        var deptment = departmentBLL.GetModel(int.Parse(itemlasts[x].F_NextDept.ToString()));
-                                                        if (deptment != null)
-                                                        {
-                                                            worker.F_Responsibility = deptment.F_DeptName;
-                                                        }
-                                                    }
+                                                    //if (itemList[x].F_NextDept > 0)
+                                                    //{
+                                                    //    var deptment = departmentBLL.GetModel(int.Parse(itemList[x].F_NextDept.ToString()));
+                                                    //    if (deptment != null)
+                                                    //    {
+                                                    //        worker.F_Responsibility = deptment.F_DeptName;
+                                                    //    }
+                                                    //}
                                                 }
 
 
-                                            }
+                                            
                                            
                                         }
                                         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiManYiDuController.cs

@@ -33,7 +33,12 @@ namespace CallCenterApi.Interface.Controllers.report
             ActionResult res = NoToken("未知错误，请重新登录");
 
             DataTable dtNew = new DataTable();
-            dtNew = getData(stime, endtime);
+            if (string .IsNullOrEmpty (stime) && string.IsNullOrEmpty(endtime))
+            {
+                stime = (DateTime.Now.AddDays(1 - DateTime.Now.Day).Date).ToString("yyyy-MM-dd");
+                endtime = DateTime.Now.ToString("yyyy-MM-dd");
+            }
+                dtNew = getData(stime, endtime);
             res = Success("获取坐席满意度评价情况报表数据成功", dtNew);
             return res;
         }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -2463,10 +2463,36 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
         }
         /// <summary>
+        /// 获取问题类别
+        /// </summary>
+        /// <returns></returns>
+        public string GetComplaint(string msg)
+        {
+            string str = "";
+            string str1 = " select F_Id from T_Wo_QuestionManage where F_QuestionName in(" + msg + ")";
+            string str3 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str1 + ")";
+            var dept = quesBLL.GetModelList("F_ParentId in(" + str3 + ")");
+            if (dept != null)
+            {
+                foreach (var it in dept)
+                {
+
+                    if (str != "")
+                        str += "','" + it.F_Id;
+                    else
+                        str += it.F_Id;
+
+                }
+            }
+            //  string str4 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
+            return str;
+        }
+
+        /// <summary>
         ///综合查询列表
         /// </summary>
         public ActionResult GetComprehensive(string code, string cusname,string createby, string starttime, string endtime, string keywords, string cusphone, string companyname, string province, string city,
-            string country, string township,string category,string salebase, string touser,string visitby, string visitresult, int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
+            string country, string township,string category,string salebase, string touser,string visitby, string visitresult, string question,int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2497,6 +2523,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         sql += $" and F_State=" + state;
                     }
                 }
+                if (!string.IsNullOrEmpty(question))
+                {
+                    sql += $"  and T_Wo_WorkOrder.F_QuestionType in ( '" + GetComplaint("'"+question+"'") + "') "; ;
+                }
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
                 if (!string.IsNullOrWhiteSpace(createby))//创建人