Bladeren bron

去掉order

duhongyu 4 jaren geleden
bovenliggende
commit
1fc6a4f449

+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/InfoController.cs

@@ -1043,7 +1043,7 @@ namespace CallCenterApi.Interface.Controllers
1043 1043
                
1044 1044
             }
1045 1045
             var areaList = areaBLL.GetModelList(" F_PrentId=0 and F_State=0 ");
1046
-            var typeList = dicValueBLL.GetModelList(" F_PrentId=37 and F_State=0 order by F_ValueId ");
1046
+            var typeList = dicValueBLL.GetModelList(" F_PrentId=37 and F_State=0","  F_ValueId ");
1047 1047
 
1048 1048
             int[] hours = Enumerable.Range(0, 24).ToArray<int>();
1049 1049
 
@@ -1222,7 +1222,7 @@ namespace CallCenterApi.Interface.Controllers
1222 1222
                 where += " and F_SourceArea=" + areaid;
1223 1223
             }
1224 1224
 
1225
-            var divList = dicValueBLL.GetModelList("F_PrentId=36 and F_State=0 order by F_Value");
1225
+            var divList = dicValueBLL.GetModelList("F_PrentId=36 and F_State=0 "," F_Value ");
1226 1226
             var wolist = workOrderBLL.GetModelList(" 1=1 " + where);
1227 1227
             var zjcount = wolist.Count();
1228 1228
 
@@ -1734,7 +1734,7 @@ namespace CallCenterApi.Interface.Controllers
1734 1734
                 monthss[i] = date;
1735 1735
             }
1736 1736
 
1737
-            var typelist = dicValueBLL.GetModelList(" F_PrentId=37 order by F_Value");
1737
+            var typelist = dicValueBLL.GetModelList(" F_PrentId=37"," F_Value");
1738 1738
             var obj = new
1739 1739
             {
1740 1740
                 months = months,
@@ -1819,7 +1819,7 @@ namespace CallCenterApi.Interface.Controllers
1819 1819
         /// <returns></returns>
1820 1820
         public ActionResult GetKeyList()
1821 1821
         {
1822
-            var keylist = dicValueBLL.GetModelList("  F_PrentId=38 and F_State = 0 order by F_ValueId");
1822
+            var keylist = dicValueBLL.GetModelList("  F_PrentId=38 and F_State = 0 "," F_ValueId");
1823 1823
             return Success("加载成功", keylist);
1824 1824
         }
1825 1825
         /// <summary>

+ 1 - 1
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TelWOReportController.cs

@@ -22,7 +22,7 @@ namespace CallCenterApi.Interface.Controllers.report
22 22
         }
23 23
         private string[] getcols()
24 24
         {
25
-            String[] str = { "日期", "接听来电", "有效来电", "受理", "在线办结(直办)", "转办工单", "转办工单办结" };
25
+            String[] str = { "日期", "接听来电", "来电总量", "受理", "在线办结(直办)", "转办工单", "转办工单办结" };
26 26
             return str;
27 27
         }
28 28
 

+ 4 - 4
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AYWorkOrderController.cs

@@ -183,7 +183,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
183 183
                 return Process();
184 184
             }
185 185
             #endregion
186
-            var divlist = divBLL.GetModelList(" F_PrentId=36 and F_State=0  order by F_ValueId ");
186
+            var divlist = divBLL.GetModelList(" F_PrentId=36 and F_State=0 ","  F_ValueId ");
187 187
 
188 188
             var divnewList = divlist.Select(x => { return new { id = x.F_ValueId, value = x.F_Value }; });
189 189
 
@@ -233,7 +233,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
233 233
                 return Process();
234 234
             }
235 235
             #endregion
236
-            var divlist = divBLL.GetModelList(" F_PrentId=38 and F_State=0  order by F_ValueId ");
236
+            var divlist = divBLL.GetModelList(" F_PrentId=38 and F_State=0 ","  F_ValueId ");
237 237
 
238 238
             var divnewList = divlist.Select(x => { return new { id = x.F_ValueId, value = x.F_Value }; });
239 239
 
@@ -285,7 +285,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
285 285
                 return Process();
286 286
             }
287 287
             #endregion
288
-            var arealist = areaBLL.GetModelList(" isnull(F_PrentId,0)=0 and F_State=0 order by F_AreaId ");
288
+            var arealist = areaBLL.GetModelList(" isnull(F_PrentId,0)=0 and F_State=0 "," F_AreaId ");
289 289
 
290 290
             var areanewList = arealist.Select(x => { return new { id = x.F_AreaId, value = x.F_AreaName }; });
291 291
 
@@ -337,7 +337,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
337 337
                 return Process();
338 338
             }
339 339
             #endregion
340
-            var divlist = divBLL.GetModelList(" F_PrentId=37 and F_State=0  order by F_ValueId ");
340
+            var divlist = divBLL.GetModelList(" F_PrentId=37 and F_State=0 ","  F_ValueId ");
341 341
 
342 342
             var divnewList = divlist.Select(x => { return new { id = x.F_ValueId, value = x.F_Value }; });
343 343
 

+ 1 - 40
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -123,7 +123,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
123 123
             }
124 124
             if (strtel.Trim() != "" && strtel != "undefined")
125 125
             {
126
-                sql += " and (F_CusPhone = '" + strtel + "' or F_CusPhone = '0" + strtel + "'or F_ConPhone = '" + strtel + "' or F_ConPhone = '0" + strtel + "') ";
126
+                sql += " and (F_CusPhone  like '%" + strtel + "%' or F_ConPhone like '%" + strtel + "%') ";
127 127
             }
128 128
             int dbtype = RequestString.GetInt("dbtype", 0);
129 129
             if (pydt>0)
@@ -8984,15 +8984,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
8984 8984
         //[Authority]
8985 8985
         public ActionResult EditWorkOrder()
8986 8986
         {
8987
-            
8988
-
8989
-            
8990
-
8991 8987
             if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "ZXLDGLYGLY" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG"|| User.F_RoleCode == "MTDD")
8992 8988
             {
8993 8989
                 string workorderid = RequestString.GetFormString("workorderid");
8994 8990
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
8995
-                //if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == 1 || modelT_Bus_WorkOrder.F_WorkState == 0))
8996 8991
                 if (modelT_Bus_WorkOrder != null && (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.submit || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.resubmit))
8997 8992
                 {
8998 8993
                     int source = RequestString.GetInt("source", 0);
@@ -9077,17 +9072,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
9077 9072
                                 modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.submit;// 1;//提交领导
9078 9073
                             }
9079 9074
                             #region
9080
-                            //20190715 审核环节去掉 zhengbingbing
9081
-                            //else
9082
-                            //{
9083
-                            //    if(modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.neworder || modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.audit)
9084
-                            //        modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.audit;
9085
-                            //}
9086
-                            //else if (issubmit == 1)
9087
-                            //{
9088
-                            //    modelT_Bus_WorkOrder.F_SubmitTime = DateTime.Now;
9089
-                            //    modelT_Bus_WorkOrder.F_WorkState = (int)EnumWorkState.submit;// 1;//提交领导
9090
-                            //}
9091 9075
                             #endregion
9092 9076
                             if (state > 0)
9093 9077
                             {
@@ -9345,18 +9329,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
9345 9329
         //[Authority]
9346 9330
         public ActionResult EditWorkOrderBySource()
9347 9331
         {
9348
-
9349
-            
9350
-
9351
-            
9352
-
9353 9332
             if (User.F_RoleCode == "ZXHWY" || User.F_RoleCode == "ZXBZ" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
9354 9333
             {
9355
-
9356 9334
                 string workorderid = RequestString.GetFormString("workorderid");
9357
-
9358 9335
                 int source = RequestString.GetInt("source", 0);
9359
-
9360 9336
                 string cusname = RequestString.GetFormString("cusname");
9361 9337
                 string cussex = RequestString.GetFormString("cussex");
9362 9338
                 string cusphone = RequestString.GetFormString("cusphone");
@@ -12210,16 +12186,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
12210 12186
         //[Authority]
12211 12187
         public ActionResult ReplyWorkOrder()
12212 12188
         {
12213
-            
12214
-
12215
-            
12216
-
12217 12189
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "ZXLD" || User.F_RoleCode == "EJWLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG"|| User.F_RoleCode == "MTDD")
12218 12190
             {
12219 12191
                 string workorderid = RequestString.GetFormString("workorderid");
12220 12192
                 string files = RequestString.GetFormString("files");
12221
-
12222
-                
12223 12193
                 string replycount = RequestString.GetFormString("replycount");
12224 12194
                 Model.T_Bus_WorkOrder modelT_Bus_WorkOrder = workorderBLL.GetModel(workorderid);
12225 12195
                 Model.T_Bus_AssignedInfo modelT_Bus_AssignedInfo = assignBLL.GetNewModelByWorkOrderID(workorderid);
@@ -12231,7 +12201,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
12231 12201
                     && modelT_Bus_Feedback!=null )
12232 12202
                 {
12233 12203
                    // type = AssignDeptType(modelT_Bus_AssignedInfo, User.F_DeptId);
12234
-                   
12235 12204
                         //if (modelT_Bus_WorkOrder.F_WorkState == 4)
12236 12205
                         if (modelT_Bus_WorkOrder.F_WorkState == (int)EnumWorkState.dealed && modelT_Bus_WorkOrder.F_IsProResult ==2)
12237 12206
                         {
@@ -12970,10 +12939,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
12970 12939
         //[Authority]
12971 12940
         public ActionResult WithdrawWorkOrder()
12972 12941
         {
12973
-            
12974
-
12975
-            
12976
-
12977 12942
             if (User.F_RoleCode == "WLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
12978 12943
             {
12979 12944
                 string workorderid = RequestString.GetFormString("workorderid");
@@ -13054,10 +13019,6 @@ namespace CallCenterApi.Interface.Controllers.workorder
13054 13019
         //[Authority]
13055 13020
         public ActionResult SignWorkOrder()
13056 13021
         {
13057
-            
13058
-
13059
-            
13060
-
13061 13022
             if (User.F_RoleCode == "EJWLDW" || User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG")
13062 13023
             {
13063 13024
                 string workorderid = RequestString.GetFormString("workorderid");