duhongyu 3 anni fa
parent
commit
005a762c22

+ 9 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

14
     {
14
     {
15
         BLL.T_RepositoryInformation infoBLL = new BLL.T_RepositoryInformation();
15
         BLL.T_RepositoryInformation infoBLL = new BLL.T_RepositoryInformation();
16
         // 获取知识库列表
16
         // 获取知识库列表
17
-        public ActionResult GetList(string keywords, string pid)
17
+        public ActionResult GetList(string title, string content,string keywords, string pid)
18
         {
18
         {
19
             string issub = RequestString.GetQueryString("issub");
19
             string issub = RequestString.GetQueryString("issub");
20
             string ispass = RequestString.GetQueryString("ispass");
20
             string ispass = RequestString.GetQueryString("ispass");
45
             //{
45
             //{
46
             //    sql += " and isnull(F_ISPass,0)=0 ";
46
             //    sql += " and isnull(F_ISPass,0)=0 ";
47
             //}
47
             //}
48
+            if (title != null && title.Trim() != "")
49
+            {
50
+                sql += " and F_Title like '%" + title.Trim() + "%'";
51
+            }
52
+            if (content != null && content.Trim() != "")
53
+            {
54
+                sql += " and F_Content like '%" + content.Trim() + "%'";
55
+            }
48
             if (pid != null && pid.Trim() != "")
56
             if (pid != null && pid.Trim() != "")
49
             {
57
             {
50
                 sql += " and F_CategoryId=" + pid.Trim();
58
                 sql += " and F_CategoryId=" + pid.Trim();
51
             }
59
             }
52
             if (keywords != null && keywords.Trim() != "")
60
             if (keywords != null && keywords.Trim() != "")
53
             {
61
             {
54
-                sql = "";
55
                 sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
62
                 sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
56
                     + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
63
                     + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
57
             }
64
             }

+ 51 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

63
             string strworkid = HttpUtility.UrlDecode(RequestString.GetQueryString("workid"));
63
             string strworkid = HttpUtility.UrlDecode(RequestString.GetQueryString("workid"));
64
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
64
             string strusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
65
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
65
             string strddusercode = HttpUtility.UrlDecode(RequestString.GetQueryString("ddusercode"));//调度员
66
-            //调度员
66
+            string ddstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("ddstarttime"));
67
+            string ddstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("ddstrendtime"));
68
+
69
+            string supervisor = HttpUtility.UrlDecode(RequestString.GetQueryString("supervisor"));//督办人员
67
             int isproresult = RequestString.GetInt("isproresult", 0);
70
             int isproresult = RequestString.GetInt("isproresult", 0);
68
             int source = RequestString.GetInt("source", 0);
71
             int source = RequestString.GetInt("source", 0);
69
             int keyid = RequestString.GetInt("keyid", 0);
72
             int keyid = RequestString.GetInt("keyid", 0);
181
             {
184
             {
182
                 sql += " and F_SplitUser = '" + splituser + "' ";
185
                 sql += " and F_SplitUser = '" + splituser + "' ";
183
             }
186
             }
184
-
187
+            if (ddstarttime.Trim() != "" && ddstarttime != "undefined")
188
+            {
189
+                if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
190
+                {
191
+                    sql += " and F_AssignTime  between   '" + ddstarttime +
192
+                             "' AND  '" + ddstrendtime + "'";
193
+                }
194
+                else
195
+                {
196
+                    sql += " and F_AssignTime>='" + ddstarttime + "' ";
197
+                }
198
+            }
199
+            else
200
+            {
201
+                if (ddstrendtime.Trim() != "" && ddstrendtime != "undefined")
202
+                {
203
+                    sql += " and F_AssignTime<='" + ddstrendtime + "' ";
204
+                }
205
+            }
185
             if (islike > 0)
206
             if (islike > 0)
186
             {
207
             {
187
                 if (strtel.Trim() != "" && strtel != "undefined")
208
                 if (strtel.Trim() != "" && strtel != "undefined")
382
                     }
403
                     }
383
                 }
404
                 }
384
             }
405
             }
406
+            if (supervisor.Trim() != "" && supervisor != "undefined")
407
+            {//督办人员
408
+                var supervisorusercode = supervisor.Trim().Split(',');
409
+                var newusercode = "";
410
+                foreach (var item in supervisorusercode)
411
+                {
412
+                    if (!string.IsNullOrWhiteSpace(item.Trim()))
413
+                        newusercode += "'" + item + "',";
414
+                }
415
+                newusercode = newusercode.Trim(',');
385
 
416
 
417
+                if (supervisorusercode.Length > 1)
418
+                {
419
+                    if (newusercode.Trim() != "" && newusercode != "undefined")
420
+                    {
421
+                        sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
422
+                            "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  in ("+ newusercode + ")) ";
423
+                    }
424
+                }
425
+                else
426
+                {
427
+                    if (newusercode.Trim() != "" && newusercode != "undefined")
428
+                    {
429
+                        sql += " and F_WorkOrderId in (select F_WorkOrderId   from T_Bus_RemindRecord " +
430
+                             "where F_State != 2  and F_IsDelete = 0 and F_Type = 1 and Supervisor  = '" + newusercode + "') ";
431
+                    }
432
+                }
433
+            }
434
+            
386
             if (source != 0)
435
             if (source != 0)
387
             {
436
             {
388
                 sql += " and F_InfoSource = '" + source + "' ";
437
                 sql += " and F_InfoSource = '" + source + "' ";

+ 3 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

519
                             buttons.Add(VisitApproved());
519
                             buttons.Add(VisitApproved());
520
                             buttons.Add(Auditfailed());
520
                             buttons.Add(Auditfailed());
521
                             buttons.Add(Audittransfer());
521
                             buttons.Add(Audittransfer());
522
+                            buttons.Add(Unsuccessful());
523
+                            
522
 
524
 
523
                         }
525
                         }
524
                         if (code == "ZXHWY")
526
                         if (code == "ZXHWY")
528
                             buttons.Add(VisitApproved());
530
                             buttons.Add(VisitApproved());
529
                             buttons.Add(Auditfailed());
531
                             buttons.Add(Auditfailed());
530
                             buttons.Add(Audittransfer());
532
                             buttons.Add(Audittransfer());
531
-
533
+                            buttons.Add(Unsuccessful());
532
                         }
534
                         }
533
                     }
535
                     }
534
                     break;
536
                     break;