工单数量修改，列表修改。大屏修改

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

@@ -2093,13 +2093,15 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             public string name;
             public int number;//数量
-            public string ongesttime;//用时最长
-            public string minimumtime;//用时最短
-            public string averageTime;//平均用时
-            public string median;//中位数
-            public string Overdue;//超期数量
-            public string efficiency;//效率提升率
+            public string ongesttime="0h";//用时最长
+            public string minimumtime = "0h";//用时最短
+            public string averageTime = "0h";//平均用时
+            public string median = "0h";//中位数
+            public string Overdue="0";//超期数量
+            public string efficiency = "0%";//效率提升率
+            public List<worker> worker;
         }
+       
         public class Channel
         {
             public string channel;//渠道
@@ -2131,8 +2133,8 @@ namespace CallCenterApi.Interface.Controllers.report
             public int number;// 数量
             public int Lastyearnumber;//去年同比
             public int Lastmonthnumber;//上月同比
-            public int Lastyear;//去年同比
-            public int Lastmonth;//上月同比
+            public int   Lastyear;//去年同比
+            public int   Lastmonth;//上月同比
 
         }
       
@@ -2208,38 +2210,33 @@ namespace CallCenterApi.Interface.Controllers.report
                     Months = Months + 1;
                 }
             }
-            
-        
             string smouth= Convert.ToDateTime(DateTime.Parse(stime).AddDays(1 - DateTime.Parse(stime).Day).AddMonths(-Months).ToLongDateString()).ToString("yyyy-MM-dd");
-            string endmouth = Convert.ToDateTime(DateTime.Parse(endtime).AddDays(1 - DateTime.Parse(endtime).Day).AddMonths(-Months).ToLongDateString()).ToString("yyyy-MM-dd");
+            string endmouth = Convert.ToDateTime(DateTime.Parse(endtime).AddDays(1 - DateTime.Parse(endtime).Day).AddMonths(-Months).AddMonths(1).AddDays(-1).ToLongDateString()).ToString("yyyy-MM-dd");
             string syear = Convert.ToDateTime(DateTime.Parse(stime).AddDays(1 - DateTime.Parse(stime).Day).Date.AddYears (-1).ToLongDateString()).ToString("yyyy-MM-dd");
             string endyear= Convert.ToDateTime(DateTime.Parse(endtime).AddDays(1 - DateTime.Parse(endtime).Day).Date.AddMonths(1).AddSeconds(-1).AddYears(-1).ToLongDateString()).ToString("yyyy-MM-dd");
-           
-           
             #endregion
             string time = $" and datediff(day,F_CreateOn,'{stime}')<=0 and datediff(day,F_CreateOn,'{endtime}')>=0 ";
             string lastmouth = $" and datediff(day,F_CreateOn,'{smouth}')<=0 and datediff(day,F_CreateOn,'{endmouth}')>=0 ";
             string lastyear= $" and datediff(day,F_CreateOn,'{syear}')<=0 and datediff(day,F_CreateOn,'{endyear}')>=0 ";
             BigDate model = new BigDate();
             model.salesBase  = new List<Template>();
-            string strType = "";
             if (type >0)
             {
                 sql += $"and F_Type = " + type;
             }
             if (!string.IsNullOrEmpty(salesBase))
             {
-                strType = $" and F_SalesBase='" + salesBase.Trim() + "'";
+                sql += $" and F_SalesBase='" + salesBase.Trim() + "'";
             }
-            string strChannel = "";
+          
             if (area > 0 || branch > 0 || !string.IsNullOrEmpty(channel))
             {
-                strChannel= " and  T_Wo_WorkOrder.F_CusPhone in ( " + GetCustomerrel(area, branch, channel) + ") ";
+                sql += " and  T_Wo_WorkOrder.F_CusPhone in ( " + GetCustomerrel(area, branch, channel) + ") ";
             }
-            string strCategory = "";
+          
             if (!string.IsNullOrEmpty(product))
             {
-                strCategory = $" and F_TS_Category='" + product.Trim() + "'";
+                sql += $" and F_TS_Category='" + product.Trim() + "'";
             }
             #region 反馈类型
             for (int i=0;i <5;i++)
@@ -2273,7 +2270,15 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     sqltype = $"and F_SalesBase in ('新乡','新疆','九江','东北')";
                 }
-                model.salesBase .Add(ReturenTemplate(template,sql + sqltype+ strChannel+ strCategory, time , lastmouth, lastyear));
+                if (!string.IsNullOrEmpty(salesBase))
+                {
+                    model.salesBase.Add(ReturenTemplate(template, sql, time, lastmouth, lastyear));
+                }
+                else
+                {
+                    model.salesBase.Add(ReturenTemplate(template, sql + sqltype, time, lastmouth, lastyear));
+                }
+              
             }
             #endregion
             #region 产品
@@ -2296,14 +2301,14 @@ namespace CallCenterApi.Interface.Controllers.report
                 }
                 Template template = new Template();
                 template.name = "合计";
-                model.product.Add(ReturenTemplate(template, sql + strChannel + $"and F_TS_Category in (" + msf + ")" + strType, time, lastmouth, lastyear));
+                model.product.Add(ReturenTemplate(template, sql  + $"and F_TS_Category in (" + msf + ")" , time, lastmouth, lastyear));
                 foreach (var it in dicval)
                 {
                     Template templates = new Template();
                     string mag = "";
                     mag = $"and F_TS_Category = '" + it.F_Name+"'";
                     templates.name = it.F_Name;
-                    model.product.Add(ReturenTemplate(templates, sql + strChannel + strType + mag, time, lastmouth, lastyear));
+                    model.product.Add(ReturenTemplate(templates, sql   + mag, time, lastmouth, lastyear));
                 }
             }
             #endregion
@@ -2319,14 +2324,14 @@ namespace CallCenterApi.Interface.Controllers.report
             {
                 Template templates = new Template();
                 templates.name = "合计";
-                model.channel.Add(ReturenTemplate(templates, sql + strCategory + strType , time, lastmouth, lastyear));
+                model.channel.Add(ReturenTemplate(templates, sql , time, lastmouth, lastyear));
                 foreach (var it in QDLXl)
                 {
                     Template template = new Template();
                     string str = "";
                     str = " and  T_Wo_WorkOrder.F_CusPhone in ( " + GetCustomerrel(area, branch, it.F_Name) + ") ";
                     template.name = it.F_Name;
-                    model.channel.Add(ReturenTemplate(template,sql+strCategory  + strType + str, time, lastmouth, lastyear));
+                    model.channel.Add(ReturenTemplate(template,sql + str, time, lastmouth, lastyear));
                 }
             }
             #endregion
@@ -2360,7 +2365,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         break;
                    
                 }
-                model.state.Add(ReturenTemplate(template,sql  + sqlchannel+strChannel + strCategory + strType, time, lastmouth, lastyear));
+                model.state.Add(ReturenTemplate(template,sql  + sqlchannel, time, lastmouth, lastyear));
             }
             #endregion
             #region 满意度
@@ -2394,7 +2399,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         break;
                   
                 }
-                model.satisfaction .Add(ReturenTemplate(template,sql + sqlsatisfaction + strChannel + strCategory + strType, time, lastmouth, lastyear));
+                model.satisfaction .Add(ReturenTemplate(template,sql + sqlsatisfaction, time, lastmouth, lastyear));
                 #endregion
               
                  
@@ -2403,7 +2408,7 @@ namespace CallCenterApi.Interface.Controllers.report
             #region 超期工单
             model.overdue = new List<Template>();
             string sqloverdue = "";
-            sqloverdue += strChannel + strCategory + strType;
+            sqloverdue += "";
             var modlelist = workOrder.GetModelList(sql + sqloverdue + "and F_IsOver=1" + time);
             Template templatee = new Template();
             templatee.name = "合计";
@@ -2468,6 +2473,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         it.Lastyearnumber = lastyearmodlel;
                         it.Lastmonth = it.number - lastmouthmodlel;
                         it.Lastyear = it.number - lastyearmodlel;
+                       
                     }
                     else
                     {
@@ -2500,8 +2506,10 @@ namespace CallCenterApi.Interface.Controllers.report
                         }
                         it.Lastmonthnumber = lastmouthlist;
                         it.Lastyearnumber = lastyearlist;
-                        it.Lastmonth = it.number - lastmouthlist;
-                        it.Lastyear = it.number - lastyearlist;
+                        it.Lastmonth= it.number - lastmouthlist;
+                        it.Lastyear= it.number - lastyearlist;
+                        
+                       
                     }
                 }
                  
@@ -2648,8 +2656,9 @@ namespace CallCenterApi.Interface.Controllers.report
             yearnumber = new BLL.T_Wo_WorkOrder().GetModelList(sql + lastyear).Count;//
             template.Lastmonthnumber = mounthnumber;
             template.Lastyearnumber = yearnumber;
-            template.Lastmonth = template.number - mounthnumber;
             template.Lastyear = template.number - yearnumber;
+            template.Lastmonth = template.number - mounthnumber;
+            
             return template;
         }
 
@@ -2658,15 +2667,31 @@ namespace CallCenterApi.Interface.Controllers.report
         /// 市场反馈一览表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetFeedbacklList()
+        public ActionResult GetFeedbacklList(string stime, string endtime)
         {
             string sql = $"  F_IsDelete=0";
             DataTable dt = new DataTable();
             #region 筛选条件
             List<Feedback> modelList = new List<Feedback>(5);
-            string smonthtime = DateTime.Now.Date.ToString("yyyy-MM-01 00:00:00");
+            string smonthtime = "";
+            if (!string .IsNullOrEmpty (stime))
+            {
+                smonthtime = stime .Trim() + " 00:00:01 "; ;
+            }
+            else
+            {
+                smonthtime = DateTime.Now.Date.ToString("yyyy-MM-01 00:00:00");
+            }
+            if (string .IsNullOrEmpty (endtime))
+            {
+                 endtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            }
+            else
+            {
+                endtime = endtime + " 23:59:59 "; ;
+            }
             string sdaytime = DateTime.Now.Date.ToString("yyyy-MM-dd 00:00:00");
-            string endtime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            
             for (int i = 1; i <= 5; i++)
             {
                 Feedback model = new Feedback();
@@ -2868,17 +2893,26 @@ namespace CallCenterApi.Interface.Controllers.report
             public string F_QuestionType;
             public int number;
         }
+        public class worker
+        {
+            public string F_WorkOrderCode;//工单编号
+            public string F_State;//工单状态
+            public string overtime;//超期时间
+            public string F_Description;//问题描述
+            public string F_Responsibility;//责任科室
+            public string F_SalesBase;//销售基地
+        }
+       
         /// <summary>
         ///月份投诉处理周期表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetComplainthandlList(string product,string salesBase,string stime ="", string endtime="", string questionName = "" )
+        public ActionResult GetComplainthandlList(string salesBase,string stime ="", string endtime="", string questionName = "" )
         {
             string sql = $"  F_IsDelete=0";
             if (!string.IsNullOrWhiteSpace(salesBase))//销售基地
                 sql += $" and F_SalesBase like '%" + salesBase.Trim() + "%'";
-            if (!string.IsNullOrWhiteSpace(product))//产品
-                sql += $" and F_TS_Category='" + product.Trim() + "'";
+         
             string Queststr = "";
             if (questionName!="")
             {
@@ -2886,147 +2920,257 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             else
             {
-
                 Queststr = " select * from T_Wo_QuestionManage where F_IsDelete=0 AND F_Label in(3)";
             }
-            DataTable QuestionManage = DbHelperSQL.Query(Queststr).Tables[0];
-            List<Model.T_Wo_QuestionManage> categorylist = quesBLL.DataTableToList(QuestionManage);
-            List<Complainthandling> modeNamelList = new List<Complainthandling>(categorylist.Count);
-            string time = "";
-            if (stime == "")
+            int year = DateTime.Now.Year;//当前年  
+            int mouth = DateTime.Now.Month;//当前月  
+            if (stime != "")
+            {
+                year = DateTime.Parse(stime).Year;
+                mouth = DateTime.Parse(stime).Month;
+            }
+            int beforeYear = 0;
+            int beforeMouth = 0;
+            if (mouth <= 1)//如果当前月是一月，那么年份就要减1  
+            {
+                beforeYear = year - 1;
+                beforeMouth = 12;//上个月  
+            }
+            else
+            {
+                beforeYear = year;
+                beforeMouth = mouth - 1;//上个月  
+            }
+            string beforeMouthOneDay = beforeYear + "年" + beforeMouth + "月" + 1 + "日";//上个月第一天  
+            string beforeMouthLastDay = beforeYear + "年" + beforeMouth + "月" + DateTime.DaysInMonth(year, beforeMouth) + "日";//上个月最后一天
+            string time1 = DateTime.Parse(beforeMouthOneDay).ToString("yyyy-MM-dd");
+            string time2 = DateTime.Parse(beforeMouthLastDay).ToString("yyyy-MM-dd");
+            sql += "and F_Type=2";
+            string where= " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + time1.Trim() + " 00:00:01', 120) ";
+            where += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + time2.Trim() + " 00:00:01', 120) ";
+            var lastmodellist = workOrder.GetModelList(sql+ where);
+            if (stime != null && stime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            else
             {
                 stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date.ToString("yyyy-MM-dd");
+                sql += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
+            }
+            if (endtime != null && endtime.Trim() != "")
+            {
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            if (endtime == "")
+            else
             {
                 endtime = DateTime.Now.ToString("yyyy-MM-dd");
+                sql += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }
-            List<Complainthandling> modelList = new List<Complainthandling>(categorylist.Count);
-            for (int i = 0; i < categorylist.Count; i++)
+          
+            var modellist = workOrder.GetModelList(sql);
+            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 ");
+            if (modellist !=null )
             {
-                Complainthandling model = new Complainthandling();
-                model.name = categorylist[i].F_QuestionName;
-                string strnumber = " select  F_QuestionType,count(F_QuestionType) number from T_Wo_WorkOrder where" + sql+"and F_QuestionType= '" + categorylist[i].F_Id  +"'" +
-                    "group by F_QuestionType order by count(F_QuestionType) desc";
-                DataTable QuestionType = DbHelperSQL.Query(strnumber).Tables[0];
-                List<QuestionType> QuestionTypelists = DataTableToList(QuestionType);
-                if (QuestionTypelists.Count >0)
-                {
-                    model.number = QuestionTypelists[0].number;
-                }
-                else
-                {
+                for (int i=0;i < categorylist.Count; i++)
+              {
+                 Complainthandling model = new Complainthandling();
+                    model.name = categorylist[i].F_QuestionName;
                     model.number = 0;
-                }
-                string msg = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + time + "and F_QuestionType  =" + "'" + categorylist[i].F_Id  + "'" + "ORDER BY number ";
-                DataTable dtxy = DbHelperSQL.Query(msg).Tables[0];
-                List<QuestionType> QuestionTypes = DataTableToList(dtxy);
-                float average = 0;
-                int med = QuestionTypes.Count / 2;
-                if (QuestionTypes.Count>0)
-                {
-                    for (int j = 0; j < QuestionTypes.Count; j++)
+                  int efficiency = 0;
+                    model.worker = new List<worker>();
+                    foreach (var it in modellist)
                     {
-                        if(QuestionTypes.Count==1)
-                        {
-                            model.minimumtime = QuestionTypes[j].number.ToString();
-                            model.ongesttime = QuestionTypes[j].number.ToString();
-                            model.median = QuestionTypes[j].number.ToString();
-                        }
-                        else
+                        try
                         {
-                            if (j == 0)
+                            if (int .Parse (it.F_QuestionType) == categorylist[i].F_Id )
                             {
-                                model.minimumtime = QuestionTypes[j].number.ToString();
-                            }
-                            else if (j == QuestionTypes.Count - 1)
-                            {
-                                model.ongesttime = QuestionTypes[j].number.ToString();
-                            }
-                            else if (j == med)
-                            {
-                                model.median = QuestionTypes[j].number.ToString();
+                                model.number ++;
+                                if (it .F_State ==10|| it.F_State == 11)
+                                {
+                                    efficiency++;
+                                    System.TimeSpan id = DateTime.Parse(it.F_DealTime.ToString()) - DateTime.Parse(it.F_CreateOn.ToString());
+                                    double t = id.TotalHours;
+                                    List<float> timehource = new List<float>();
+                                    timehource.Add((float)t);
+
+                                    if (timehource.Count > 0)
+                                    {
+                                        timehource.Sort((a, b) => b.CompareTo(a));
+                                        model.ongesttime = string.Format("{0:f2}h", timehource[0]);
+                                        model.minimumtime = string.Format("{0:f2}h", timehource[timehource.Count - 1]);
+                                        int n = timehource.Count / 2;
+                                        model.median = string.Format("{0:f2}h", timehource[n]);
+                                        float y = 0;
+                                        foreach (var iu in timehource)
+                                        {
+                                            y += iu;
+                                        }
+                                        model.averageTime = string.Format("{0:f2}h", y / timehource.Count);
+                                    }
+                                    else
+                                    {
+                                        model.ongesttime = "0h";
+                                        model.minimumtime = "0h";
+                                        model.median = "0h";
+                                        model.averageTime = "0h";
+                                    }
+                                }
+                                else
+                                {
+                                    model.ongesttime = "0h";
+                                    model.minimumtime = "0h";
+                                    model.median = "0h";
+                                    model.averageTime = "0h";
+                                }
+                                int Overdue = 0;
+                              
+                                if (it .F_IsOver ==1&& it.F_State !=11)
+                                {
+                                    worker worker = new worker();
+                                    worker.F_WorkOrderCode = it.F_WorkOrderCode;
+                                    if (it.F_State == 1)
+                                        worker.F_State = "待接单";
+                                    else if (it.F_State == 2)
+                                        worker.F_State = "待处理";
+                                    else if (it.F_State == 3)
+                                        worker.F_State = "已退回";
+                                    else if (it.F_State == 4)
+                                        worker.F_State = "异常退回";
+                                    else if (it.F_State == 4)
+                                        worker.F_State = "异常退回";
+                                   else 
+                                        worker.F_State = "已处理";
+                                    worker.F_SalesBase = it.F_SalesBase;
+                                    worker.F_Description = it.F_Description;
+                                    string timeover = "", timeover2 = ""; int x = 0, y = 0;
+                                    int limit =0;
+                                    if (itemlasts != null )
+                                    {
+                                     for (int z = 0; z < itemlasts.Count; z++)
+                                      {
+                                             if (it.F_ID == itemlasts[z].F_WoID)
+                                              {
+                                                if (itemlasts[z].F_WoState >= 1)
+                                                {
+                                                    if (itemlasts[z].F_WoState == 1)
+                                                    {
+                                                        x = z;
+                                                        timeover = itemlasts[z].F_CreateTime.ToString();
+                                                        limit =int .Parse ( itemlasts[z].F_LimitTime);
+                                                    }
+                                                    if (itemlasts[z].F_WoState == 10)
+                                                    {
+                                                        y = z;
+                                                        timeover2 = itemlasts[z].F_CreateTime.ToString();
+                                                        limit = int.Parse(itemlasts[z].F_LimitTime);
+                                                    }
+                                                }
+                                                if (timeover2 != "")
+                                                {
+                                                    if (timeover != "")
+                                                    {
+                                                        if (x > y)
+                                                        {
+                                                            System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
+                                                            double a = id.TotalHours;
+                                                            worker.overtime = string .Format ("{0:f2}h", 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;
+                                                                }
+                                                            }
+
+                                                        }
+                                                        else
+                                                        {
+                                                            System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
+                                                            double a = id.TotalHours;
+                                                            worker.overtime = string.Format("{0:f2}h", 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;
+                                                                }
+
+                                                            }
+
+                                                        }
+                                                    }
+
+                                                }
+                                                else if (time1 != "")
+                                                {
+                                                    System.TimeSpan id = DateTime.Now - DateTime.Parse(timeover);
+                                                    double a = id.TotalHours;
+                                                    worker.overtime = string.Format("{0:f2}h", 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;
+                                                        }
+                                                    }
+                                                }
+
+
+                                            }
+                                        }
+                                        }
+                                    Overdue++;
+                                    model.worker.Add(worker);
+                                }
+                                model.Overdue = Overdue + "";
+                                int lastnumber = 0;
+                                if (lastmodellist != null)
+                                {
+                                    foreach (var iv in lastmodellist)
+                                    {
+                                        if (iv .F_QuestionType== it.F_QuestionType)
+                                        {
+                                            if (iv.F_State ==10|| iv.F_State == 11)
+                                            lastnumber++;
+                                        }
+                                    }
+                                 }
+                                if (lastnumber==0)
+                                {
+                                    model.efficiency = string.Format("{0:f2}% ", efficiency / 1*100);
+                                }
+                                else
+                                {
+                                    int v = efficiency - lastnumber;
+                                    model.efficiency = string.Format("{0:f2}% ", v / lastnumber*100);
+                                }
                             }
                         }
-                        average += QuestionTypes[j].number;
+                        catch
+                        {
+                           
+                        }
                     }
+                    if (questionName != "")
+                        modeNamelList.Add(model);
+                    else if (model.number > 0)
+                        modeNamelList.Add(model);
                 }
-                else
-                {
-                    model.minimumtime = "0";
-                    model.ongesttime = "0";
-                    model.median = "0";
-                }
-               
-                float ave = average / QuestionTypes.Count;
-                if (float.IsNaN(ave))
-                {
-                    ave = 0;
-                }
-                model.averageTime = string.Format("{0:f2}", ave);
-                string Over = "select  F_QuestionType,count(F_IsOver) number from T_Wo_WorkOrder where  " + sql +
-                    "and F_QuestionType  ='" + categorylist[i].F_Id  + "'" + time + "group by F_QuestionType order by count(F_IsOver) desc";
-                DataTable Overdtxy = DbHelperSQL.Query(Over).Tables[0];
-                List<QuestionType> Overdue = DataTableToList(Overdtxy);
-                if (Overdue.Count >0)
-                {
-                    model.Overdue = Overdue[0].number.ToString();
-                }
-                else
-                {
-                    model.Overdue ="0";
-                }
-                int year = DateTime.Now.Year;//当前年  
-                int mouth = DateTime.Now.Month;//当前月  
-                if (stime != "")
-                {
-                    year = DateTime.Parse(stime).Year;
-                    mouth = DateTime.Parse(stime).Month;
-                }
-                int beforeYear = 0;
-                int beforeMouth = 0;
-                if (mouth <= 1)//如果当前月是一月，那么年份就要减1  
-                {
-                    beforeYear = year - 1;
-                    beforeMouth = 12;//上个月  
-                }
-                else
-                {
-                    beforeYear = year;
-                    beforeMouth = mouth - 1;//上个月  
-                }
-                string beforeMouthOneDay = beforeYear + "年" + beforeMouth + "月" + 1 + "日";//上个月第一天  
-                string beforeMouthLastDay = beforeYear + "年" + beforeMouth + "月" + DateTime.DaysInMonth(year, beforeMouth) + "日";//上个月最后一天
-                string time1 = DateTime.Parse(beforeMouthOneDay).ToString("yyyy-MM-dd");
-                string time2 = DateTime.Parse(beforeMouthLastDay).ToString("yyyy-MM-dd");
-                string times = "";
-                times += " and CONVERT(varchar , F_CreateOn, 120)>=CONVERT(varchar , '" + time1.Trim() + " 00:00:01', 120) ";
-                times += " and CONVERT(varchar , F_CreateOn, 120)<=CONVERT(varchar , '" + time2.Trim() + " 23:59:59', 120) ";
-                string msgs = "select F_QuestionType,datediff(HH ,F_CreateOn,F_DealTime) number from T_Wo_WorkOrder where " + sql + times + "and F_QuestionType  =" + "'" + categorylist[i].F_Id  + "'" + "ORDER BY number ";
-                DataTable dtxys = DbHelperSQL.Query(msgs).Tables[0];
-                List<QuestionType> Questionmonth = DataTableToList(dtxys);
-                float efficien = 0;
-                for (int j = 0; j < Questionmonth.Count; j++)
-                {
-                    efficien += Questionmonth[j].number;
-                }
-                float eff = efficien / Questionmonth.Count;
-                float Percentile = (ave - eff) / eff * 100;
-              
-                if (float .IsNaN (Percentile) )
-                {
-                    Percentile = 0;
-                }
-                model.efficiency = string.Format("-{0:f2}% ", Percentile);
-                modelList.Add(model);
             }
-            modelList.Sort((a, b) => b .number .CompareTo(a .number ));
+            modeNamelList.Sort((a, b) => b .number .CompareTo(a .number ));
             var obj = new
             {
                 state = "success",
                 message = "成功",
-                rows = modelList,
-                total = modelList.Count 
+                rows = modeNamelList,
+                total = modeNamelList.Count 
             };
 
             return Content(obj.ToJson()); ;

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

@@ -202,6 +202,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             return Error("加载失败");
         }
+        public ActionResult GetQuestionName()
+        {
+            DataTable dt = new DataTable();
+            var sql = "and F_IsDelete=0";
+            sql += "and  F_Label=3";
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                       "T_Wo_QuestionManage",
+                       "F_ID",
+                       "*",
+                       sql,
+                       "ORDER BY T_Wo_QuestionManage.F_ID ",
+                       10000,
+                       1,
+                       true,
+                       out recordCount);
+
+            List<Model.T_Wo_QuestionManage> modelList = new BLL.T_Wo_QuestionManage().DataTableToList(dt);
+            if (modelList != null)
+            {
+                if (modelList.Count > 0)
+                    return Success("加载成功", modelList);
+            }
+            return Error("加载失败");
+        }
         public ActionResult GetQuestionType(int type = 0,int pid=0)
         {
             DataTable dt = new DataTable();

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

@@ -231,6 +231,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
                             sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
+                            sql += $" and F_IsVisit=" +1; ;
                         }
                         else if (ro.F_RoleCode == "XTGLY")
                         {
@@ -419,6 +420,67 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             return Success("暂无工单");
                         }
                         break;
+                    case 19://综合回访
+                        if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBZZX")
+                        {
+                            sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
+                           
+                        }
+                        else if (ro.F_RoleCode == "XTGLY")
+                        {
+                            uwhere = ""; ;
+                        }
+                        else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                        {
+                            string detpid = "";
+                            var deparmentlist = new List<Model.T_Sys_Department>();
+                            Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                            if (dModel != null)
+                            {
+                                if (dModel.F_Layer == 1)
+                                {
+                                    deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                    if (deparmentlist.Count > 0)
+                                    {
+                                        foreach (var it in deparmentlist)
+                                        {
+                                            if (detpid != "")
+                                            {
+                                                detpid += "," + it.F_DeptId;
+                                            }
+                                            else
+                                            {
+                                                detpid = "" + it.F_DeptId; ;
+                                            }
+                                        }
+                                    }
+                                }
+                                else
+                                {
+                                    detpid = ua.F_DeptId.ToString();
+                                }
+                                if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") != "")
+                                {
+                                    sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.evaluate + "") + ") "; ;
+                                }
+                                else
+                                {
+
+                                    return Success("暂无工单"); ;
+                                }
+
+                            }
+                            else
+                            {
+                                return Error("加载失败");
+                            }
+                        }
+                        else
+                        {
+                            return Success("无操作权限"); ;
+                        }
+                        sql += $" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
+                        break;
                 }
                 #endregion
                 int recordCount = 0;
@@ -481,9 +543,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string uwhere = " ";
                 string sql = "";
-              int  Assign=0, Receipt = 0, Acceptedorders = 0, Ovar = 0, Allocated = 0, Tobevisited = 0, Returnvisit = 0, Tobefinished = 0, GCApproved = 0, CustomerWorkorder = 0, Delays =
-                    0, DeWorkOrder = 0, Approved = 0, WeChatWorkOrder = 0  , TobeApproved = 0, Createdbill = 0, Backid = 0;
-                for (int i=0;i<=18;i ++)
+                if (!Refresh())
+                {
+                    return Error("查询失败");
+                }
+                int DZP = 0, YCD = 0, DJD = 0, DCL = 0, YQGD = 0, YZP = 0, DSP = 0, YCL = 0, GCDBL = 0, YBL = 0, WSP =
+                    0, YGGD = 0, KHFK = 0, CQGD = 0  , CBGD = 0, TD = 0, ZHCX = 0, RV_awaitVist = 0, RV_haveVisit = 0, RV_resultVisit = 0, DWJ = 0,ZHHF=0; ; 
+                for (int i=0;i<=20;i ++)
                 {
                     switch (i )
                     {
@@ -498,7 +564,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 uwhere = "";
                             }
-                           
                             #region 获取部门工单列表
                             else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
                             {
@@ -535,16 +600,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                     else
                                     {
-                                        Assign = 0;
+                                        DZP = 0;
                                         break;
                                     }
-
+                                   
                                 }
                                 else
                                 {
-                                    Assign = 0;
+                                    DZP = 0;
                                     break;
                                 }
+                               
                             }
                             #endregion
                             else
@@ -552,7 +618,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 sql += $" and F_CreateBy like '%" + ua.F_UserCode + "%'"; ;
                             }
                             sql += $" and F_State in(" + (int)EnumWorkOrderState.neworder + "," + (int)EnumWorkOrderState.reassign + ")" + " " + uwhere;
-                             Assign = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count ;//指派
+                            DZP = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count ;//指派
                             break;
                         case 1://待接单的
                             sql = "";
@@ -567,10 +633,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
 
-                                Receipt = 0;
+                                DJD = 0;
                                 break;
                             }
-                             Receipt = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//接单
+                            DJD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//接单
                             break;
                         case 2://待完成的(待处理)
                             sql = "";
@@ -581,17 +647,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                Acceptedorders = 0;
+                                DCL = 0;
                                 break;
                             }
-                             Acceptedorders = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已接单
+                            DCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已接单
                         
                             break;
                         case 10://已完成的
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             sql += " and F_State =" + (int)EnumWorkOrderState.finish + " and F_DealBy = '" + ua.F_UserCode + "' ";
-                             Ovar = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
+                            YCL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已完成的
                           
                             break;
                         case 3://客服已分配
@@ -602,10 +668,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (GetParticipateID() != "")
                                 {
                                     sql += " and  T_Wo_WorkOrder.F_ID in ( " + GetParticipateID() + ") ";
+                                    sql += " and F_State =" + (int)EnumWorkOrderState.assign;
                                 }
                                 else
                                 {
-                                    Allocated = 0;
+                                    YZP = 0;
                                     break;
                                 }
                             }
@@ -617,12 +684,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
-                                    Allocated = 0;
+                                    YZP = 0;
                                     break;
                                 }
                             }
-                            
-                             Allocated = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客服已分配
+
+                            YZP = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客服已分配
                        
                             break;
                         case 4://待回访
@@ -634,11 +701,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                Tobevisited = 0;
+                                RV_awaitVist = 0;
                                 break;
                             }
                             sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "1" + "' " + uwhere; ;
-                             Tobevisited = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
+                            RV_awaitVist = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待回访
                       
                             break;
                         case 6://已回访
@@ -648,6 +715,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 sql += " and (F_CreateBy= '" + ua.F_UserCode + "' or T_Wo_WorkOrder.F_ID in ( " + GetCYWorkOrderID(ua.F_UserCode) + ") or F_State =13)";
                                 sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate; ;
+                              
                             }
                             else if (ro.F_RoleCode == "XTGLY")
                             {
@@ -689,25 +757,27 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     else
                                     {
 
-                                        Returnvisit = 0;
+                                        RV_haveVisit = 0;
                                         break;
                                     }
 
                                 }
                                 else
                                 {
-                                    Returnvisit = 0;
+                                    RV_haveVisit = 0;
                                     break;
                                 }
                             }
                             else
                             {
-                                Returnvisit = 0;
+                                RV_haveVisit = 0;
                                 break;
                             }
+                            string where=$" and F_State in(10," + (int)EnumWorkOrderState.evaluate + ")"; ;
+                            RV_resultVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql+ where).Count;//
                             sql += $" and F_State=" + (int)EnumWorkOrderState.evaluate;
-                             Returnvisit= new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已回访
-                          
+                            sql += $" and F_IsVisit=" + 1; ;
+                            RV_haveVisit = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已回访
                             break;
                         case 7://待完结
                             sql = "";
@@ -718,11 +788,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                Tobefinished = 0;
+                                DWJ = 0;
                                 break; ;
                             }
                             sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
-                             Tobefinished = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
+                            DWJ = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待完结
                             break;
                         case 8://待审批
                             sql = "";
@@ -737,10 +807,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
 
-                                GCApproved = 0;
+                                GCDBL = 0;
                                 break; ;
                             }
-                             GCApproved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//高层待审批
+                            GCDBL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//高层待审批
                             break;
                         case 9://客户工单
                             sql = "";
@@ -751,11 +821,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                CustomerWorkorder = 0;
+                                KHFK = 0;
                                 break; ;
                             }
                             sql += $" and F_State=" + (int)EnumWorkOrderState.customers;
-                             CustomerWorkorder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
+                            KHFK = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
 
                             break;
                         case 11://延期工单
@@ -767,10 +837,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                Delays = 0;
+                                YQGD = 0;
                                 break; ;
                             }
-                             Delays = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
+                            YQGD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//客户工单
                           
                             break;
                         case 12://微信未通过工单
@@ -782,11 +852,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                DeWorkOrder = 0;
+                                WSP = 0;
                                 break; ;
                             }
                             sql += $" and F_State=" + (int)EnumWorkOrderState.recustomers;
-                             DeWorkOrder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信未通过工单
+                            WSP = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信未通过工单
                          
                             break;
                         case 13://已审批
@@ -800,16 +870,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
-                                    Approved = 0;
+                                    YBL = 0;
                                     break; ;
                                 }
                             }
                             else
                             {
-                                Approved = 0;
+                                YBL = 0;
                                 break; ;
                             }
-                             Approved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已审批
+                            YBL = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//已审批
                            
                             break;
                         case 14://业务员工单
@@ -821,10 +891,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                WeChatWorkOrder = 0;
+                                YGGD = 0;
                                 break; ;
                             }
-                             WeChatWorkOrder = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信业务员工单
+                            YGGD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//微信业务员工单
                            
                             break;
                         case 15://待审批
@@ -838,29 +908,178 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else
                                 {
-                                    TobeApproved = 0;
+                                    DSP = 0;
                                     break; ;
                                 }
                             }
                             else
                             {
-                                TobeApproved = 0;
+                                DSP = 0;
                                 break; ;
                             }
 
-                             TobeApproved = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待审批
-
-                      
+                            DSP = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//待审批
                             break;
-                        case 16://已创单
+                        case 16:
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             sql += $" and F_CreateBy  ='" + ua.F_UserCode + "'";
-                             Createdbill = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//业务员已创单
+                            YCD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//业务员已创单
+                            break;
+                     
+                        case 17://超期
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            sql += $" and F_IsOver=" + 1;
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "YWY" || ro.F_RoleCode == "BLRY")
+                            {
+                                sql += $" and F_DealBy like '%" + ua.F_UserCode.Trim() + "%'";
+                            }
+                            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "ZG")
+                            {
+                                string detpid = "";
+                                var deparmentlist = new List<Model.T_Sys_Department>();
+                                Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                                if (dModel != null)
+                                {
+                                    if (dModel.F_Layer == 1)
+                                    {
+                                        deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                        if (deparmentlist.Count > 0)
+                                        {
+                                            foreach (var it in deparmentlist)
+                                            {
+                                                if (detpid != "")
+                                                {
+                                                    detpid += "," + it.F_DeptId;
+                                                }
+                                                else
+                                                {
+                                                    detpid = "" + it.F_DeptId; ;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        detpid = ua.F_DeptId.ToString();
+                                    }
+                                    if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + ", " + (int)EnumWorkOrderState.receive + "," +
+                            (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") != "")
+                                    {
+                                        sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
+                            (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "") + ") "; ;
+                                    }
+                                    else
+                                    {
 
-                           
+                                        CQGD = 0;
+                                        break; ;
+                                    }
+
+                                }
+                                else
+                                {
+                                    CQGD = 0;
+                                    break; ;
+                                }
+                            }
+                            else if (ro.F_RoleCode == "JDYBZZX")
+                            {
+                                sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
+                            }
+                            else if (ro.F_RoleCode == "QTJS")
+                            {
+                                CQGD = 0;
+                                break; ;
+                            }
+                            CQGD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//超期
+                            break;
+                        case 18://催办
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            var list = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.urge);
+                            string str = "";
+                           foreach (var it in list)
+                            {
+                                if (str !="")
+                                    str += "," + it.F_WoID;
+                                else
+                                    str= ""+it.F_WoID;
+                            }
+                            if (str != "")
+                            {
+                                sql += $"  and T_Wo_WorkOrder.F_ID in(" + str + ")";
+                            }
+                            else
+                            {
+                                CBGD = 0;
+                                break;
+                            }
+                            CBGD = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//催办
+                            break;
+                        case 19://综合查询
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            if (ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "YWY")
+                                sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
+                            else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
+                            {
+                                string detpid = "";
+                                var deparmentlist = new List<Model.T_Sys_Department>();
+                                Model.T_Sys_Department dModel = departmentBLL.GetModel(ua.F_DeptId);
+                                if (dModel != null)
+                                {
+                                    if (dModel.F_Layer == 1)
+                                    {
+                                        deparmentlist = new BLL.T_Sys_Department().GetModelList(" F_State=1 and F_Layer=" + 2 + " and F_ParentId=" + dModel.F_DeptId);
+                                        if (deparmentlist.Count > 0)
+                                        {
+                                            foreach (var it in deparmentlist)
+                                            {
+                                                if (detpid != "")
+                                                {
+                                                    detpid += "," + it.F_DeptId;
+                                                }
+                                                else
+                                                {
+                                                    detpid = "" + it.F_DeptId;
+                                                }
+                                            }
+                                        }
+                                    }
+                                    else
+                                    {
+                                        detpid = ua.F_DeptId.ToString();
+                                    }
+                               
+                                        if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
+                            (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
+                            + "," + (int)EnumWorkOrderState.evaluate + "") != "")
+                                        {
+
+                                            sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
+                            (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
+                            + "," + (int)EnumWorkOrderState.evaluate + "") + ") ";
+                                        }
+                                        else
+                                        {
+
+                                        ZHCX = 0;
+                                        break;
+                                    }
+                                  
+
+                                }
+                                else
+                                {
+                                    ZHCX = 0;
+                                    break;
+                                }
+                            }
+                            ZHCX = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//综合查询
                             break;
-                        case 17://退单
+                        case 20://退单
                             sql = "";
                             sql += $"  F_IsDelete=0";
                             if (GetBackid(ua) != "")
@@ -869,37 +1088,43 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             else
                             {
-                                Backid = 0;
-                                break; ;
+                                TD = 0;
+                               break;
                             }
-                             Backid = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//退单
+                            TD  = new BLL.T_Wo_WorkOrder().GetModelList(sql).Count;//综合查询
                             break;
+
+
                     }
                 }
 
                 #endregion
-              
+
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
-                    Assign = Assign,//指派
-                    Receipt = Receipt,//待接单
-                    Acceptedorders = Acceptedorders,//已接单（待处理）
-                    Ovar = Ovar,//已完成的
-                    Allocated = Allocated,//客服已分配
-                    Tobevisited = Tobevisited,//待回访
-                    Returnvisit = Returnvisit,//已回访
-                    Tobefinished = Tobefinished,//待完结
-                    GCApproved = GCApproved,//高层待审批
-                    CustomerWorkorder = CustomerWorkorder,//客户工单
-                    Delays = Delays,//延期工单
-                    DeWorkOrder = DeWorkOrder,//微信未通过工单
-                    Approved = Approved,//已审批
-                    WeChatWorkOrder = WeChatWorkOrder,//微信业务员工单
-                    TobeApproved = TobeApproved,//待审批
-                    Createdbill = Createdbill,//业务员已创单
-                    Backid = Backid,//待审批
+                    DZP = DZP,//指派
+                    DJD = DJD,//待接单
+                    DCL = DCL,//已接单（待处理）
+                    YCL = YCL,//已完成的
+                    YZP = YZP,//客服已分配
+                    RV_await = RV_awaitVist,//待回访
+                    RV_have = RV_haveVisit,//已回访
+                    RV_result = RV_resultVisit,//综合回访
+                    DWJ = DWJ,//待完结
+                    GCDBL = GCDBL,//高层待审批
+                    KHFK = KHFK,//客户工单
+                    YQGD = YQGD,//延期工单
+                    WSP = WSP,//微信未通过工单
+                    YBL = YBL,//已审批
+                    YGGD = YGGD,//微信业务员工单
+                    DSP = DSP,//待审批
+                    YCD = YCD,//业务员已创单
+                    TD = TD,//退单
+                    CQGD = CQGD,//超期
+                    CBGD = CBGD,//催办
+                    ZHCX = ZHCX,//综合查询
                 };
                 return Content(obj.ToJson()); ;
             }
@@ -2241,7 +2466,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 if (type > 0 && type < 5)//工单类型
                     sql += $" and F_Type=" + type;
               if (state >= 0)//
-                   sql += $" and F_State=" + state;
+                {
+                    if (state==5)
+                    {
+                        sql += $" and F_State in (2,3,4,5)";
+                    }
+                    else if (state == 6)
+                    {
+                        sql += $" and F_State in (11)";
+                        sql += $" and F_IsVisit=" + 1; ;
+                    }
+                    else if (state == 10)
+                    {
+                        sql += $" and F_State in (10,11)";
+                    }
+                    else
+                    {
+                        sql += $" and F_State=" + state;
+                    }
+                }
+                  
                 if (source > 0)//工单来源
                     sql += $" and F_Source=" + source;
 
@@ -2300,7 +2544,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 if (ro.F_RoleCode == "QTJS" || ro.F_RoleCode == "YWY")
-                sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
+                    sql += $" and F_CreateBy like '%" + ua.F_UserCode.Trim() + "%'";
                 else if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL" || ro.F_RoleCode == "BLRY" || ro.F_RoleCode == "ZG")
                 {
                     string detpid = "";
@@ -2321,7 +2565,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                     else
                                     {
-                                        detpid="" + it.F_DeptId;
+                                        detpid = "" + it.F_DeptId;
                                     }
                                 }
                             }
@@ -2330,9 +2574,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             detpid = ua.F_DeptId.ToString();
                         }
-                        if (state>=0)
+                        if (state >= 0)
                         {
-                            if (GetDeptWorkOrderID(detpid,""+state+"" ) != "")
+                            if (GetDeptWorkOrderID(detpid, "" + state + "") != "")
                             {
 
                                 sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + state + "") + ") ";
@@ -2346,8 +2590,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         else
                         {
                             if (GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
-                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback+ "," + (int)EnumWorkOrderState.finish
-                + "," + (int)EnumWorkOrderState.evaluate+"") != "")
+                (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish
+                + "," + (int)EnumWorkOrderState.evaluate + "") != "")
                             {
 
                                 sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDeptWorkOrderID(detpid, "" + (int)EnumWorkOrderState.neworder + ", " + (int)EnumWorkOrderState.assign + "," +
@@ -2360,7 +2604,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 return Success("暂无工单"); ;
                             }
                         }
-                      
+
                     }
                     else
                     {
@@ -3115,6 +3359,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $" and F_IncidentTownship like '%" + township.Trim() + "%'";
                 #endregion
                 int recordCount = 0;
+                var list = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.urge);
+                string str = "";
+                foreach (var it in list)
+                {
+                    if (str != "")
+                        str += "," + it.F_WoID;
+                    else
+                        str = "" + it.F_WoID;
+                }
+                if (str != "")
+                {
+                    sql += $"  and T_Wo_WorkOrder.F_ID in(" + str + ")";
+                }
+                else
+                {
+                    return Success("暂无工单");
+                }
+               
                 if (!string.IsNullOrWhiteSpace(sql))
                 {
 
@@ -3128,12 +3390,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         pageindex,
                         true,
                         out recordCount);
-                    dt.Columns.Add("CBCount", typeof(int));
-                    foreach (DataRow dr in dt.Rows)
-                    {
-                        var list = itembll.GetList(" F_WoID ='" + dr["ID"].ToString() + "' and F_ItemType=" + (int)EnumItemType.urge).Tables[0];
-                        dr["CBCount"] = list.Rows.Count;
-                    }
                     List<Model.T_Wo_WorkOrder> modlelist = new BLL.T_Wo_WorkOrder().DataTableToList(dt);
                     List<WorkOrderNewInput> Input = modeltooip(modlelist);
                     if (Input != null )