2.4.0

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

     {
         BLL.T_RepositoryInformation infoBLL = new BLL.T_RepositoryInformation();
         // 获取知识库列表
-        public ActionResult GetList(string keywords, string pid)
+        public ActionResult GetList(string title, string content,string keywords, string pid)
         {
             string issub = RequestString.GetQueryString("issub");
             string ispass = RequestString.GetQueryString("ispass");
             //{
             //    sql += " and isnull(F_ISPass,0)=0 ";
             //}
+            if (title != null && title.Trim() != "")
+            {
+                sql += " and F_Title like '%" + title.Trim() + "%'";
+            }
+            if (content != null && content.Trim() != "")
+            {
+                sql += " and F_Content like '%" + content.Trim() + "%'";
+            }
             if (pid != null && pid.Trim() != "")
             {
                 sql += " and F_CategoryId=" + pid.Trim();
             }
             if (keywords != null && keywords.Trim() != "")
             {
-                sql = "";
                 sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
                     + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
             }

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

             string strworkid = HttpUtility.UrlDecode(RequestString.GetQueryString("workid"));
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
-            //调度员
+            string ddstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("ddstarttime"));
+            string ddstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("ddstrendtime"));
+
+            string supervisor = HttpUtility.UrlDecode(RequestString.GetQueryString("supervisor"));//督办人员
             int isproresult = RequestString.GetInt("isproresult", 0);
             int source = RequestString.GetInt("source", 0);
             int keyid = RequestString.GetInt("keyid", 0);
             {
                 sql += " and F_SplitUser = '" + splituser + "' ";
             }
-
+            if (ddstarttime.Trim() != "" && ddstarttime != "undefined")
+            {
+                if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
+                {
+                    sql += " and F_AssignTime  between   '" + ddstarttime +
+                             "' AND  '" + ddstrendtime + "'";
+                }
+                else
+                {
+                    sql += " and F_AssignTime>='" + ddstarttime + "' ";
+                }
+            }
+            else
+            {
+                if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
+                {
+                    sql += " and F_AssignTime<='" + ddstrendtime + "' ";
+                }
+            }
             if (islike > 0)
             {
                 if (strtel.Trim() != "" && strtel != "undefined")
                     }
                 }
             }
+            if (supervisor.Trim() != "" && supervisor != "undefined")
+            {//督办人员
+                var supervisorusercode = supervisor.Trim().Split(',');
+                var newusercode = "";
+                foreach (var item in supervisorusercode)
+                {
+                    if (!string.IsNullOrWhiteSpace(item.Trim()))
+                        newusercode += "'" + item + "',";
+                }
+                newusercode = newusercode.Trim(',');
 
+                if (supervisorusercode.Length > 1)
+                {
+                    if (newusercode.Trim() != "" && newusercode != "undefined")
+                    {
+                        sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
+                            "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  in ("+ newusercode + ")) ";
+                    }
+                }
+                else
+                {
+                    if (newusercode.Trim() != "" && newusercode != "undefined")
+                    {
+                        sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
+                             "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  = '" + newusercode + "') ";
+                    }
+                }
+            }
+            
             if (source != 0)
             {
                 sql += " and F_InfoSource = '" + source + "' ";

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

                             buttons.Add(VisitApproved());
                             buttons.Add(Auditfailed());
                             buttons.Add(Audittransfer());
+                            buttons.Add(Unsuccessful());
+                            
 
                         }
                         if (code == "ZXHWY")
                             buttons.Add(VisitApproved());
                             buttons.Add(Auditfailed());
                             buttons.Add(Audittransfer());
-
+                            buttons.Add(Unsuccessful());
                         }
                     }
                     break;