页面修改

Edu.Common/Plugin/StringHelper.cs

@@ -55,18 +55,7 @@ namespace Edu.Common.Plugin
         {
             //TimeSpan表示时间间隔
             TimeSpan span = (DateTime.Now - dt).Duration();//表示取timespan绝对值
-            //if (span.TotalDays > 60)
-            //{
-            //    return dt.ToString("yyyy-MM-dd");
-            //}
-            //else if (span.TotalDays > 30)
-            //{
-            //    return "1个月前";
-            //}
-            //else if (span.TotalDays > 14)
-            //{
-            //    return "2周前";
-            //}
+ 
             if (dt.Year == DateTime.Now.Year)
             {
                 if (span.TotalDays > 7)

Edu.Repository/User/RB_Notice_ReadRepository.cs

@@ -16,7 +16,7 @@ namespace Edu.Repository.User
     {
         public List<RB_Notice_Read_ViewModel> GetList(RB_Notice_Read_ViewModel demodel)
         {
-            string where = $@" 1=1 and Status=0 ";
+            string where = $@" 1=1 ";
             if (demodel.NoticeId > 0)
             {
                 where += $@" and {nameof(RB_Notice_Read.NoticeId)} ={demodel.NoticeId}";

Edu.WebApi/Controllers/User/UserCenterController.cs

@@ -273,14 +273,12 @@ namespace Edu.WebApi.Controllers.User
         public ApiResult SetNoticeOperation()
         {
             UserInfo userInfo = base.UserInfo;
-            JObject parms = JObject.Parse(RequestParm.Msg.ToString());
-            int NoticeId = parms.GetInt("NoticeId", 0);
-            int Type = parms.GetInt("Type", 1);// 类型 1置顶  2取消置顶  3撤回  4删除   5公告阅读
+            int NoticeId = base.ParmJObj.GetInt("NoticeId", 0);
+            int Type = base.ParmJObj.GetInt("Type", 1);// 类型 1置顶  2取消置顶  3撤回  4删除   5公告阅读
             if (NoticeId <= 0)
             {
-                return ApiResult.ParamIsNull("公告id");
+                return ApiResult.ParamIsNull("公告编号不存在!");
             }
-
             bool flag = noticeModule.SetNoticeOperation(NoticeId, Type, userInfo);
             if (flag)
             {
@@ -364,7 +362,11 @@ namespace Edu.WebApi.Controllers.User
                 {
                     toList.Add("全公司");
                 }
-
+                string DayStr = "";
+                if (item.UpdateTime != null)
+                {
+                    DayStr = Common.Plugin.StringHelper.DateFormatToString(Convert.ToDateTime(item.UpdateTime));
+                }
                 var obj = new
                 {
                     item.Id,
@@ -377,12 +379,14 @@ namespace Edu.WebApi.Controllers.User
                     item.ReadNum,
                     item.UpdateBy,
                     UpdateByName = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.AccountName ?? "",
+                    UpdateByIcon = UserReidsCache.GetUserLoginInfo(item.UpdateBy)?.UserIcon ?? "",
                     UpdateTime =Common.ConvertHelper.FormatDate2(item.UpdateTime),
                     UpdateTimeStr = Common.ConvertHelper.FormatDate(item.UpdateTime),
                     item.Content,
                     fileList,
                     ccList,
-                    toList
+                    toList,
+                    DayStr,
                 };
                 result.Add(obj);
             }