调整代码提交

codegit/CallCenterApi/CallCenterApi.DAL/T_Sys_UserAccount.cs

@@ -317,8 +317,8 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup ,F_Post from T_Sys_UserAccount WITH(NOLOCK)");
-            strSql.Append(" where F_UserCode=@F_UserCode and F_Password=@F_Password and  F_DeleteFlag=0");
+            strSql.Append("select  top 1 * from T_Sys_UserAccount WITH(NOLOCK)");
+            strSql.Append(" where F_UserCode=@F_UserCode and F_Password=@F_Password ");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
                     new SqlParameter("@F_Password", SqlDbType.VarChar,50)
@@ -344,7 +344,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_Post from T_Sys_UserAccount WITH(NOLOCK)");
+            strSql.Append("select  top 1 * from T_Sys_UserAccount WITH(NOLOCK)");
             strSql.Append(" where F_UserName=@F_UserName");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserName", SqlDbType.VarChar,50)
@@ -370,7 +370,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_Post from T_Sys_UserAccount WITH(NOLOCK)");
+            strSql.Append("select  top 1 * from T_Sys_UserAccount WITH(NOLOCK)");
             strSql.Append(" where F_UserCode=@F_UserCode");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserCode", SqlDbType.VarChar,50)
@@ -396,7 +396,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup ,F_Post from T_Sys_UserAccount WITH(NOLOCK)");
+            strSql.Append("select  top 1 * from T_Sys_UserAccount WITH(NOLOCK)");
             strSql.Append(" where F_UserId=@F_UserId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_UserId", SqlDbType.Int,4)
@@ -628,7 +628,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup,F_Post ");
+            strSql.Append("select * ");
             strSql.Append(" FROM T_Sys_UserAccount WITH(NOLOCK)");
             if (strWhere.Trim() != "")
             {
@@ -660,7 +660,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_UserId,F_UserCode,F_Password,F_ExtensionNumber,F_UserName,F_DeptId,F_RoleId,F_GroupId,F_SeatFlag,F_SeatRight,F_SeatLevel,F_SexFlag,F_RemindFlag,F_Remark,F_Telephone,F_Mobile,F_HomePhone,F_Birthday,F_CreateOn,F_CancelOn,F_DeleteFlag,F_APPOnFlag,F_LastActiveTime,F_See,F_HJType,F_PId,F_TmId,F_WorkNumber,F_DeptCode,F_WXNo,F_SeartGroupID,F_SeartGroup ,F_Post");
+            strSql.Append(" * ");
             strSql.Append(" FROM T_Sys_UserAccount WITH(NOLOCK)");
             if (strWhere.Trim() != "")
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/CallCenterApi.Interface.csproj

@@ -178,6 +178,7 @@
     <Compile Include="Controllers\customer\RegionCategoryController.cs" />
     <Compile Include="Controllers\DepartmentController.cs" />
     <Compile Include="Controllers\DictionaryController.cs" />
+    <Compile Include="Controllers\Docking\DockingController.cs" />
     <Compile Include="Controllers\HomeController.cs" />
     <Compile Include="Controllers\IndexController.cs" />
     <Compile Include="Controllers\InfoController.cs" />
@@ -307,6 +308,7 @@
     <Folder Include="Views\Default\" />
     <Folder Include="Views\Department\" />
     <Folder Include="Views\Dictionary\" />
+    <Folder Include="Views\Docking\" />
     <Folder Include="Views\DutyPhone\" />
     <Folder Include="Views\DXRecords\" />
     <Folder Include="Views\DXReports\" />

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Docking/DockingController.cs

@@ -0,0 +1,32 @@
+using CallCenter.Utility;
+using CallCenterApi.Interface.Controllers.Base;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Web;
+using System.Web.Mvc;
+
+namespace CallCenterApi.Interface.Controllers.Docking
+{
+    public class DockingController : BaseController
+    {
+        // GET: Docking
+        public ActionResult GetDocument(string mobile)
+        {
+            string strURL = "http://222.143.48.99:82/api/acase-main/send/documentSendList";
+            if (!string.IsNullOrWhiteSpace(mobile))
+                strURL += "?mobile=" + mobile;
+
+            string strHTML = HttpMethods.HttpGet(strURL);
+            JObject jo1 = (JObject)JsonConvert.DeserializeObject(strHTML);
+            if (jo1 != null && jo1["success"].ToString().ToLower()== "true")
+            {
+                return Success("成功", jo1["data"]);
+            }
+            else
+                return Error("失败");
+        }
+    }
+}

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -331,7 +331,7 @@ namespace CallCenterApi.Interface.Controllers
 
                     //int daynocon = bll.GetList("CallType='0' and CallState='0' and datediff(day,BeginTime, '" + strDate + "')=0 ").Tables[0].Rows.Count;
                     ////int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' ").Tables[0].Rows.Count;
-                    DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),BeginTime, 23) AS yearmonthdays,CONVERT(char(7),BeginTime,20) AS yearmonths,CallType,BeginTime,groupcode,UserCode,ISNULL(TalkLongTime,0) AS TalkLongTime FROM T_Call_CallRecords WITH(NOLOCK) where " + uwhere + "").Tables[0];
+                    DataTable dtConnect = DbHelperSQL.Query("select CONVERT(varchar(10),BeginTime, 23) AS yearmonthdays,CONVERT(char(7),BeginTime,20) AS yearmonths,CallType,callstate,BeginTime,groupcode,UserCode,ISNULL(TalkLongTime,0) AS TalkLongTime FROM T_Call_CallRecords WITH(NOLOCK) where " + uwhere + "").Tables[0];
 
                     // 今日来电
                     var dayinlist = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
@@ -349,8 +349,8 @@ namespace CallCenterApi.Interface.Controllers
                     var monoutlist = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'").Count();
                     var monoutlist_totaltimesum_0 = dtConnect.Select("CallType='1' and yearmonths = '" + strMonth + "'");
                     var monoutlist_totaltimesum = (from DataRow dr in monoutlist_totaltimesum_0 select dr.Field<int>("TalkLongTime")).Sum();
-                    //未接来电    
-                    var daynocon = dtConnect.Select("CallType='0' and yearmonthdays = '" + strDate + "'").Count();
+                    //今日未接来电    
+                    var daynocon = dtConnect.Select("CallType='0' and callstate=0 and yearmonthdays = '" + strDate + "'").Count();
 
                     var obj = new
                     {
@@ -367,7 +367,7 @@ namespace CallCenterApi.Interface.Controllers
                         monin = new { count = moninlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist_totaltimesum.ToString()), 0) },
                         //本月去电    
                         monout = new { count = monoutlist, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist_totaltimesum.ToString()), 0) },
-                        //未接来电    
+                        //今日未接来电    
                         daynocon = daynocon
                     };
                     res = Success("成功", obj);

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Login/LoginController.cs

@@ -28,81 +28,87 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult login(LoginModel login)
         {
             bool appResult = LoodLoop();
-            if (appResult)
-            {
-                Model.T_Sys_UserAccount loginUser = new BLL.T_Sys_UserAccount().LoginGetModel(login.Username, login.Password);
+            if (!appResult)
+                return Error("授权过期，请联系系统厂家。");
+            Model.T_Sys_UserAccount loginUser = new BLL.T_Sys_UserAccount().LoginGetModel(login.Username, login.Password);
 
-                if (loginUser != null)
+            if (loginUser == null)
+            {
+                int rr = new BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
                 {
-                    string deptcode = "";
-                    Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
-                    if (deptModel != null)
-                    {
-                        deptcode = deptModel.F_DeptCode;
-                    }
-                    string seatgroup = "";
-                    if (loginUser.F_SeartGroupID != null)
-                    {
-                        Model.T_Sys_SeatGroup seatgroupmodel = new BLL.T_Sys_SeatGroup().GetModel(loginUser.F_SeartGroupID.Value);
-                        if (seatgroupmodel != null)
-                            seatgroup = seatgroupmodel.F_ZXZName;
-                    }
-                    //写入登录日志
-                    new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
-                    {
-                        F_LoginName = loginUser.F_UserName,
-                        F_LoginId = loginUser.F_UserId,
-                        F_Result = "登录成功",
-                        F_LoginIP = Common.DTRequest.GetIP(),
-                        F_Hostname = Common.DTRequest.GetIP(),
-                        F_LoginDate = DateTime.Now,
-                        F_Remark = "",
-                        F_State = 0
-                    });
-                    Cache.Models.CurrentUserInfo currentUserInfo = new Cache.Models.CurrentUserInfo()
-                    {
-                        F_UserId = loginUser.F_UserId,
-                        F_UserName = loginUser.F_UserName,
-                        F_UserCode = loginUser.F_UserCode,
-                        F_GroupId = loginUser.F_GroupId,
-                        F_RoleId = loginUser.F_RoleId,
-                        F_SeartGroupID = loginUser.F_SeartGroupID,
-                        F_SeartGroup = seatgroup,
-                        F_WorkNumber = loginUser.F_WorkNumber,
-                        F_DeptId = loginUser.F_DeptId,
-                        F_DeptCode = deptcode
-                    };
-                    var token = FormsPrincipal<Cache.Models.CurrentUserInfo>.GetCookieValue(currentUserInfo.F_UserCode, currentUserInfo);
-
-                    //放入redis缓存
-                    RedisHelper.StringSet(token, currentUserInfo.ToJson(), new TimeSpan(24, 0, 0));
-
-                    return Success("登录成功", new
-                    {
-                        token = token
-                    });
-                }
-                else
+                    F_LoginName = login.Username,
+                    F_LoginId = -1,
+                    F_Result = "登录失败：帐号-" + login.Username + ";分机号-" + login.ExtensionPhone,
+                    F_LoginIP = Common.DTRequest.GetIP(),
+                    F_Hostname = Common.DTRequest.GetIP(),
+                    F_LoginDate = DateTime.Now,
+                    F_Remark = "",
+                    F_State = 0
+                });
+                return Error("账号或密码错误，请重新登录");
+            }
+            if (loginUser.F_DeleteFlag == 1)
+            {
+                int rr = new BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
                 {
-                    int rr = new BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
-                    {
-                        F_LoginName = login.Username,
-                        F_LoginId = -1,
-                        F_Result = "登录失败：帐号-" + login.Username + ";分机号-" + login.ExtensionPhone,
-                        F_LoginIP = Common.DTRequest.GetIP(),
-                        F_Hostname = Common.DTRequest.GetIP(),
-                        F_LoginDate = DateTime.Now,
-                        F_Remark = "",
-                        F_State = 0
-                    });
-                    return Error("账号或密码错误，请重新登录");
-                }
-
+                    F_LoginName = login.Username,
+                    F_LoginId = -1,
+                    F_Result = "登录失败：帐号-" + login.Username + ";分机号-" + login.ExtensionPhone,
+                    F_LoginIP = Common.DTRequest.GetIP(),
+                    F_Hostname = Common.DTRequest.GetIP(),
+                    F_LoginDate = DateTime.Now,
+                    F_Remark = "账号已被禁用，请联系管理员",
+                    F_State = 0
+                });
+                return Error("账号已被禁用，请联系管理员");
             }
-            else
+            string deptcode = "";
+            Model.T_Sys_Department deptModel = new BLL.T_Sys_Department().GetModel(loginUser.F_DeptId);
+            if (deptModel != null)
             {
-                return Error("授权过期，请联系系统厂家。");
+                deptcode = deptModel.F_DeptCode;
             }
+            string seatgroup = "";
+            if (loginUser.F_SeartGroupID != null)
+            {
+                Model.T_Sys_SeatGroup seatgroupmodel = new BLL.T_Sys_SeatGroup().GetModel(loginUser.F_SeartGroupID.Value);
+                if (seatgroupmodel != null)
+                    seatgroup = seatgroupmodel.F_ZXZName;
+            }
+            //写入登录日志
+            new CallCenterApi.BLL.T_Sys_LoginLogs().Add(new Model.T_Sys_LoginLogs()
+            {
+                F_LoginName = loginUser.F_UserName,
+                F_LoginId = loginUser.F_UserId,
+                F_Result = "登录成功",
+                F_LoginIP = Common.DTRequest.GetIP(),
+                F_Hostname = Common.DTRequest.GetIP(),
+                F_LoginDate = DateTime.Now,
+                F_Remark = "",
+                F_State = 0
+            });
+            Cache.Models.CurrentUserInfo currentUserInfo = new Cache.Models.CurrentUserInfo()
+            {
+                F_UserId = loginUser.F_UserId,
+                F_UserName = loginUser.F_UserName,
+                F_UserCode = loginUser.F_UserCode,
+                F_GroupId = loginUser.F_GroupId,
+                F_RoleId = loginUser.F_RoleId,
+                F_SeartGroupID = loginUser.F_SeartGroupID,
+                F_SeartGroup = seatgroup,
+                F_WorkNumber = loginUser.F_WorkNumber,
+                F_DeptId = loginUser.F_DeptId,
+                F_DeptCode = deptcode
+            };
+            var token = FormsPrincipal<Cache.Models.CurrentUserInfo>.GetCookieValue(currentUserInfo.F_UserCode, currentUserInfo);
+
+            //放入redis缓存
+            RedisHelper.StringSet(token, currentUserInfo.ToJson(), new TimeSpan(24, 0, 0));
+
+            return Success("登录成功", new
+            {
+                token = token
+            });
         }
       
         public ActionResult Logout(string token = "")

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/RegRecords/RegRecordsController.cs

@@ -13,7 +13,7 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
     public class RegRecordsController : BaseController
     {
         //获取列表
-        public ActionResult GetList(string key, string starttime,string endtime, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
+        public ActionResult GetList(string key, string starttime,string endtime,string usercode, int direction=-1, int type=0, int pageindex = 1, int pagesize = 10)
         {
             if (!Request.IsAuthenticated)
                 return NoToken("未知错误，请重新登录");
@@ -26,8 +26,10 @@ namespace CallCenterApi.Interface.Controllers.RegRecords
             }
             if (!string.IsNullOrWhiteSpace(key))
             {
-                sql += " and (F_Complained like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%' or F_Remark like '%" + key.Trim() + "%')";
+                sql += " and (F_RecCode like '%" + key.Trim() + "%' or F_Complained like '%" + key.Trim() + "%' or F_Content like '%" + key.Trim() + "%' or F_Remark like '%" + key.Trim() + "%')";
             }
+            if (!string.IsNullOrWhiteSpace(usercode))
+                sql += " and F_CreateBy='"+usercode+"'";
             if(type>0)
             {
                 sql += " and F_Type=" + type;

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

@@ -981,47 +981,45 @@ namespace CallCenterApi.Interface.Controllers
         //获取坐席列表
         public ActionResult GetSeatList()
         {
-            if (Request.IsAuthenticated)
-            {
-
-                int userId = CurrentUser.UserData.F_UserId;
-                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
-
-                string sql = " f_seatflag=1 ";
-                int roleid = CurrentUser.UserData.F_RoleId;
-                int deptid = CurrentUser.UserData.F_DeptId;
-                if (roleid != 0)
-                {
-                    if (roleid != 17)
-                    {
-                        if (deptid != 0)
-                            sql += " and F_RoleId=" + 1;
-                    }
-                }
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-                if (userModel.F_SeartGroupID != 0)
+            string sql = " f_seatflag=1 and F_DeleteFlag=0 ";
+            int roleid = CurrentUser.UserData.F_RoleId;
+            int deptid = CurrentUser.UserData.F_DeptId;
+            if (roleid != 0)
+            {
+                if (roleid != 17)
                 {
-                    sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
+                    if (deptid != 0)
+                        sql += " and F_RoleId=" + 1;
                 }
+            }
 
-                List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
-                if (userSeartList.Count > 0)
-                    return Success("列表加载成功", userSeartList);
-                else
-                    return Error("列表加载失败");
+            if (userModel.F_SeartGroupID != 0)
+            {
+                sql += " and F_SeartGroupID = '" + userModel.F_SeartGroupID + "' ";
             }
-            return NoToken("未知错误，请重新登录");
+
+            List<Model.T_Sys_UserAccount> userSeartList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
+            if (userSeartList.Count > 0)
+                return Success("列表加载成功", userSeartList);
+            else
+                return Error("列表加载失败");
         }
 
         //根据部门获取用户
         public ActionResult GetDeptUserList(int deptid = 0)
         {
-            if (Request.IsAuthenticated)
-            {
-                List<Model.T_Sys_UserAccount> DeptUserList = sysUserAccountBll.GetModelList("F_DeptId='" + deptid + "' order by f_userid desc ");
-                return Success("列表加载成功", DeptUserList);
-            }
-            return NoToken("未知错误，请重新登录");
+            if (!Request.IsAuthenticated)
+                return NoToken("未知错误，请重新登录");
+            var sql = " F_DeleteFlag=0 ";
+            if (deptid > 0)
+                sql += " and F_DeptId='" + deptid + "' ";
+            List<Model.T_Sys_UserAccount> DeptUserList = sysUserAccountBll.GetModelList(sql + " order by f_userid desc ");
+            return Success("列表加载成功", DeptUserList);
         }
         public DataTable GetFileData(string ids, string prefix)
         {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -211,6 +211,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                 model.F_CreateTime = DateTime.Now;
                 model.F_IsDelete = 0;
                 int n = bll.Add(model);
+                model.F_Id = n;
                 res = n > 0;
             }
             else
@@ -220,7 +221,7 @@ namespace CallCenterApi.Interface.Controllers.customer
 
             if (res)
             {
-                return Success("保存成功！");
+                return Success("保存成功！", model.F_Id);
             }
             else
             {