提交日志记录查询接口

Edu.Model/ViewModel/Log/RB_User_ChangeLog_ViewModel.cs

@@ -22,6 +22,11 @@ namespace Edu.Model.ViewModel.Log
         /// </summary>
         public string CreateByName { get; set; }
 
+        /// <summary>
+        /// 创建人头像
+        /// </summary>
+        public string CreateByPhoto { get; set; }
+
         /// <summary>
         /// 星期几
         /// </summary>

Edu.Module.Log/UserChangeLogModule.cs

@@ -33,6 +33,18 @@ namespace Edu.Module.Log
         {
            return changeLogRepository.Insert(extModel) > 0;
         }
+        /// <summary>
+        /// 获取日志列表
+        /// </summary>
+        /// <param name="pageIndex"></param>
+        /// <param name="pageSize"></param>
+        /// <param name="count"></param>
+        /// <param name="dmodel"></param>
+        /// <returns></returns>
+        public List<RB_User_ChangeLog_ViewModel> GetUserChangeLogList(int pageIndex, int pageSize, out long count, RB_User_ChangeLog_ViewModel dmodel)
+        {
+            return changeLogRepository.GetPageList(pageIndex, pageSize, out count, dmodel);
+        }
 
         /// <summary>
         /// 新增日志

Edu.Module.User/AccountRemarkModule.cs

@@ -28,6 +28,7 @@ namespace Edu.Module.User
 
 
 
+
         /// <summary>
         /// 获取行政备注分页列表
         /// </summary>

Edu.Repository/Log/RB_User_ChangeLogRepository.cs

@@ -38,6 +38,18 @@ WHERE 1=1
                 {
                     builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.CreateBy)}={query.CreateBy} ");
                 }
+                if (query.Type > 0)
+                {
+                    builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.Type)}={query.Type} ");
+                }
+                if (query.AccountType > 0)
+                {
+                    builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.AccountType)}={(int)query.AccountType} ");
+                }
+                if (query.SourceId > 0)
+                {
+                    builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.SourceId)}={query.SourceId} ");
+                }
             }
             return Get<RB_User_ChangeLog_ViewModel>(builder.ToString()).ToList();
         }

Edu.WebApi/Controllers/User/UserController.cs

@@ -7,6 +7,7 @@ using Edu.Common.API;
 using Edu.Common.Enum.User;
 using Edu.Common.Plugin;
 using Edu.Model.ViewModel.User;
+using Edu.Module.Log;
 using Edu.Module.User;
 using Edu.WebApi.Filter;
 using Microsoft.AspNetCore.Cors;
@@ -78,6 +79,11 @@ namespace Edu.WebApi.Controllers.User
         /// 助教处理类对象
         /// </summary>
         private readonly NoticeModule noticeModule = new NoticeModule();
+        /// <summary>
+        /// 用户修改日志
+        /// </summary>
+        private readonly UserChangeLogModule userChangeLogModule = new UserChangeLogModule();
+
         #region 用户账户管理
 
         /// <summary>
@@ -912,6 +918,45 @@ namespace Edu.WebApi.Controllers.User
             pageModel.PageData = list;
             return ApiResult.Success(data: pageModel);
         }
+
+
+
+        /// <summary>
+        /// 获取系统管理者分页列表
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        public ApiResult GetUserChangeLogPageList()
+        {
+            var pageModel = Common.Plugin.JsonHelper.DeserializeObject<ResultPageModel>(RequestParm.Msg.ToString());
+            var query = Common.Plugin.JsonHelper.DeserializeObject<Model.ViewModel.Log.RB_User_ChangeLog_ViewModel>(RequestParm.Msg.ToString());
+            query.Group_Id = base.UserInfo.Group_Id;
+            var list = userChangeLogModule.GetUserChangeLogList(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
+
+            foreach (var item in list)
+            {
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByName = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.AccountName ?? "";
+                }
+                if (item.CreateBy > 0)
+                {
+                    item.CreateByPhoto = UserReidsCache.GetUserLoginInfo(item.CreateBy)?.UserIcon ?? "";
+                }
+            }
+            pageModel.Count = rowsCount;
+            pageModel.PageData = list.Select(x => new
+            {
+                x.WeekDay,
+                x.CreateByName,
+                x.CreateByPhoto,
+                x.DayStr,
+                x.LogContent,
+                x.TimeStr
+            });
+            return ApiResult.Success(data: pageModel);
+        }
+
         #endregion
 
         #region 部门管理
@@ -1000,7 +1045,7 @@ namespace Edu.WebApi.Controllers.User
                 Group_Id = base.UserInfo.Group_Id,
                 School_Id = base.ParmJObj.GetInt("School_Id")
             };
-            var list = departmentModule.GetDepartmentTreeModule(query,isQueryPost:true);
+            var list = departmentModule.GetDepartmentTreeModule(query, isQueryPost: true);
             return ApiResult.Success(data: list);
         }
 
@@ -1062,7 +1107,7 @@ namespace Edu.WebApi.Controllers.User
         }
 
 
-      
+
 
         #endregion