大屏修改，增加筛选项，回访退单，增加注解

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

@@ -2104,6 +2104,7 @@ question, int page = 1, int limit = 10)
             public string averageTime = "0h";//平均用时
             public string median = "0h";//中位数
             public string Overdue="0";//超期数量
+            public string EndOverdue = "0";//超期数量
             public string efficiency = "0%";//效率提升率
             public List<worker> worker;
         }
@@ -2920,12 +2921,15 @@ question, int page = 1, int limit = 10)
         ///月份投诉处理周期表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetComplainthandlList(string salesBase,string stime ="", string endtime="", string questionName = "" )
+        public ActionResult GetComplainthandlList(string salesBase,string stime ="", string endtime="", string questionName = "" ,int isEnd=0)
         {
             string sql = $"  F_IsDelete=0";
             if (!string.IsNullOrWhiteSpace(salesBase))//销售基地
                 sql += $" and F_SalesBase like '%" + salesBase.Trim() + "%'";
-         
+         if (isEnd ==1)
+                sql += $" and F_State !=11";
+         else if (isEnd == 2)
+                sql += $" and F_State =11 ";
             string Queststr = "";
             if (questionName!="")
             {
@@ -2995,6 +2999,7 @@ question, int page = 1, int limit = 10)
                     model.name = categorylist[i].F_QuestionName;
                     model.number = 0;
                     int Overdue = 0;
+                    int EndOverdue = 0;
                     int efficiency = 0;
                     model.worker = new List<worker>();
                     int lastnumber = 0;
@@ -3012,7 +3017,7 @@ question, int page = 1, int limit = 10)
                                     double t = id.TotalHours;
                                     timehource.Add((float)t);
                                 }
-                                if (it .F_IsOver ==1&& it.F_State !=11)
+                                if (it .F_IsOver ==1)
                                 {
                                     worker worker = new worker();
                                     worker.F_WorkOrderCode = it.F_WorkOrderCode;
@@ -3026,7 +3031,9 @@ question, int page = 1, int limit = 10)
                                         worker.F_State = "异常退回";
                                     else if (it.F_State == 4)
                                         worker.F_State = "异常退回";
-                                   else 
+                                    else if (it.F_State == 11)
+                                        worker.F_State = "已回访";
+                                    else 
                                         worker.F_State = "已处理";
                                     if (it .F_Type == "1")
                                     {
@@ -3139,10 +3146,14 @@ question, int page = 1, int limit = 10)
                                             }
                                         }
                                         }
-                                    Overdue++;
+                                    if (it.F_State != 11)
+                                        Overdue++;
+                                    else
+                                        EndOverdue++;
                                     model.worker.Add(worker);
                                 }
                                 model.Overdue = Overdue + "";
+                                model.EndOverdue = EndOverdue + "";
                                 if (lastmodellist != null)
                                 {
                                     foreach (var iv in lastmodellist)

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

@@ -37,7 +37,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取工单列表
         /// </summary>
         /// <returns></returns>
-        public ActionResult GetList(string code, string cusname, string cusphone, string createby, string starttime, string endtime, string keywords, string companyname, string province, string city,
+        public ActionResult GetList(string code,string visitResult, string cusname, string cusphone, string createby, string starttime, string endtime, string keywords, string companyname, string province, string city, string callresults ,
             string country, string telephone, string township, string touser, string strvisit, string endvisit, int source = 0, int type = 0, int status = 0, int state=-1, int pageindex = 1,int pagesize = 10)
         {
            
@@ -65,6 +65,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += $"  and ( F_CusName like '%" + keywords.Trim() + "%'or F_CusPhone like '%" + keywords.Trim() + "%' ) ";
                 if (!string.IsNullOrWhiteSpace(code))//工单编号
                     sql += $" and F_WorkOrderCode like '%" + code.Trim() + "%'";
+                if (!string.IsNullOrWhiteSpace(visitResult))//
+                    sql += $" and F_VisitResult = '" + visitResult.Trim() + "'";
+                if (!string.IsNullOrWhiteSpace(callresults))//
+                    sql += $" and F_Callresults = '" + callresults.Trim() + "'";
+                
                 if (!string.IsNullOrWhiteSpace(createby))//创建人
                 {
                     string F_WorkNumber = "";
@@ -4390,7 +4395,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_IsAudit = model1[i].F_IsAudit;//是否审核
                     model.F_Highopinions = model1[i].F_Highopinions;//高层处理意见
                     model.F_CreateOn = model1[i].F_CreateOn; ;//添加时间
-                 
+                    model.F_Annotation = model1[i].F_Annotation; ;//注解
                     if (!string .IsNullOrEmpty (model1[i].F_CreateBy))
                     {
                         Model.T_Sys_UserAccount creatname = sysUserAccountBll.GetModel(model1[i].F_CreateBy);
@@ -5100,6 +5105,43 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
+        /// <summary>
+        /// 注解
+        /// </summary>
+        /// <param name="orderid"></param>
+        /// <param name="cont"></param>
+        /// <returns></returns>
+        public ActionResult Annotation(int orderid, string cont)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
+                    //验证信息 
+                    if (model != null)
+                    {
+                        if (string .IsNullOrEmpty (model.F_Annotation))
+                        {
+                            model.F_Annotation = cont;
+                        }
+                        else
+                        {
+                            model.F_Annotation = model.F_Annotation + "。" + cont;
+                        }
+                        var res = workOrder.Update(model);
+                        if (res)
+                            return Success("注解成功");
+                        else
+                            return Error("注解失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
         public ActionResult ReturnVisit(int orderid, string cont)
         {
             int userId = CurrentUser.UserData.F_UserId;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -719,6 +719,10 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        public string F_Annotation
+        {
+            get; set;
+        }
         /// <summary>
         /// 添加时间
         /// </summary>

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -102,6 +102,12 @@ namespace CallCenterApi.Model
         private string  _f_sid;
         private string _f_visitremarks;
         private string _f_brand;
+        private string _f_annotation;
+        public string F_Annotation
+        {
+            set { _f_annotation = value; }
+            get { return _f_annotation; }
+        }
         public string F_Brand
         {
             set { _f_brand = value; }
@@ -763,7 +769,7 @@ namespace CallCenterApi.Model
             set { _f_createby = value; }
             get { return _f_createby; }
         }
-    
+      
         /// <summary>
         /// 添加时间
         /// </summary>