1

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

@@ -105,21 +105,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int orderSign = RequestString.GetInt("orderSign", -1);//省平台工单
 
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
+            if (strstate == "0")
             {
-                if (strstate == "0")
+                if (IsReturn == 1)
                 {
-                    if (IsReturn == 1)
-                    {
-                        sql += " and F_IsReturn=1";
-                    }
-                    else
-                    {
-                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
-                    }
-
+                    sql += " and F_IsReturn=1";
+                }
+                else
+                {
+                    sql += " and (F_IsReturn is null or F_IsReturn !=1)";
                 }
+
             }
+          
 
 
             int jianhang = RequestString.GetInt("jianhang", -1);//省平台工单
@@ -956,8 +954,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isopen > -1)
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+          
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -970,7 +967,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("strworkorderid"));
             if (strworkorderid.Trim() != "" && strworkorderid != "undefined")
             {
@@ -1872,8 +1869,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isopen > -1)
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+           
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -1886,7 +1882,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
 
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
             {
@@ -2338,9 +2334,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string visitstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstarttime"));//回访开始时间
             string visitstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstrendtime"));//回访结束时间
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
-                if (strstate == "0")
+            if (strstate == "0")
                 {
                     if (IsReturn == 1)
                     {
@@ -2352,7 +2346,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
             {
                 if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
@@ -3043,8 +3037,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int isopen = RequestString.GetInt("isopen", -1);
             int identification = RequestString.GetInt("identification", -1);
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+          
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -3057,7 +3050,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             if (identification > -1)
             {
                 sql += "and F_Identification='" + identification + "'";
@@ -3920,8 +3913,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int pagesize = 10;
             string order = "ORDER BY a.F_LimitTime";
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+          
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -3934,7 +3926,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             #region 模块
             switch (strtab)
             {
@@ -4864,8 +4856,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+         
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -4878,7 +4869,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             switch (strtab)
             {
                 case "0"://待处理工单
@@ -5744,8 +5735,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+         
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -5758,7 +5748,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             #region 模块
             switch (strtab)
             {
@@ -7165,8 +7155,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+           
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -7179,7 +7168,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             #region  坐席&调度员
             string splituser = HttpUtility.UrlDecode(RequestString.GetQueryString("splituser"));
             if (splituser.Trim() != "" && splituser != "undefined")
@@ -8530,8 +8519,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             int isRelease = RequestString.GetInt("isRelease", 0);
             int IsReturn = RequestString.GetInt("IsReturn", -1);
-            if (IsReturn > -1)
-            {
+          
                 if (strstate == "0")
                 {
                     if (IsReturn == 1)
@@ -8544,7 +8532,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
 
                 }
-            }
+            
             if (keyid != 0)
             {
                 sql += "and a.F_Key in(select F_ValueId  from  dbo.GetValueId(" + keyid + ")) ";