公告通讯录

RMYY_CallCenter_Api.Bll/RMYY_CallCenter_Api.Bll.csproj

@@ -61,6 +61,9 @@
     <Compile Include="T_Hos_WorkOrderItem.cs" />
     <Compile Include="T_Mat_WorkOrder.cs" />
     <Compile Include="T_Mat_WorkOrderItem.cs" />
+    <Compile Include="T_Msg_Chat.cs" />
+    <Compile Include="T_Msg_Chat_Map.cs" />
+    <Compile Include="T_Msg_NoticeInfo.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api.Dal/RMYY_CallCenter_Api.Dal.csproj

@@ -61,6 +61,9 @@
     <Compile Include="T_Hos_WorkOrderItem.cs" />
     <Compile Include="T_Mat_WorkOrder.cs" />
     <Compile Include="T_Mat_WorkOrderItem.cs" />
+    <Compile Include="T_Msg_Chat.cs" />
+    <Compile Include="T_Msg_Chat_Map.cs" />
+    <Compile Include="T_Msg_NoticeInfo.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api.Dal/T_Sys_GongDan.cs

@@ -181,7 +181,33 @@ namespace RMYY_CallCenter_Api.Dal
                 return null;
             }
         }
+        /// <summary>
+        /// 根据名称获取对象实体
+        /// </summary>
+        /// <param name="F_GDId"></param>
+        /// <returns></returns>
+        public RMYY_CallCenter_Api.Model.T_Sys_GongDan GetModelbyname(string F_Name)
+        {
+
+            StringBuilder strSql = new StringBuilder();
+            strSql.Append("select  top 1 F_GDId,F_ParentID,F_Name,F_Remark,F_Sort,F_CreateTime,F_TypeId,F_ImgUrl from T_Sys_GongDan with(nolock)");
+            strSql.Append(" where F_Name=@F_Name");
+            SqlParameter[] parameters = {
+                    new SqlParameter("@F_Name", SqlDbType.VarChar,100)
+            };
+            parameters[0].Value = F_Name;
 
+            RMYY_CallCenter_Api.Model.T_Sys_GongDan model = new RMYY_CallCenter_Api.Model.T_Sys_GongDan();
+            DataSet ds = DbHelperSQL.Query(strSql.ToString(), parameters);
+            if (ds.Tables[0].Rows.Count > 0)
+            {
+                return DataRowToModel(ds.Tables[0].Rows[0]);
+            }
+            else
+            {
+                return null;
+            }
+        }
 
         /// <summary>
         /// 得到一个对象实体

RMYY_CallCenter_Api.Model/RMYY_CallCenter_Api.Model.csproj

@@ -60,6 +60,9 @@
     <Compile Include="T_Hos_WorkOrderItem.cs" />
     <Compile Include="T_Mat_WorkOrder.cs" />
     <Compile Include="T_Mat_WorkOrderItem.cs" />
+    <Compile Include="T_Msg_Chat.cs" />
+    <Compile Include="T_Msg_Chat_Map.cs" />
+    <Compile Include="T_Msg_NoticeInfo.cs" />
     <Compile Include="T_Sys_Accessories.cs" />
     <Compile Include="T_Sys_Department.cs" />
     <Compile Include="T_Sys_DictionaryBase.cs" />

RMYY_CallCenter_Api.Utility/RMYY_CallCenter_Api.Utility.csproj

@@ -76,6 +76,7 @@
     <Compile Include="Helper\EnumHelper.cs" />
     <Compile Include="Helper\FileHelper.cs" />
     <Compile Include="Helper\HttpHelper.cs" />
+    <Compile Include="Helper\HttpHelperay.cs" />
     <Compile Include="Helper\ImageHelper.cs" />
     <Compile Include="Helper\LogHelper.cs" />
     <Compile Include="Helper\NPOIHelper.cs" />
@@ -85,11 +86,14 @@
     <Compile Include="Helper\ConfigHelper.cs" />
     <Compile Include="Extention\Json.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="RequestString.cs" />
     <Compile Include="Time\DateTimeConvert.cs" />
     <Compile Include="Tree\Tree.cs" />
     <Compile Include="Tree\TreeModel.cs" />
     <Compile Include="Tree\TreeSelect.cs" />
     <Compile Include="Tree\TreeSelectModel.cs" />
+    <Compile Include="TypeConverter.cs" />
+    <Compile Include="ValidateString.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

RMYY_CallCenter_Api/Controllers/IndexController.cs

@@ -1,4 +1,5 @@
 using RMYY_CallCenter_Api.DB;
+using RMYY_CallCenter_Api.Models.Input;
 using RMYY_CallCenter_Api.Utility;
 using System;
 using System.Collections.Generic;
@@ -12,6 +13,10 @@ namespace RMYY_CallCenter_Api.Controllers
     public class IndexController : BaseController
     {
         private Bll.T_Sys_Menu menbll = new Bll.T_Sys_Menu();
+        private Bll.T_Sys_Role rolebll = new Bll.T_Sys_Role();
+        private Bll.T_Msg_Chat bllchat = new Bll.T_Msg_Chat();
+        private Bll.T_Msg_Chat_Map bllmap = new Bll.T_Msg_Chat_Map();
+        private readonly Bll.T_Sys_UserAccount userAccount = new Bll.T_Sys_UserAccount();
         // GET: Index
         /// <summary>
         /// 获取当前用户
@@ -216,6 +221,482 @@ namespace RMYY_CallCenter_Api.Controllers
             return Content(obj.ToJson());
         }
 
+        #region 及时通讯
+
+        #region 模仿微信聊天（暂时不用）
+        /// <summary>
+        /// 即时聊天 - 角色信息
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="code"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public ActionResult GetRoleList()
+        {
+            //var dtCache = CacheHelper.Get<DataTable>($"RoleList");
+            var dtCache = RedisHelper.StringGet("RoleList");
+            if (dtCache != null)
+            {
+                return Success("获取成功", dtCache.ToString().ToObject<DataTable>());
+            }
+            DataTable dt = new DataTable();
+            dt = rolebll.GetAllList().Tables[0];
+            //CacheHelper.Insert($"RoleList", dt, 10);
+            RedisHelper.StringSet("RoleList", dt.ToJson(), new TimeSpan(0, 10, 0));
+            return Success("获取成功", dt);
+        }
+
+        /// <summary>
+        /// 即时聊天 - 坐席人员
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="code"></param>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        public ActionResult GetUserListByRoleId(int roleid, string keyword)
+        {
+            DataTable dt = new DataTable();
+            //取得前天日期
+            DateTime start = DateTime.Parse(DateTime.Now.AddDays(-2).ToShortDateString() + " 00:00:00");
+
+            string sql1 = "SELECT FromUserId,COUNT(1)AS counts FROM T_Msg_Chat_Map WHERE ToUserId = " + User.F_UserId + " AND ISNULL(IsRead,0) = 0 AND CreateDate > '" + start + "' group by FromUserId order by FromUserId";
+            var dt1 = DbHelperSQL.Query(sql1).Tables[0];
+            //缓存
+            //var dtCache = CacheHelper.Get<DataTable>($"UserList{roleid}");
+            var objCache = RedisHelper.StringGet($"UserList{roleid}");
+            if (objCache != null)
+            {
+                var dtCache = objCache.ToString().ToObject<DataTable>();
+                #region 提示统计
+                if (!string.IsNullOrEmpty(keyword))
+                {
+                    dtCache = ToDataTable1(dtCache.Select("F_UserName LIKE '%" + keyword + "%' OR F_UserCode LIKE '%" + keyword + "%'"));
+                }
+                foreach (DataRow dr in dtCache.Rows)
+                {
+                    var list = dt1.Select(" FromUserId=" + dr["F_UserId"]);
+                    dr["counts"] = list.Count() > 0 ? list[0]["counts"].ToString() : "0";
+                }
+                #endregion                
+                return Success("获取成功", dtCache);
+            }
+            //实时查询
+            var sql = " F_DeleteFlag=0 ";
+            if (roleid != 0)
+            {
+                sql += " and F_RoleId = " + roleid + "";
+            }
+            string sqldt = "SELECT F_UserId,F_UserCode,F_UserName,F_RoleId,F_SexFlag,F_See FROM T_Sys_UserAccount WHERE " + sql + " ";
+            dt = DbHelperSQL.Query(sqldt).Tables[0];
+
+            #region 提示统计
+            dt.Columns.Add("counts", typeof(string)); //统计
+            //string sql1 = "SELECT FromUserId,COUNT(1)AS counts FROM T_Msg_Chat_Map WHERE ToUserId = " + User.F_UserId + " AND ISNULL(IsRead,0) = 0 AND CreateDate > '" + start + "' group by FromUserId order by FromUserId";
+            //var dt1 = DbHelperSQL.Query(sql1).Tables[0];
+            foreach (DataRow dr in dt.Rows)
+            {
+                var list = dt1.Select(" FromUserId=" + dr["F_UserId"]);
+                dr["counts"] = list.Count() > 0 ? list[0]["counts"].ToString() : "0";
+            }
+            //缓存保存
+            //CacheHelper.Insert($"UserList{roleid}", dt, 10);
+            RedisHelper.StringSet($"UserList{roleid}", dt.ToJson(), new TimeSpan(0, 10, 0));
+            if (!string.IsNullOrEmpty(keyword))
+            {
+                dt = ToDataTable1(dt.Select("F_UserName LIKE '%" + keyword + "%' OR F_UserCode LIKE '%" + keyword + "%'"));
+            }
+            #endregion
+            return Success("获取成功", dt);
+        }
+
+        /// <summary>
+        /// 即时聊天 - 获取最新通讯(获取双方记录【聊天】)
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetChatList(int fromuserId)
+        {
+            DataTable dt = null;
+            int recordCount = 0;
+            //取得前天日期
+            DateTime start = DateTime.Parse(DateTime.Now.AddDays(-2).ToShortDateString() + " 00:00:00");
+            //接收坐席Id
+
+            if (fromuserId > 0)
+            {
+                //条件（最近3天的记录）
+                string sql = " ISNULL(a.IsDelete,0) = 0 AND ISNULL(c.F_DeleteFlag,0) = 0 "; // AND ISNULL(b.IsRead,0) = 0
+                if (fromuserId > 0)
+                {
+                    sql += " and (b.FromUserId = " + fromuserId + " or b.ToUserId = " + fromuserId + ") ";
+                }
+                if (User.F_UserId > 0)
+                {
+                    sql += " and (b.ToUserId = " + User.F_UserId + " or b.FromUserId = " + User.F_UserId + ") ";
+                }
+                if (start != null)
+                {
+                    sql += " and b.CreateDate > '" + start + "' ";
+                }
+                //查询（聊天记录）
+                string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.IsToAll,a.CreateDate,c.F_UserName FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+                dt = DbHelperSQL.Query(sql1).Tables[0];
+                recordCount = dt.Rows.Count;
+
+                //修改（设置已读）
+                string sqlwhere = " ISNULL(IsRead,0) = 0 ";
+                if (fromuserId > 0)
+                {
+                    sqlwhere += " and FromUserId = " + fromuserId + " ";
+                }
+                if (User.F_UserId > 0)
+                {
+                    sqlwhere += " and ToUserId = " + User.F_UserId + " ";
+                }
+                string sqlwhere1 = "UPDATE dbo.T_Msg_Chat_Map SET IsRead = 1 WHERE " + sqlwhere + " ";
+                DbHelperSQL.ExecuteSql(sqlwhere1);
+
+            }
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+        #endregion
+
+        #region 及时通讯 - 通讯列表
+        /// <summary>
+        /// 即时通讯 - 获取通讯列表
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult GetChatListSearch()
+        {
+            DataTable dt = new DataTable();
+            int fromid = RequestString.GetInt("fromid", 0);
+            int isread = RequestString.GetInt("isread", -1);
+            string strstarttime = HttpUtility.UrlDecode(RequestString.GetQueryString("strstarttime"));
+            string strendtime = HttpUtility.UrlDecode(RequestString.GetQueryString("strendtime"));
+            string strpageindex = RequestString.GetQueryString("page");
+            int pageindex = 1;
+            string strpagesize = RequestString.GetQueryString("pagesize");
+            int pagesize = 10;
+
+            //接收坐席Id
+
+            string sql = " and ISNULL(a.IsDelete,0) = 0 AND ISNULL(c.F_DeleteFlag,0) = 0 ";
+
+
+
+            #region 权限设置
+            //管理员，坐席班长
+            if (User.F_RoleCode == "GLY" || User.F_RoleCode == "DDZG" || User.F_RoleCode == "ZXBZ")
+            {
+                //
+            }
+            else
+            {
+                sql += " and (b.ToUserId = " + User.F_UserId + " OR b.FromUserId = " + User.F_UserId + ") ";
+            }
+            #endregion
+
+            if (fromid > 0)
+            {
+                sql += " and (b.FromUserId = " + fromid + " or b.ToUserId = " + fromid + ") ";
+            }
+            if (isread != -1)
+            {
+                sql += " and ISNULL(b.IsRead,0) = " + isread + " ";
+            }
+            if (!string.IsNullOrEmpty(strstarttime))
+            {
+                sql += " and datediff(day,b.CreateDate,'" + strstarttime + "')<=0 ";
+            }
+            if (!string.IsNullOrEmpty(strendtime))
+            {
+                sql += " and datediff(day,b.CreateDate,'" + strendtime + "')>=0 ";
+            }
+            if (strpageindex.Trim() != "")
+            {
+                pageindex = Convert.ToInt32(strpageindex);
+            }
+            if (strpagesize.Trim() != "")
+            {
+                pagesize = Convert.ToInt32(strpagesize);
+            }
+            int recordCount = 0;
+            var col = "a.Id,b.FromUserId,b.ToUserId,a.Content,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_UserCode,c.F_RoleId,d.F_UserName AS ToUserName,d.F_UserCode AS ToUserCode,d.F_RoleId AS ToRoleId";
+            dt = Bll.PagerBll.GetListPager(
+                    " dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = b.FromUserId LEFT JOIN dbo.T_Sys_UserAccount d ON d.F_UserId = b.ToUserId ",
+                    "b.Id",
+                    col,
+                    sql,
+                    " ORDER BY a.CreateDate ASC",
+                    pagesize,
+                    pageindex,
+                    true,
+                    out recordCount);
+
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+        #endregion
+
+        /// <summary>
+        /// 即时聊天 - 保存最新通讯
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult SaveChatInfo(ChatInput input)
+        {
+            //发送坐席Id
+
+            var model = new Model.T_Msg_Chat();
+            var modelmap = new Model.T_Msg_Chat_Map();
+            model.Content = input.Content;          //必填
+            model.VoiceUrl = input.VoiceUrl;
+            model.FromUserId = User.F_UserId;
+            model.ToUserId = input.ToUserId;
+            model.ToRoleId = input.ToRoleId;
+            //如果用户和角色都为0，则发送所有人
+            if (input.ToUserId == 0 && input.ToRoleId == 0)
+            {
+                input.IsToAll = 1;
+            }
+            model.IsToAll = input.IsToAll;
+            int chatId = bllchat.Add(model);
+            if (chatId > 0)
+            {
+                modelmap.ChatId = chatId;
+                modelmap.FromUserId = User.F_UserId;
+                //群发聊天          
+                if (input.IsToAll > 0)
+                {
+                    var userList = userAccount.DataTableToList(userAccount.GetList(" F_DeleteFlag=0 ").Tables[0]);
+                    foreach (var u in userList)
+                    {
+                        modelmap.ToUserId = u.F_UserId;
+                        bllmap.Add(modelmap);
+                    }
+                    return Success("发送成功");
+                }
+                //角色聊天
+                if (input.ToRoleId > 0 && input.ToUserId == 0)
+                {
+                    var userList = userAccount.DataTableToList(userAccount.GetList(" F_DeleteFlag=0 AND F_RoleId=" + input.ToRoleId + " ").Tables[0]);
+                    foreach (var u in userList)
+                    {
+                        modelmap.ToUserId = u.F_UserId;
+                        bllmap.Add(modelmap);
+                    }
+                    return Success("发送成功");
+                }
+                //私人聊天
+                modelmap.ToUserId = input.ToUserId;
+                //关闭之前所有的信息
+                string sqlwhere1 = "UPDATE dbo.T_Msg_Chat_Map SET IsRead = 1 WHERE FromUserId = " + input.ToUserId + " or ToUserId = " + User.F_UserId + " ";
+                DbHelperSQL.ExecuteSql(sqlwhere1);
+                //后添加新的信息
+                bllmap.Add(modelmap);
+                return Success("发送成功");
+            }
+            return Error("发送失败");
+        }
+
+        /// <summary>
+        /// 即时通讯 - 获取最新通讯（单方查看）
+        /// </summary>
+        /// <param name="isread">0未读1已读2全部</param>
+        /// <returns></returns>
+        public ActionResult GetChatLists(int top, int fromid, int isread = 0)
+        {
+            DataTable dt = null;
+            int recordCount = 0;
+            //接收坐席Id
+
+            string sql = " ISNULL(a.IsDelete,0) = 0 AND ISNULL(c.F_DeleteFlag,0) = 0 "; // AND ISNULL(b.IsRead,0) = 0
+            if (top <= 0)
+            {
+                top = 50;
+            }
+            if (fromid > 0)
+            {
+                //sql += " and ISNULL(b.FromUserId,0) = " + fromid + " ";
+                sql += " and (b.FromUserId = " + fromid + " or b.ToUserId = " + fromid + ") ";
+                sql += " and (b.ToUserId = " + User.F_UserId + " or b.FromUserId = " + User.F_UserId + ") ";
+            }
+            else
+            {
+                sql += " and b.ToUserId = " + User.F_UserId + " ";
+            }
+            if (isread != 2)
+            {
+                sql += " and ISNULL(b.IsRead,0) = " + isread + " ";
+            }
+            //查询（聊天记录）
+            string sql1 = "SELECT TOP " + top + " a.Id,b.FromUserId,b.ToUserId,a.Content,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId,c.F_SexFlag,c.F_See FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+            dt = DbHelperSQL.Query(sql1).Tables[0];
+            recordCount = dt.Rows.Count;
+
+            var obj = new
+            {
+                rows = dt,
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// 即时通讯 - 获取最新通讯数量（单方查看）
+        /// </summary>
+        /// <param name="isread">0未读1已读2全部</param>
+        /// <returns></returns>
+        public ActionResult GetChatCount(int top)
+        {
+            DataTable dt = null;
+            int recordCount = 0;
+            //接收坐席Id
+
+            if (top <= 0)
+            {
+                top = 50;
+            }
+            string sql = " ISNULL(a.IsDelete,0) = 0 AND ISNULL(c.F_DeleteFlag,0) = 0 "; // AND ISNULL(b.IsRead,0) = 0
+            sql += " and b.ToUserId = " + User.F_UserId + " and ISNULL(b.IsRead,0) = 0 ";
+            //查询（聊天记录）
+            string sql1 = "SELECT TOP " + top + " a.Id FROM dbo.T_Msg_Chat a WITH (NOLOCK) RIGHT JOIN dbo.T_Msg_Chat_Map b WITH (NOLOCK) ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c WITH (NOLOCK) ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+            dt = DbHelperSQL.Query(sql1).Tables[0];
+            recordCount = dt.Rows.Count;
+
+            var obj = new
+            {
+                rows = "",
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// 即时通讯 - 获取最新通讯信息（单方查看）
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="User.F_UserId"></param>
+        /// <returns></returns>
+        public ActionResult GetChatInfoById(int id)
+        {
+            if (id <= 0)
+            {
+                return Error("参数出错");
+            }
+            DataTable dt = null;
+            string cid = string.Empty, content = string.Empty, createDate = string.Empty, userName = string.Empty, isread = string.Empty, roleId = string.Empty;
+            //接收坐席Id
+
+            string sql = " ISNULL(a.IsDelete,0) = 0 AND ISNULL(c.F_DeleteFlag,0) = 0 "; // AND ISNULL(b.IsRead,0) = 0
+            if (User.F_UserId > 0)
+            {
+                sql += " and b.ToUserId = " + User.F_UserId + " ";
+            }
+            if (id > 0)
+            {
+                sql += " and a.Id = " + id + " ";
+            }
+            //查询（聊天记录）
+            string sql1 = "SELECT a.Id,a.FromUserId,a.Content,a.IsToAll,a.CreateDate,b.IsRead,c.F_UserName,c.F_RoleId FROM dbo.T_Msg_Chat a RIGHT JOIN dbo.T_Msg_Chat_Map b ON b.ChatId = a.Id LEFT JOIN dbo.T_Sys_UserAccount c ON c.F_UserId = a.FromUserId WHERE " + sql + " ORDER BY a.CreateDate ASC";
+            dt = DbHelperSQL.Query(sql1).Tables[0];
+            if (dt.Rows.Count > 0)
+            {
+                cid = dt.Rows[0]["Id"].ToString();
+                content = dt.Rows[0]["Content"].ToString();
+                createDate = dt.Rows[0]["CreateDate"].ToString();
+                userName = dt.Rows[0]["F_UserName"].ToString();
+                roleId = dt.Rows[0]["F_RoleId"].ToString();
+                isread = dt.Rows[0]["IsRead"].ToString();
+            }
+
+            //修改（设置已读）
+            string sqlwhere = " ISNULL(IsRead,0) = 0 ";
+            if (User.F_UserId > 0)
+            {
+                sqlwhere += " and ToUserId = " + User.F_UserId + " ";
+            }
+            if (id > 0)
+            {
+                sqlwhere += " and ChatId = " + id + " ";
+            }
+            string sqlwhere1 = "UPDATE dbo.T_Msg_Chat_Map SET IsRead = 1 WHERE " + sqlwhere + " ";
+            DbHelperSQL.ExecuteSql(sqlwhere1);
+
+            var obj = new
+            {
+                id = cid,
+                username = userName,
+                content = content,
+                createdate = createDate,
+                roleId = roleId,
+                isread = isread
+            };
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// 即时通讯 - 关闭通讯信息（单方查看）
+        /// </summary>
+        /// <param name="id"></param>
+        /// <param name="User.F_UserId"></param>
+        /// <returns></returns>
+        public ActionResult CloseChat(int id)
+        {
+            //接收坐席Id
+
+            int recordCount = 0;
+            //修改（设置已读）
+            string sqlwhere = " ISNULL(IsRead,0) = 0 ";
+            if (User.F_UserId > 0)
+            {
+                sqlwhere += " and ToUserId = " + User.F_UserId + " ";
+            }
+            if (id > 0)
+            {
+                sqlwhere += " and ChatId = " + id + " ";
+            }
+            string sqlwhere1 = "UPDATE dbo.T_Msg_Chat_Map SET IsRead = 1 WHERE " + sqlwhere + " ";
+            int n = DbHelperSQL.ExecuteSql(sqlwhere1);
+            if (n > 0)
+            {
+                recordCount = n;
+            }
+
+            var obj = new
+            {
+                rows = "",
+                total = recordCount
+            };
+            return Content(obj.ToJson());
+        }
+
+        /// <summary>
+        /// DataRow转成DataTable
+        /// </summary>
+        /// <param name="rows"></param>
+        /// <returns></returns>
+        public DataTable ToDataTable1(DataRow[] rows)
+        {
+            if (rows == null || rows.Length == 0) return null;
+            DataTable tmp = rows[0].Table.Clone(); // 复制DataRow的表结构
+            foreach (DataRow row in rows)
+            {
+                tmp.ImportRow(row); // 将DataRow添加到DataTable中
+            }
+            return tmp;
+        }
+
+        #endregion
 
     }
 }

RMYY_CallCenter_Api/Controllers/System/KnowledgeController.cs

@@ -250,6 +250,44 @@ namespace RMYY_CallCenter_Api.Controllers.System
             }  
             return treelist;
         }
+        /// <summary>
+        /// 导入知识库
+        /// </summary>
+        /// <returns></returns>
+        public ActionResult Excelmodelinfo()
+        {
+            NPOIHelper npoi = new NPOIHelper();
+            if (Request.Files.Count <= 0)
+                throw new Exception("请选中的Excel文件！");
+            var a = Request.Files[0];
+            var dtExcel = npoi.ExcelToTable(Request.Files[0], 0);
+            foreach (DataRow item in dtExcel.Rows)
+            {
+                Model.T_Sys_Knowledge kmodel = new Model.T_Sys_Knowledge();
+                if (item["工单类型"].ToString() != "")
+                {
+                    //根据工单类型名称获取工单类型编号
+                    var getmodelbyname = new Bll.T_Sys_GongDan().GetModelbyname(item["工单类型"].ToString());
+                    var tid = getmodelbyname.F_TypeId;
+                    //Model.T_Sys_GongDan tmodel = new Bll.T_Sys_GongDan().GetModel(Convert.ToInt32(tid));
+                    kmodel.F_TypeId = Convert.ToInt32(tid);// int.Parse(item["工单类型"].ToString().Trim());
+                     kmodel.F_TypeName = item["工单类型"].ToString();//工单类型名称
+                }
+                else
+                    kmodel.F_TypeId = 0;
 
+                kmodel.F_Title = item["标题"].ToString();
+                kmodel.F_KeyWords = item["关键字"].ToString();
+                kmodel.F_Content = item["内容"].ToString();
+                kmodel.F_Description = item["描述"].ToString();
+                kmodel.F_Files ="";
+                kmodel.F_CreateCode = User.F_UserCode;
+                kmodel.F_CreateTime = DateTime.Now;
+                kmodel.F_CreateName = User.F_UserName;
+                kmodel.F_IsDel = 0;
+                int b = new Bll.T_Sys_Knowledge().Add(kmodel);
+            }
+            return Success("导入成功");
+        }
     }
 }

RMYY_CallCenter_Api/Controllers/WorepairController.cs

@@ -1056,19 +1056,25 @@ namespace RMYY_CallCenter_Api.Controllers
             #endregion
             ///完成工单统计 日 周 月 起止日期
             #region 定义起止时间
-            //默认天
-            stime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
-            etime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
-            if (isweek == 1)//周
+            if (string.IsNullOrEmpty(stime) || string.IsNullOrEmpty(stime))
             {
-                stime = DateTime.Now.AddDays(1 - Convert.ToInt32(DateTime.Now.DayOfWeek.ToString("d"))).ToString("yyyy-MM-dd") + " 00:00:00";  //本周周一
-                etime = DateTime.Now.AddDays(1 - Convert.ToInt32(DateTime.Now.DayOfWeek.ToString("d"))).AddDays(6).ToString("yyyy-MM-dd") + " 23:59:59";  //本周周日
-            }
-            else//月
-            {
-                stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).ToString("yyyy-MM-dd") + " 00:00:00";  //本月月初
-                etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1).AddDays(6).ToString("yyyy-MM-dd") + " 23:59:59";  //本月月末
+                if (isweek == 0)//默认天
+                {
+                    stime = DateTime.Now.ToString("yyyy-MM-dd") + " 00:00:00";
+                    etime = DateTime.Now.ToString("yyyy-MM-dd") + " 23:59:59";
+                }
+                else if (isweek == 1)//周
+                {
+                    stime = DateTime.Now.AddDays(1 - Convert.ToInt32(DateTime.Now.DayOfWeek.ToString("d"))).ToString("yyyy-MM-dd") + " 00:00:00";  //本周周一
+                    etime = DateTime.Now.AddDays(1 - Convert.ToInt32(DateTime.Now.DayOfWeek.ToString("d"))).AddDays(6).ToString("yyyy-MM-dd") + " 23:59:59";  //本周周日
+                }
+                else//月
+                {
+                    stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).ToString("yyyy-MM-dd") + " 00:00:00";  //本月月初
+                    etime = DateTime.Now.AddDays(1 - DateTime.Now.Day).AddMonths(1).AddDays(-1).AddDays(6).ToString("yyyy-MM-dd") + " 23:59:59";  //本月月末
+                }
             }
+           
             #endregion
             #region T_Con_WorkOrder  工单类型：1健康咨询，2投诉建议，3外聘专家咨询，4家庭预约上门,5静脉置管维护
             ///健康咨询完成工单数量 1

RMYY_CallCenter_Api/RMYY_CallCenter_Api.csproj

@@ -131,6 +131,7 @@
     <Compile Include="Controllers\CallTel\CallrecordsController.cs" />
     <Compile Include="Controllers\CarManage\T_Car_MessageController.cs" />
     <Compile Include="Controllers\CarManage\T_Car_WorkOrderController.cs" />
+    <Compile Include="Controllers\information\NoticeController.cs" />
     <Compile Include="Controllers\System\AddressBookController.cs" />
     <Compile Include="Controllers\System\KnowledgeController.cs" />
     <Compile Include="Controllers\System\SeatGroupController.cs" />
@@ -177,6 +178,7 @@
     <Compile Include="Models\Filter\FilterSysConfig.cs" />
     <Compile Include="Models\Filter\FilterUserAccount.cs" />
     <Compile Include="Models\FormsPrincipal.cs" />
+    <Compile Include="Models\Input\ChatInput.cs" />
     <Compile Include="Models\Input\Con_WorkOrderInput.cs" />
     <Compile Include="Models\Input\DictionaryInput.cs" />
     <Compile Include="Models\Input\T_WowoRepair_Baseinput.cs" />