Kaynağa Gözat

排序,时间

duhongyu 3 yıl önce
ebeveyn
işleme
d000cc151b

+ 2 - 28
CallCenterApi/CallCenterApi.BLL/T_Sys_UserAccount.cs

173
         /// </summary>
173
         /// </summary>
174
         public DataSet GetList(string strWhere, string filedOrder = "")
174
         public DataSet GetList(string strWhere, string filedOrder = "")
175
         {
175
         {
176
-            var dt = GetRedis();
177
-            if (dt != null)
178
-            {
179
-                var ds = new DataSet();
180
-                if (string.IsNullOrEmpty(strWhere))
181
-                {
182
-                    ds.Tables.Add(dt.Copy());
183
-                }
184
-                else
185
-                {
186
-                    var drs = dt.Select(strWhere, filedOrder);
187
-                    if (drs.Length > 0)
188
-                    {
189
-                        ds.Tables.Add(drs.CopyToDataTable());
190
-                    }
191
-                    else
192
-                    {
193
-                        ds.Tables.Add(new DataTable());
194
-                    }
195
-                }
196
-
197
-                return ds;
198
-            }
199
-            else
200
-            {
201
-                return dal.GetList(strWhere, filedOrder);
202
-            }
203
-          //  return dal.GetList(strWhere, filedOrder);
176
+            return dal.GetList(strWhere, filedOrder);
177
+            //  return dal.GetList(strWhere, filedOrder);
204
         }
178
         }
205
 
179
 
206
         /// <summary>
180
         /// <summary>

+ 2 - 2
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/PushMessageController.cs

158
             {
158
             {
159
                 try
159
                 try
160
                 {
160
                 {
161
-                    var t = PushAppSend(Title, count, clientid);
162
                     msg.AddInternalMessagesInfo(Title, count,
161
                     msg.AddInternalMessagesInfo(Title, count,
163
-                        usercode, "8000", (int)EnumSmsType.workorder,0, workOrderId);
162
+                      usercode, "8000", (int)EnumSmsType.workorder, 0, workOrderId);
163
+                    var t = PushAppSend(Title, count, clientid);
164
                 }
164
                 }
165
                catch(Exception e)
165
                catch(Exception e)
166
                 {
166
                 {

+ 3 - 3
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

130
                                             "F_UserId",
130
                                             "F_UserId",
131
                                             "*",
131
                                             "*",
132
                                             sql,
132
                                             sql,
133
-                                            "ORDER BY F_UserId desc",
133
+                                            "ORDER BY CONVERT(int ,F_UserCode ) asc",
134
                                             pagesize,
134
                                             pagesize,
135
                                             pageindex,
135
                                             pageindex,
136
                                             true,
136
                                             true,
484
             }
484
             }
485
 
485
 
486
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
486
             //List<Model.T_Sys_UserAccount> userList = sysUserAccountBll.GetModelList(sql, " f_userid desc ");
487
-            var userList = sysUserAccountBll.GetList(sql, " f_userid desc ").Tables[0];
487
+            var userList = sysUserAccountBll.GetList(sql, "CONVERT(int ,F_UserCode ) asc ").Tables[0];
488
             return Success("列表加载成功", userList);
488
             return Success("列表加载成功", userList);
489
         }
489
         }
490
 
490
 
491
         //根据部门获取用户
491
         //根据部门获取用户
492
         public ActionResult GetDeptUserList(int deptid = 0)
492
         public ActionResult GetDeptUserList(int deptid = 0)
493
         {
493
         {
494
-            var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " f_userid desc ");
494
+            var DeptUserList = sysUserAccountBll.GetList("F_DeptId='" + deptid + "' ", " CONVERT(int ,F_UserCode ) asc");
495
             return Success("列表加载成功", DeptUserList);
495
             return Success("列表加载成功", DeptUserList);
496
 
496
 
497
         }
497
         }

Dosya farkı çok büyük olduğundan ihmal edildi
+ 601 - 16
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs


+ 24 - 7
CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

879
                     {
879
                     {
880
                         buttons.Add(feedback());
880
                         buttons.Add(feedback());
881
                       
881
                       
882
-                        if (InfoSource == "2580")
883
-                            buttons.Add(ejdelay());
884
-                        else
885
-                            buttons.Add(delay());
882
+                        if (ispd !="3")
883
+                        {
884
+                            if (InfoSource == "2580")
885
+                                buttons.Add(ejdelay());
886
+                            else
887
+                                buttons.Add(delay());
888
+                        }
889
+                       
886
                         if (ispd == "0" || ispd == "")
890
                         if (ispd == "0" || ispd == "")
887
                         {
891
                         {
888
                             buttons.Add(split());
892
                             buttons.Add(split());
889
                         }
893
                         }
890
                         else
894
                         else
891
                         {
895
                         {
892
-                            buttons.Add(withdraw());
896
+                            if (ispd == "3")
897
+                                buttons.Add(redo ());
898
+                            else
899
+                                buttons.Add(withdraw ());
893
                         }
900
                         }
894
                         if (ispd == "3")
901
                         if (ispd == "3")
895
                         {
902
                         {
896
                             buttons.Add(auditdeal());
903
                             buttons.Add(auditdeal());
897
                         }
904
                         }
905
+                      
898
 
906
 
899
                         
907
                         
900
                     }
908
                     }
979
                     {
987
                     {
980
 
988
 
981
                         buttons.Add(feedback());
989
                         buttons.Add(feedback());
982
-                        buttons.Add(delay());
990
+                        if (ispd != "3")
991
+                        {
992
+                            if (InfoSource == "2580")
993
+                                buttons.Add(ejdelay());
994
+                            else
995
+                                buttons.Add(delay());
996
+                        }
983
                         if (ispd == "0" || ispd == "")
997
                         if (ispd == "0" || ispd == "")
984
                         {
998
                         {
985
                             buttons.Add(split());
999
                             buttons.Add(split());
986
                         }
1000
                         }
987
                         else
1001
                         else
988
                         {
1002
                         {
989
-                            buttons.Add(withdraw());
1003
+                            if (ispd == "3")
1004
+                                buttons.Add(redo());
1005
+                            else
1006
+                                buttons.Add(withdraw());
990
                         }
1007
                         }
991
                         if (ispd == "3")
1008
                         if (ispd == "3")
992
                         {
1009
                         {