公告消息bug调整

codegit/CallCenterApi/CallCenterApi.DAL/T_Msg_NoticeInfo.cs

@@ -83,8 +83,6 @@ namespace CallCenterApi.DAL
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Title", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Content", SqlDbType.NText),
-                    new SqlParameter("@F_StartDate", SqlDbType.DateTime),
-                    new SqlParameter("@F_EndDate", SqlDbType.DateTime),
                     new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
                     new SqlParameter("@F_CreateBy", SqlDbType.Int,4),
                     new SqlParameter("@F_ModifyBy", SqlDbType.Int,4),

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/MsgController.cs

@@ -382,7 +382,7 @@ namespace CallCenterApi.Interface.Controllers
                 new BLL.T_Msg_List().Add(msg);
             }
             #endregion
-            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2,4) and State=0 and IsDel=0 ");
+            var msgListnew = new BLL.T_Msg_List().GetModelList(" ToUser='" + usercode + "' and Type in (2,4,5) and State=0 and IsDel=0 order by CreateDate desc");
             return Success("获取消息", msgListnew);
         }
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/information/NoticeController.cs

@@ -63,7 +63,7 @@ namespace CallCenterApi.Interface.Controllers.information
             dtrole = rolebll.GetAllList().Tables[0];
 
             var users = ""; var roles = "";
-            if (noticeid != null)
+            if (noticeid != null && noticeid.Trim()!="")
             {
                 Model.T_Msg_NoticeInfo dModel = dBLL.GetModel(int.Parse(noticeid.Trim()));
                 if (dModel != null)
@@ -116,12 +116,12 @@ namespace CallCenterApi.Interface.Controllers.information
             }
             return Success("获取角色用户成功", newdt);
         }
-
+        
         // 获取公告列表
         public ActionResult GetList(string sdate,string edate,int pageindex=1,int pagesize=10)
         {
             DataTable dt = new DataTable();
-            string sql = " ";
+            string sql = " and F_isDel=0 ";
             if (sdate != null && sdate.Trim() != "")
             {
                 sql += " and Datediff(day,F_CreateOn,'" + sdate.Trim() + "')>=0";
@@ -178,7 +178,7 @@ namespace CallCenterApi.Interface.Controllers.information
             int roleId = CurrentUser.UserData.F_RoleId;
             DataTable dt = new DataTable();
             
-            string sql = " 1 = 1 and (ISNULL(F_UserId,'') = '' or ISNULL(F_UserId,'') like '%," + userID + ",%') ";
+            string sql = " F_isDel=0 and (ISNULL(F_UserId,'') = '' or ISNULL(F_UserId,'') like '%," + userID + ",%') ";
             dt = new BLL.T_Msg_NoticeInfo().GetList(top, sql, " F_NoticeId desc ").Tables[0];
             int recordCount = dt.Rows.Count;
             var obj = new
@@ -231,7 +231,7 @@ namespace CallCenterApi.Interface.Controllers.information
             if (title != null)
                 dModel.F_Title = title.Trim();
             if (content != null)
-                dModel.F_Content = WebHelper.UrlDecode(content);
+                dModel.F_Content = content.Trim();
             dModel.F_isCus = iscus;
             //添加权限
             dModel.F_RoleId = "," + roleid + ",";
@@ -297,7 +297,7 @@ namespace CallCenterApi.Interface.Controllers.information
                     if (title != null)
                         dModel.F_Title = title.Trim();
                     if (content != null)
-                        dModel.F_Content = WebHelper.UrlDecode(content);
+                        dModel.F_Content = content.Trim();
                     dModel.F_isCus = iscus;
                     //添加权限
                     dModel.F_RoleId = "," + roleid.Trim() + ",";//= roleid
@@ -383,7 +383,11 @@ namespace CallCenterApi.Interface.Controllers.information
                 bool r = dBLL.DeleteList(idds.Trim(','));
 
                 if (r)
+                {
+                    //若通知删除则取消消息提醒
+                    DbHelperSQL.ExecuteSql("update T_Msg_List set IsDel=1 where ToID in (" + idds.Trim(',') + ") and Type=5");
                     return Success("删除成功");
+                }
                 else
                 {
                     return Error("删除失败");

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -958,11 +958,27 @@ namespace CallCenterApi.Interface.Controllers.weixin
             pageindex,
             true,
             out recordCount);
+            List<Model.T_Msg_NoticeInfo> msgList = new BLL.T_Msg_NoticeInfo().DataTableToList(dt);
+            List<Model.T_Sys_UserAccount> userList = new BLL.T_Sys_UserAccount().GetModelList("");
             var obj = new
             {
-                state = "success",
-                message = "成功",
-                rows = dt,
+                rows = msgList.Select(m =>
+                {
+                    Model.T_Sys_UserAccount usermodel = userList.Where(u => u.F_UserId == m.F_CreateBy.Value).FirstOrDefault();
+                    var uname = "";
+                    if (usermodel != null)
+                        uname = usermodel.F_UserName;
+                    return new
+                    {
+                        F_NoticeId = m.F_NoticeId,
+                        F_Title = m.F_Title,
+                        F_Content = m.F_Content,
+                        F_isCus = m.F_isCus,
+                        F_CreateOn = m.F_CreateOn,
+                        F_CreateBy = m.F_CreateBy,
+                        F_CreateByName = uname
+                    };
+                }),
                 total = recordCount
             };
             return Content(obj.ToJson());
@@ -980,9 +996,29 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return Error("参数错误");
             if (string.IsNullOrEmpty(stropenid))
                 return Error("参数错误!");
-            var model = new BLL.T_Msg_NoticeInfo().GetModel(int.Parse(strnoticeid.Trim()));
-            if (model != null)
-                return Success("获取公告详情成功", model);
+            var dModel = new BLL.T_Msg_NoticeInfo().GetModel(int.Parse(strnoticeid.Trim()));
+            Model.T_Sys_UserAccount userModel = new Model.T_Sys_UserAccount();
+            if (dModel != null)
+            {
+                if (dModel.F_CreateBy != null)
+                    userModel = new BLL.T_Sys_UserAccount().GetModel(dModel.F_CreateBy.Value);
+                var uname = "";
+                if (userModel != null)
+                    uname = userModel.F_UserName;
+                var obj = new
+                {
+                    F_NoticeId = dModel.F_NoticeId,
+                    F_Title = dModel.F_Title,
+                    F_Content = dModel.F_Content,
+                    F_isCus = dModel.F_isCus,
+                    F_CreateOn = dModel.F_CreateOn,
+                    F_CreateBy = dModel.F_CreateBy,
+                    F_CreateByName = uname,
+                    F_UserId = dModel.F_UserId,
+                    F_RoleId = dModel.F_RoleId,
+                };
+                return Success("获取公告详情成功", dModel);
+            }
             else
                 return Error("获取公告详情失败");
         }