duhongyu преди 4 години
родител
ревизия
934ac10d4c
променени са 1 файла, в които са добавени 96 реда и са изтрити 7 реда
  1. 96 7
      CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

+ 96 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -6846,7 +6846,60 @@ namespace CallCenterApi.Interface.Controllers.workorder
6846 6846
             int business = RequestString.GetInt("business", 0);
6847 6847
             int Supervisor = RequestString.GetInt("Supervisor", 0);
6848 6848
             int isExamine = RequestString.GetInt("isExamine", 0);
6849
+            
6850
+              string result = HttpUtility.UrlDecode(RequestString.GetQueryString("result"));//办理结果
6849 6851
 
6852
+            string dealstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstarttime"));
6853
+            string dealstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dealstrendtime"));
6854
+
6855
+            string dbstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("dbstarttime"));
6856
+            string dbstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("dbstrendtime"));
6857
+
6858
+            string comtitle = HttpUtility.UrlDecode(RequestString.GetQueryString("ComTitle"));
6859
+            string comContent = HttpUtility.UrlDecode(RequestString.GetQueryString("ComContent"));
6860
+
6861
+            if (keyid != 0)
6862
+            {
6863
+                sql += "and a.F_Key in(select F_ValueId  from  dbo.GetValueId(" + keyid + ")) ";
6864
+            }
6865
+            if (comtitle.Trim() != "" && comtitle != "undefined")
6866
+            {
6867
+                sql += " and F_ComTitle like '%" + comtitle + "%' ";
6868
+            }
6869
+            if (comContent.Trim() != "" && comContent != "undefined")
6870
+            {
6871
+                sql += " and (F_ComContent like '%" + comContent + "%' " +
6872
+                    "or F_Content like '%" + comContent + "%'  )";
6873
+            }
6874
+           
6875
+
6876
+            if (result.Trim() != "" && result != "undefined")
6877
+            {
6878
+                sql += " and F_Result like'%" + result + "%' ";
6879
+            }
6880
+
6881
+            if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
6882
+            {
6883
+                if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
6884
+                {
6885
+                    sql += " and F_DealTime  between   '" + dealstarttime +
6886
+                             "' AND  '" + dealstrendtime + "'";
6887
+                }
6888
+                else
6889
+                {
6890
+                    sql += " and F_DealTime>='" + dealstarttime + "' ";
6891
+                }
6892
+            }
6893
+            else
6894
+            {
6895
+                if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
6896
+                {
6897
+                    sql += " and F_DealTime<='" + dealstrendtime + "' ";
6898
+                }
6899
+            }
6900
+
6901
+
6902
+            int iscb = RequestString.GetInt("iscb", -1);
6850 6903
             if (business > 0)
6851 6904
                 sql += " and F_Business = '1'";
6852 6905
             string Remind = "";
@@ -6865,7 +6918,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
6865 6918
                     Remind += "and (Supervisor ='' or  Supervisor is null )";
6866 6919
                 }
6867 6920
             }
6868
-         
6921
+            if (dbstarttime.Trim() != "" && dbstarttime != "undefined")
6922
+            {
6923
+                if (dbstrendtime.Trim() != "" && dbstrendtime != "undefined")
6924
+                {
6925
+                    Remind += " and F_CreateTime  between   '" + dbstarttime +
6926
+                             "' AND  '" + dbstrendtime + "'";
6927
+                }
6928
+                else
6929
+                {
6930
+                    Remind += " and F_CreateTime>='" + dbstarttime + "' ";
6931
+                }
6932
+            }
6933
+            else
6934
+            {
6935
+                if (dbstrendtime.Trim() != "" && dbstrendtime != "undefined")
6936
+                {
6937
+                    Remind += " and F_CreateTime<='" + dbstrendtime + "' ";
6938
+                }
6939
+            }
6869 6940
             if (isExamine == 1)
6870 6941
             {
6871 6942
                 Remind += "and F_IsExamine='1'";
@@ -6898,6 +6969,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
6898 6969
                         else
6899 6970
                             sql += " and F_WorkState = '" + strstate.Trim() + "' ";
6900 6971
                     }
6972
+                    if (iscb>-1)
6973
+                    {
6974
+                        if (iscb==0)
6975
+                        {
6976
+                            sql += " and F_WorkState != '8' ";
6977
+                        }
6978
+                        else
6979
+                        {
6980
+                            sql += " and F_WorkState = '8' ";
6981
+                        }
6982
+                    }
6901 6983
                     sql += "  and F_WorkOrderID in (select F_WorkOrderID from T_Bus_AssignedInfo WITH(NOLOCK) where F_State=1 and F_IsDelete=0 ";
6902 6984
                     if (strjbstarttime.Trim() != "" && strjbstarttime != "undefined")
6903 6985
                     {
@@ -7163,7 +7245,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
7163 7245
                 string iszbdw = "0";
7164 7246
                 int state = Int32.Parse(dr["F_WorkState"].ToString());
7165 7247
                 string ispd = "";
7166
-                if (state > 1 && User.F_RoleCode != "DBZY")
7248
+                if (state > 1 && User.F_RoleCode != "DBZY" && User.F_RoleCode != "DBGLY")
7167 7249
                 {
7168 7250
                     string sqljb = "SELECT TOP 1 * FROM T_Bus_AssignedInfo WITH(NOLOCK) WHERE F_WorkOrderId='" + dr["F_WorkOrderId"].ToString() + "' and F_State=1 and F_IsDelete=0 and F_IsSure<>3   ORDER BY F_Id DESC";
7169 7251
                     var dtjb = DbHelperSQL.Query(sqljb).Tables[0];
@@ -7294,18 +7376,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
7294 7376
                             {
7295 7377
                                 btns.Add(ButtonGroup.oversee()); //督办 输入督办信息确认后跳转编辑页面进行审核交办
7296 7378
                                 btns.Add(ButtonGroup.turnnosee());//不督办 工单被退回
7297
-                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
7379
+                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DBGLY")
7298 7380
                                     btns.Add(ButtonGroup.forceend());
7299 7381
                             }
7300 7382
                             else if (Supervisor == 2)
7301 7383
                             {
7302
-                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
7384
+                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7303 7385
                                     btns.Add(ButtonGroup.Check());
7304 7386
                             }
7305 7387
 
7306 7388
                             break;
7307 7389
                         case "1"://督办-办理中 操作为:查看工单、短信催办
7308
-                            if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
7390
+                            if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7309 7391
                                 btns.Add(ButtonGroup.forceend());
7310 7392
                             break;
7311 7393
                         case "2"://督办-超期未完结 操作为:查看工单、短信催办
@@ -7319,12 +7401,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
7319 7401
                         case "6"://督办-办理中 操作为:查看工单、短信催办
7320 7402
                             if (isExamine!=1)
7321 7403
                             {
7322
-                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "GLY")
7404
+                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7323 7405
                                 {
7324 7406
                                     btns.Add(ButtonGroup.Approved());
7325 7407
                                     btns.Add(ButtonGroup.Auditreject());
7326 7408
                                 }
7327 7409
                             }
7410
+                            else
7411
+                            {
7412
+                                if (User.F_RoleCode == "DBZY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "GLY")
7413
+                                {
7414
+                                    btns.Add(ButtonGroup.forceend());
7415
+                                }
7416
+                            }
7328 7417
                            
7329 7418
 
7330 7419
                             break;
@@ -16667,7 +16756,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
16667 16756
         /// <returns></returns>
16668 16757
         public ActionResult RemindApproved()
16669 16758
         {
16670
-            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DBZY")
16759
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DBGLY" || User.F_RoleCode == "DBZY")
16671 16760
             {
16672 16761
                 string workorderid = RequestString.GetFormString("workorderid");
16673 16762
                 int state = RequestString.GetInt("state", 0);//0通过1拒绝