Skip to content

E
Education
Commit 5b61433d authored by 吴春's avatar 吴春
Browse files
Options

提交代码

parent 02218af8
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 20 deletions
Edu.Model/Entity/Log/RB_User_ChangeLog.cs
View file @ 5b61433d
using System; using System;
using Edu.Common.Enum.User;
using VT.FW.DB; using VT.FW.DB;
namespace Edu.Model.Entity.Log namespace Edu.Model.Entity.Log
...@@ -47,9 +48,15 @@ namespace Edu.Model.Entity.Log ...@@ -47,9 +48,15 @@ namespace Edu.Model.Entity.Log
/// </summary> /// </summary>
public int Type { get => type; set => type = value; } public int Type { get => type; set => type = value; }
/// <summary>
/// 来源id /// <summary>
/// </summary> /// 账号类型(1-管理端，2,-教师端，3-助教，4-学生)
public int SourceId { get; set; } /// </summary>
public AccountTypeEnum AccountType { get; set; }
/// <summary>
/// 来源id
/// </summary>
public int SourceId { get; set; }
} }
} }
Edu.Module.Log/UserChangeLogModule.cs
View file @ 5b61433d
using Edu.Model.ViewModel.Log; using Edu.Common.Enum.User;
using Edu.Model.ViewModel.Log;
using Edu.Repository.Log; using Edu.Repository.Log;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
...@@ -41,7 +42,7 @@ namespace Edu.Module.Log ...@@ -41,7 +42,7 @@ namespace Edu.Module.Log
/// <param name="SchoolId">校区编号</param> /// <param name="SchoolId">校区编号</param>
/// <param name="content">日志内容</param> /// <param name="content">日志内容</param>
/// <returns></returns> /// <returns></returns>
public bool SetUserChangeLogModule(int CreateBy, int GroupId,int SchoolId,string content) public bool SetUserChangeLogModule(int CreateBy, int GroupId,int SchoolId,string content, int Id, AccountTypeEnum accountType)
{ {
RB_User_ChangeLog_ViewModel model = new RB_User_ChangeLog_ViewModel() RB_User_ChangeLog_ViewModel model = new RB_User_ChangeLog_ViewModel()
{ {
...@@ -50,7 +51,9 @@ namespace Edu.Module.Log ...@@ -50,7 +51,9 @@ namespace Edu.Module.Log
CreateTime = DateTime.Now, CreateTime = DateTime.Now,
Group_Id = GroupId, Group_Id = GroupId,
School_Id = SchoolId, School_Id = SchoolId,
LogContent = content.TrimStart(',') LogContent = content.TrimStart(','),
AccountType= accountType,
SourceId= Id
}; };
return changeLogRepository.Insert(model) > 0; return changeLogRepository.Insert(model) > 0;
} }
......
Edu.Module.User/AssistModule.cs
View file @ 5b61433d
...@@ -173,7 +173,7 @@ namespace Edu.Module.User ...@@ -173,7 +173,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.AId, AccountTypeEnum.Assist);
} }
flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId)); flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId));
} }
...@@ -181,6 +181,7 @@ namespace Edu.Module.User ...@@ -181,6 +181,7 @@ namespace Edu.Module.User
{ {
var newId = assistRepository.Insert(model); var newId = assistRepository.Insert(model);
model.AId = newId; model.AId = newId;
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Assist);
flag = newId > 0; flag = newId > 0;
} }
return flag; return flag;
...@@ -221,7 +222,7 @@ namespace Edu.Module.User ...@@ -221,7 +222,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.AId, AccountTypeEnum.Assist);
} }
flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId)); flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId));
} }
...@@ -265,7 +266,7 @@ namespace Edu.Module.User ...@@ -265,7 +266,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.AId, AccountTypeEnum.Assist);
} }
flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId)); flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId));
} }
...@@ -314,7 +315,7 @@ namespace Edu.Module.User ...@@ -314,7 +315,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.AId, AccountTypeEnum.Assist);
} }
flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId)); flag = assistRepository.Update(fileds, new WhereHelper(nameof(RB_Assist.AId), model.AId));
} }
......
Edu.Module.User/ManagerModule.cs
View file @ 5b61433d
...@@ -145,7 +145,7 @@ namespace Edu.Module.User ...@@ -145,7 +145,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.MId, AccountTypeEnum.Admin);
} }
flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId)); flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId));
} }
...@@ -174,7 +174,7 @@ namespace Edu.Module.User ...@@ -174,7 +174,7 @@ namespace Edu.Module.User
model.MId = newId; model.MId = newId;
} }
flag = newId > 0; flag = newId > 0;
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户"); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Admin);
} }
return flag; return flag;
} }
...@@ -210,7 +210,7 @@ namespace Edu.Module.User ...@@ -210,7 +210,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.MId, AccountTypeEnum.Admin);
} }
flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId)); flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId));
} }
...@@ -249,7 +249,7 @@ namespace Edu.Module.User ...@@ -249,7 +249,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.MId, AccountTypeEnum.Admin);
} }
flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId)); flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId));
} }
...@@ -291,7 +291,7 @@ namespace Edu.Module.User ...@@ -291,7 +291,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.MId, AccountTypeEnum.Admin);
} }
flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId)); flag = managerRepository.Update(fileds, new WhereHelper(nameof(RB_Manager_ViewModel.MId), model.MId));
} }
......
Edu.Module.User/TeacherModule.cs
View file @ 5b61433d
...@@ -178,7 +178,7 @@ namespace Edu.Module.User ...@@ -178,7 +178,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.TId, AccountTypeEnum.Teacher);
} }
flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId)); flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId));
} }
...@@ -186,6 +186,7 @@ namespace Edu.Module.User ...@@ -186,6 +186,7 @@ namespace Edu.Module.User
{ {
var newId = teacherRepository.Insert(model); var newId = teacherRepository.Insert(model);
model.TId = newId; model.TId = newId;
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, "新建用户", newId, AccountTypeEnum.Teacher);
flag = newId > 0; flag = newId > 0;
} }
return flag; return flag;
...@@ -222,7 +223,7 @@ namespace Edu.Module.User ...@@ -222,7 +223,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.TId, AccountTypeEnum.Teacher);
} }
flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId)); flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId));
} }
...@@ -267,7 +268,7 @@ namespace Edu.Module.User ...@@ -267,7 +268,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.TId, AccountTypeEnum.Teacher);
} }
flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId)); flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId));
} }
...@@ -314,7 +315,7 @@ namespace Edu.Module.User ...@@ -314,7 +315,7 @@ namespace Edu.Module.User
if (!string.IsNullOrEmpty(logContent)) if (!string.IsNullOrEmpty(logContent))
{ {
//新增日志 //新增日志
userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent); userChangeLogModule.SetUserChangeLogModule(model.CreateBy, model.Group_Id, model.School_Id, logContent, model.TId, AccountTypeEnum.Teacher);
} }
flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId)); flag = teacherRepository.Update(fileds, new WhereHelper(nameof(RB_Teacher_ViewModel.TId), model.TId));
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment