1550076451 vor 2 Jahren
Ursprung
Commit
90848f7cbf

+ 27 - 39
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

105
             int orderSign = RequestString.GetInt("orderSign", -1);//省平台工单
105
             int orderSign = RequestString.GetInt("orderSign", -1);//省平台工单
106
 
106
 
107
             int IsReturn = RequestString.GetInt("IsReturn", -1);
107
             int IsReturn = RequestString.GetInt("IsReturn", -1);
108
-            if (IsReturn > -1)
108
+            if (strstate == "0")
109
             {
109
             {
110
-                if (strstate == "0")
110
+                if (IsReturn == 1)
111
                 {
111
                 {
112
-                    if (IsReturn == 1)
113
-                    {
114
-                        sql += " and F_IsReturn=1";
115
-                    }
116
-                    else
117
-                    {
118
-                        sql += " and (F_IsReturn is null or F_IsReturn !=1)";
119
-                    }
120
-
112
+                    sql += " and F_IsReturn=1";
113
+                }
114
+                else
115
+                {
116
+                    sql += " and (F_IsReturn is null or F_IsReturn !=1)";
121
                 }
117
                 }
118
+
122
             }
119
             }
120
+          
123
 
121
 
124
 
122
 
125
             int jianhang = RequestString.GetInt("jianhang", -1);//省平台工单
123
             int jianhang = RequestString.GetInt("jianhang", -1);//省平台工单
956
             if (isopen > -1)
954
             if (isopen > -1)
957
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
955
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
958
             int IsReturn = RequestString.GetInt("IsReturn", -1);
956
             int IsReturn = RequestString.GetInt("IsReturn", -1);
959
-            if (IsReturn > -1)
960
-            {
957
+          
961
                 if (strstate == "0")
958
                 if (strstate == "0")
962
                 {
959
                 {
963
                     if (IsReturn == 1)
960
                     if (IsReturn == 1)
970
                     }
967
                     }
971
 
968
 
972
                 }
969
                 }
973
-            }
970
+            
974
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("strworkorderid"));
971
             string strworkorderid = HttpUtility.UrlDecode(RequestString.GetQueryString("strworkorderid"));
975
             if (strworkorderid.Trim() != "" && strworkorderid != "undefined")
972
             if (strworkorderid.Trim() != "" && strworkorderid != "undefined")
976
             {
973
             {
1872
             if (isopen > -1)
1869
             if (isopen > -1)
1873
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
1870
                 sql += " and isnull(F_IsOpen,0) =" + isopen;
1874
             int IsReturn = RequestString.GetInt("IsReturn", -1);
1871
             int IsReturn = RequestString.GetInt("IsReturn", -1);
1875
-            if (IsReturn > -1)
1876
-            {
1872
+           
1877
                 if (strstate == "0")
1873
                 if (strstate == "0")
1878
                 {
1874
                 {
1879
                     if (IsReturn == 1)
1875
                     if (IsReturn == 1)
1886
                     }
1882
                     }
1887
 
1883
 
1888
                 }
1884
                 }
1889
-            }
1885
+            
1890
 
1886
 
1891
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
1887
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
1892
             {
1888
             {
2338
             string visitstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstarttime"));//回访开始时间
2334
             string visitstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstarttime"));//回访开始时间
2339
             string visitstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstrendtime"));//回访结束时间
2335
             string visitstrendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("visitstrendtime"));//回访结束时间
2340
             int IsReturn = RequestString.GetInt("IsReturn", -1);
2336
             int IsReturn = RequestString.GetInt("IsReturn", -1);
2341
-            if (IsReturn > -1)
2342
-            {
2343
-                if (strstate == "0")
2337
+            if (strstate == "0")
2344
                 {
2338
                 {
2345
                     if (IsReturn == 1)
2339
                     if (IsReturn == 1)
2346
                     {
2340
                     {
2352
                     }
2346
                     }
2353
 
2347
 
2354
                 }
2348
                 }
2355
-            }
2349
+            
2356
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
2350
             if (dealstarttime.Trim() != "" && dealstarttime != "undefined")
2357
             {
2351
             {
2358
                 if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
2352
                 if (dealstrendtime.Trim() != "" && dealstrendtime != "undefined")
3043
             int isopen = RequestString.GetInt("isopen", -1);
3037
             int isopen = RequestString.GetInt("isopen", -1);
3044
             int identification = RequestString.GetInt("identification", -1);
3038
             int identification = RequestString.GetInt("identification", -1);
3045
             int IsReturn = RequestString.GetInt("IsReturn", -1);
3039
             int IsReturn = RequestString.GetInt("IsReturn", -1);
3046
-            if (IsReturn > -1)
3047
-            {
3040
+          
3048
                 if (strstate == "0")
3041
                 if (strstate == "0")
3049
                 {
3042
                 {
3050
                     if (IsReturn == 1)
3043
                     if (IsReturn == 1)
3057
                     }
3050
                     }
3058
 
3051
 
3059
                 }
3052
                 }
3060
-            }
3053
+            
3061
             if (identification > -1)
3054
             if (identification > -1)
3062
             {
3055
             {
3063
                 sql += "and F_Identification='" + identification + "'";
3056
                 sql += "and F_Identification='" + identification + "'";
3920
             int pagesize = 10;
3913
             int pagesize = 10;
3921
             string order = "ORDER BY a.F_LimitTime";
3914
             string order = "ORDER BY a.F_LimitTime";
3922
             int IsReturn = RequestString.GetInt("IsReturn", -1);
3915
             int IsReturn = RequestString.GetInt("IsReturn", -1);
3923
-            if (IsReturn > -1)
3924
-            {
3916
+          
3925
                 if (strstate == "0")
3917
                 if (strstate == "0")
3926
                 {
3918
                 {
3927
                     if (IsReturn == 1)
3919
                     if (IsReturn == 1)
3934
                     }
3926
                     }
3935
 
3927
 
3936
                 }
3928
                 }
3937
-            }
3929
+            
3938
             #region 模块
3930
             #region 模块
3939
             switch (strtab)
3931
             switch (strtab)
3940
             {
3932
             {
4864
             string strpagesize = RequestString.GetQueryString("pagesize");
4856
             string strpagesize = RequestString.GetQueryString("pagesize");
4865
             int pagesize = 10;
4857
             int pagesize = 10;
4866
             int IsReturn = RequestString.GetInt("IsReturn", -1);
4858
             int IsReturn = RequestString.GetInt("IsReturn", -1);
4867
-            if (IsReturn > -1)
4868
-            {
4859
+         
4869
                 if (strstate == "0")
4860
                 if (strstate == "0")
4870
                 {
4861
                 {
4871
                     if (IsReturn == 1)
4862
                     if (IsReturn == 1)
4878
                     }
4869
                     }
4879
 
4870
 
4880
                 }
4871
                 }
4881
-            }
4872
+            
4882
             switch (strtab)
4873
             switch (strtab)
4883
             {
4874
             {
4884
                 case "0"://待处理工单
4875
                 case "0"://待处理工单
5744
             string strpagesize = RequestString.GetQueryString("pagesize");
5735
             string strpagesize = RequestString.GetQueryString("pagesize");
5745
             int pagesize = 10;
5736
             int pagesize = 10;
5746
             int IsReturn = RequestString.GetInt("IsReturn", -1);
5737
             int IsReturn = RequestString.GetInt("IsReturn", -1);
5747
-            if (IsReturn > -1)
5748
-            {
5738
+         
5749
                 if (strstate == "0")
5739
                 if (strstate == "0")
5750
                 {
5740
                 {
5751
                     if (IsReturn == 1)
5741
                     if (IsReturn == 1)
5758
                     }
5748
                     }
5759
 
5749
 
5760
                 }
5750
                 }
5761
-            }
5751
+            
5762
             #region 模块
5752
             #region 模块
5763
             switch (strtab)
5753
             switch (strtab)
5764
             {
5754
             {
7165
             string strpagesize = RequestString.GetQueryString("pagesize");
7155
             string strpagesize = RequestString.GetQueryString("pagesize");
7166
             int pagesize = 10;
7156
             int pagesize = 10;
7167
             int IsReturn = RequestString.GetInt("IsReturn", -1);
7157
             int IsReturn = RequestString.GetInt("IsReturn", -1);
7168
-            if (IsReturn > -1)
7169
-            {
7158
+           
7170
                 if (strstate == "0")
7159
                 if (strstate == "0")
7171
                 {
7160
                 {
7172
                     if (IsReturn == 1)
7161
                     if (IsReturn == 1)
7179
                     }
7168
                     }
7180
 
7169
 
7181
                 }
7170
                 }
7182
-            }
7171
+            
7183
             #region  坐席&调度员
7172
             #region  坐席&调度员
7184
             string splituser = HttpUtility.UrlDecode(RequestString.GetQueryString("splituser"));
7173
             string splituser = HttpUtility.UrlDecode(RequestString.GetQueryString("splituser"));
7185
             if (splituser.Trim() != "" && splituser != "undefined")
7174
             if (splituser.Trim() != "" && splituser != "undefined")
8530
 
8519
 
8531
             int isRelease = RequestString.GetInt("isRelease", 0);
8520
             int isRelease = RequestString.GetInt("isRelease", 0);
8532
             int IsReturn = RequestString.GetInt("IsReturn", -1);
8521
             int IsReturn = RequestString.GetInt("IsReturn", -1);
8533
-            if (IsReturn > -1)
8534
-            {
8522
+          
8535
                 if (strstate == "0")
8523
                 if (strstate == "0")
8536
                 {
8524
                 {
8537
                     if (IsReturn == 1)
8525
                     if (IsReturn == 1)
8544
                     }
8532
                     }
8545
 
8533
 
8546
                 }
8534
                 }
8547
-            }
8535
+            
8548
             if (keyid != 0)
8536
             if (keyid != 0)
8549
             {
8537
             {
8550
                 sql += "and a.F_Key in(select F_ValueId  from  dbo.GetValueId(" + keyid + ")) ";
8538
                 sql += "and a.F_Key in(select F_ValueId  from  dbo.GetValueId(" + keyid + ")) ";