双汇工单删除 公关经理调整 密码修改

codegit/CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -446,10 +446,10 @@ namespace CallCenterApi.DAL
         /// <summary>
         /// 批量删除数据
         /// </summary>
-        public bool DeleteList(string F_Idlist)
+        public bool DeleteList(string F_Idlist,string user)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("update  T_Bus_WorkOrder set F_IsDelete=1");
+            strSql.Append("update  T_Bus_WorkOrder set F_IsDelete=1,F_DeleteUser='"+user+ "',F_DeleteTime='"+DateTime .Now.ToString ("yyyy-MM-dd HH:mm:ss")+"'");
             strSql.Append(" where F_Id in (" + F_Idlist + ")  ");
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString());
             if (rows > 0)

codegit/CallCenterApi/CallCenterApi.DB/DbHelperSQL.cs

@@ -558,7 +558,6 @@ namespace CallCenterApi.DB
         /// <returns>DataSet</returns>
         public static DataSet Query(string SQLString)
         {
-
             using (SqlConnection connection = new SqlConnection(connectionString))
             {
                 DataSet ds = new DataSet();
@@ -986,6 +985,7 @@ namespace CallCenterApi.DB
             using (SqlConnection connection = new SqlConnection(connectionString))
             {
                 SqlCommand cmd = new SqlCommand();
+                cmd.CommandTimeout = 500;
                 PrepareCommand(cmd, connection, null, SQLString, cmdParms);
                 using (SqlDataAdapter da = new SqlDataAdapter(cmd))
                 {
@@ -1039,7 +1039,7 @@ namespace CallCenterApi.DB
                 conn.Open();
             cmd.Connection = conn;
             cmd.CommandText = cmdText;
-            cmd.CommandTimeout = 300;
+            cmd.CommandTimeout = 600;
             if (trans != null)
                 cmd.Transaction = trans;
             cmd.CommandType = CommandType.Text;//cmdType;
@@ -1115,6 +1115,7 @@ namespace CallCenterApi.DB
                 connection.Open();
                 SqlDataAdapter sqlDA = new SqlDataAdapter();
                 sqlDA.SelectCommand = BuildQueryCommand(connection, storedProcName, parameters);
+              
                 sqlDA.Fill(dataSet, tableName);
                 connection.Close();
                 return dataSet;
@@ -1147,6 +1148,7 @@ namespace CallCenterApi.DB
         {
             SqlCommand command = new SqlCommand(storedProcName, connection);
             command.CommandType = CommandType.StoredProcedure;
+            command.CommandTimeout = 500;
             foreach (SqlParameter parameter in parameters)
             {
                 if (parameter != null)
@@ -1299,7 +1301,7 @@ namespace CallCenterApi.DB
                 new SqlParameter("@SqlTable",SqlDbType.VarChar,1000),
                 new SqlParameter("@SqlPK",SqlDbType.VarChar,50),
                 new SqlParameter("@SqlField",SqlDbType.VarChar,1000),
-                new SqlParameter("@SqlWhere",SqlDbType.VarChar,1000),
+                new SqlParameter("@SqlWhere",SqlDbType.VarChar,-1),
                 new SqlParameter("@SqlOrder",SqlDbType.VarChar,200),
                 new SqlParameter("@PageSize",SqlDbType.Int),
                 new SqlParameter("@PageIndex",SqlDbType.Int),

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -1143,7 +1143,7 @@ namespace CallCenterApi.Interface.Controllers
                     return Error("请输入密码");
                 if (string.IsNullOrWhiteSpace(usercode))
                     return Error("账号错误");
-                var model = sysUserAccountBll.GetModel(int.Parse(usercode));
+                var model = sysUserAccountBll.GetModel(usercode);
                 if (model == null) return Error("此用户不存在");
                 if (!model.F_Password.Equals(oldPwd)) return Error("原密码不正确");
                 model.F_Password = pwd;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/BusinessController.cs

@@ -469,7 +469,7 @@ namespace CallCenterApi.Interface.Controllers.report
         private string User(string DeptName )
         {
             string user="";
-             if (DeptName== "京津"|| DeptName == "豫南" || DeptName == "豫北")
+             if (DeptName== "京津"|| DeptName == "豫南" || DeptName == "豫北" || DeptName == "吉林")
             {
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("8009");
                 if (usermodel != null)
@@ -482,21 +482,22 @@ namespace CallCenterApi.Interface.Controllers.report
                 if (usermodel != null)
                     user = usermodel.F_UserName;
             }
-            else if ( DeptName == "川渝" || DeptName == "湘赣" || DeptName == "西北" || DeptName == "华南")
+            else if ( DeptName == "川渝" || DeptName == "湘赣" || DeptName == "陕宁" || DeptName == "晋蒙" || DeptName == "华南")
             {
-                var usermodel = new BLL.T_Sys_UserAccount().GetModel("8011");
+                var usermodel = new BLL.T_Sys_UserAccount().GetModel("822353");
                 if (usermodel != null)
                     user = usermodel.F_UserName;
             }
-            else if (DeptName == "安徽" || DeptName == "湖北" || DeptName == "晋蒙"  || DeptName == "云贵" || DeptName == "陕宁")
+            else if (DeptName == "安徽" || DeptName == "湖北" || DeptName == "西北" || DeptName == "云贵" )
             {
-                
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("8012");
                 if (usermodel != null)
                     user = usermodel.F_UserName;
             }
-            else if (DeptName == "吉林" || DeptName == "辽宁" || DeptName == "黑龙江" || DeptName == "河北" || DeptName == "江苏" )
+            else if ( DeptName == "辽宁" || DeptName == "黑龙江" || DeptName == "河北" || DeptName == "江苏" )
             {
+              
+
                 var usermodel = new BLL.T_Sys_UserAccount().GetModel("822249");
                 if (usermodel != null)
                     user = usermodel.F_UserName;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkorderAppController.cs

@@ -1254,51 +1254,57 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取处理专员下的大区人员
         /// </summary>
         /// <returns></returns>
-        private string  HandleUser(Model.T_Sys_UserAccount ua)
+        private string HandleUser(Model.T_Sys_UserAccount ua)
         {
             string dept = "";
-          if (ua .F_UserCode  == "8009")
+            if (ua.F_UserCode == "8009")
             {
-                Model .T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList ("F_DeptName='京津'").FirstOrDefault();
+                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='京津'").FirstOrDefault();
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫南'").FirstOrDefault();
                 Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='豫北'").FirstOrDefault();
-                Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='黑龙江'").FirstOrDefault();
                 Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='吉林'").FirstOrDefault();
-                Model.T_Sys_Department dept6 = new BLL.T_Sys_Department().GetModelList("F_DeptName='辽宁'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept5.F_DeptId + "," + dept6.F_DeptId;
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept5.F_DeptId;
             }
-            if (ua.F_UserCode == "8010")
+            else if (ua.F_UserCode == "8010")
             {
                 Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='山东'").FirstOrDefault();
                 Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华东'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='江苏'").FirstOrDefault();
-                Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='河北'").FirstOrDefault();
-                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId  ;
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId;
             }
-            if (ua.F_UserCode == "8011")
+            else if (ua.F_UserCode == "822249")
             {
-                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华南'").FirstOrDefault();
-                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='川渝'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='湘赣'").FirstOrDefault();
-                Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='西北'").FirstOrDefault();
+                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='辽宁'").FirstOrDefault();
+                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='江苏'").FirstOrDefault();
+                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='黑龙江'").FirstOrDefault();
+                Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='河北'").FirstOrDefault();
 
                 dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId;
             }
-            if (ua.F_UserCode == "8012")
+
+            else if (ua.F_UserCode == "822353")
             {
+                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='川渝'").FirstOrDefault();
+                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='湘赣'").FirstOrDefault();
                 Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='陕宁'").FirstOrDefault();
-                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='晋蒙'").FirstOrDefault();
-                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='鄂皖'").FirstOrDefault();
+                Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='晋蒙'").FirstOrDefault();
+                Model.T_Sys_Department dept5 = new BLL.T_Sys_Department().GetModelList("F_DeptName='华南'").FirstOrDefault();
+                dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId + "," + dept5.F_DeptId;
+            }
+            else if (ua.F_UserCode == "8012")
+            {
+                Model.T_Sys_Department dept1 = new BLL.T_Sys_Department().GetModelList("F_DeptName='湖北'").FirstOrDefault();
+                Model.T_Sys_Department dept2 = new BLL.T_Sys_Department().GetModelList("F_DeptName='安徽'").FirstOrDefault();
+                Model.T_Sys_Department dept3 = new BLL.T_Sys_Department().GetModelList("F_DeptName='西北'").FirstOrDefault();
                 Model.T_Sys_Department dept4 = new BLL.T_Sys_Department().GetModelList("F_DeptName='云贵'").FirstOrDefault();
 
                 dept += dept1.F_DeptId + "," + dept2.F_DeptId + "," + dept3.F_DeptId + "," + dept4.F_DeptId;
             }
             return dept;
-           
+
         }
 
-       
-     
+
+
         /// <summary>
         /// 删除工单
         /// </summary>
@@ -1311,8 +1317,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-
-                if (ids != null && ids.Length > 0)
+                    Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
+                    if (ids != null && ids.Length > 0)
                 {
                     bool res = true;
                     string idd = " ";
@@ -1323,7 +1329,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
                     if (!string.IsNullOrEmpty(idd.Trim()))
                         {
-                            if (workorderBLL.DeleteList(idd.TrimEnd(',')))
+                            if (workorderBLL.DeleteList(idd.TrimEnd(','),ua.F_UserCode ))
                             {
                                 return Success("设置成功");