公告管理增加数量，公告管理优化

CallCenterApi/CallCenterApi.DAL/T_Msg_NoticeInfo.cs

@@ -25,9 +25,9 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Msg_NoticeInfo(");
-            strSql.Append("F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File)");
+            strSql.Append("F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File,F_Frequency)");
             strSql.Append(" values (");
-            strSql.Append("@F_Title,@F_Content,@F_StartDate,@F_EndDate,@F_CreateOn,@F_CreateBy,@F_ModifyBy,@F_ModifyDate,@F_UserId,@F_RoleId,@F_File)");
+            strSql.Append("@F_Title,@F_Content,@F_StartDate,@F_EndDate,@F_CreateOn,@F_CreateBy,@F_ModifyBy,@F_ModifyDate,@F_UserId,@F_RoleId,@F_File,@F_Frequency)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_Title", SqlDbType.NVarChar,100),
@@ -40,6 +40,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ModifyDate", SqlDbType.DateTime),
                     new SqlParameter("@F_UserId", SqlDbType.NVarChar,2000),
                      new SqlParameter("@F_File", SqlDbType.NVarChar,100),
+                      new SqlParameter("@F_Frequency", SqlDbType.Int ,4),
+                     
                     new SqlParameter("@F_RoleId", SqlDbType.NVarChar,2000)};
             parameters[0].Value = model.F_Title;
             parameters[1].Value = model.F_Content;
@@ -51,7 +53,8 @@ namespace CallCenterApi.DAL
             parameters[7].Value = model.F_ModifyDate;
             parameters[8].Value = model.F_UserId;
             parameters[9].Value = model.F_File;
-            parameters[10].Value = model.F_RoleId;
+            parameters[10].Value = model.F_Frequency;
+            parameters[11].Value = model.F_RoleId;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -80,6 +83,7 @@ namespace CallCenterApi.DAL
             strSql.Append("F_ModifyDate=@F_ModifyDate,");
             strSql.Append("F_UserId=@F_UserId,");
             strSql.Append("F_File=@F_File,");
+            strSql.Append("F_Frequency=@F_Frequency,");
             
             strSql.Append("F_RoleId=@F_RoleId");
             strSql.Append(" where F_NoticeId=@F_NoticeId");
@@ -94,6 +98,8 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_ModifyDate", SqlDbType.DateTime),
                     new SqlParameter("@F_UserId", SqlDbType.NVarChar,2000),
                     new SqlParameter("@F_File", SqlDbType.NVarChar,100),
+                     new SqlParameter("@F_Frequency", SqlDbType.Int ,4),
+                    
                     new SqlParameter("@F_RoleId", SqlDbType.NVarChar,2000),
                     new SqlParameter("@F_NoticeId", SqlDbType.Int,4)};
             parameters[0].Value = model.F_Title;
@@ -106,8 +112,10 @@ namespace CallCenterApi.DAL
             parameters[7].Value = model.F_ModifyDate;
             parameters[8].Value = model.F_UserId;
             parameters[9].Value = model.F_File;
-            parameters[10].Value = model.F_RoleId;
-            parameters[11].Value = model.F_NoticeId;
+            parameters[10].Value = model.F_Frequency;
+            
+            parameters[11].Value = model.F_RoleId;
+            parameters[12].Value = model.F_NoticeId;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -171,7 +179,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File from T_Msg_NoticeInfo ");
+            strSql.Append("select  top 1 F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File,F_Frequency from T_Msg_NoticeInfo ");
             strSql.Append(" where F_NoticeId=@F_NoticeId");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_NoticeId", SqlDbType.Int,4)
@@ -203,6 +211,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_NoticeId = int.Parse(row["F_NoticeId"].ToString());
                 }
+                if (row["F_Frequency"] != null && row["F_Frequency"].ToString() != "")
+                {
+                    model.F_Frequency = int.Parse(row["F_Frequency"].ToString());
+                }
                 if (row["F_Title"] != null)
                 {
                     model.F_Title = row["F_Title"].ToString();
@@ -258,7 +270,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File ");
+            strSql.Append("select F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File,F_Frequency ");
             strSql.Append(" FROM T_Msg_NoticeInfo ");
             if (strWhere.Trim() != "")
             {
@@ -278,7 +290,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File ");
+            strSql.Append(" F_NoticeId,F_Title,F_Content,F_StartDate,F_EndDate,F_CreateOn,F_CreateBy,F_ModifyBy,F_ModifyDate,F_UserId,F_RoleId,F_File,F_Frequency ");
             strSql.Append(" FROM T_Msg_NoticeInfo ");
             if (strWhere.Trim() != "")
             {

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

@@ -147,44 +147,20 @@ namespace CallCenterApi.Interface.Controllers.information
             }
             int recordCount = 0;
             dt = BLL.PagerBLL.GetListPager(
-                "T_Msg_NoticeInfo",
+                "T_Msg_NoticeInfo a",
                 "F_NoticeId",
-                "*",
+                "*,dbo.GetUserName(F_CreateBy) as F_CreateByName",
                 sql,
                 "ORDER BY F_NoticeId desc",
                 pagesize,
                 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
             {
-                rows = msgList.Select(m =>
-                {
-                    Model.T_Sys_UserAccount User = userList.Where(u => u.F_UserId == m.F_CreateBy.Value).FirstOrDefault();
-                    var uname = ""; var sdate = ""; var edate = "";
-                    if (User != null)
-                        uname = User.F_UserName;
-                    if (m.F_StartDate != null)
-                        sdate = m.F_StartDate.Value.ToString("yyyy-MM-dd");
-                    if (m.F_EndDate != null)
-                        edate = m.F_EndDate.Value.ToString("yyyy-MM-dd");
-                    return new
-                    {
-                        F_NoticeId = m.F_NoticeId,
-                        F_Title = m.F_Title,
-                        F_Content = m.F_Content,
-                        F_StartDate = sdate,
-                        F_EndDate = edate,
-                        F_CreateOn = m.F_CreateOn,
-                        F_CreateBy = m.F_CreateBy,
-                        F_CreateByName = uname
-                    };
-                }),
+                rows = dt,
                 total = recordCount
             };
-
             return Content(obj.ToJson());
 
         }
@@ -230,7 +206,12 @@ namespace CallCenterApi.Interface.Controllers.information
                 if (dModel.F_EndDate != null)
                     edate = dModel.F_EndDate.Value.ToString("yyyy-MM-dd");
                 var configfj = configBll.GetModelList(" F_ParamCode='FileUrlPath' ").FirstOrDefault();
-                DataTable dt = new DataTable();
+                if (dModel.F_Frequency != null)
+                    dModel.F_Frequency = dModel.F_Frequency + 1;
+                else
+                    dModel.F_Frequency = 1;
+                new BLL.T_Msg_NoticeInfo().Update(dModel);
+                     DataTable dt = new DataTable();
                 if (configfj != null)
                 {
                    dt = BindFileData(dt,dModel.F_File , configfj.F_ParamValue);
@@ -247,7 +228,8 @@ namespace CallCenterApi.Interface.Controllers.information
                     F_CreateByName = uname,
                     F_UserId =  dModel.F_UserId  ,//== null ? 0 : dModel.F_UserId,
                     F_RoleId =  dModel.F_RoleId  ,// == null ? 0 : dModel.F_RoleId,
-                    F_FilePath= dt
+                    F_FilePath= dt,
+                    F_Frequency = dModel.F_Frequency
                 };
                 return Success("获取公告信息成功", obj);
             }
@@ -319,7 +301,7 @@ namespace CallCenterApi.Interface.Controllers.information
             dModel.F_File = file;
             dModel.F_CreateOn = DateTime.Now;
             dModel.F_CreateBy = User.F_UserId;
-
+            dModel.F_Frequency = 0;
             int b = dBLL.Add(dModel);
             if (b > 0)
             {

CallCenterApi/CallCenterApi.Model/T_Msg_NoticeInfo.cs

@@ -120,6 +120,7 @@ namespace CallCenterApi.Model
             set { _f_file = value; }
             get { return _f_file; }
         }
+        public int? F_Frequency { set; get; }
         #endregion Model
     }
 }