Skip to content

E
Education
Commit c32052d4 authored by 黄奎's avatar 黄奎
Browse files
Options

新增文件

parent 3056cf48
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 482 additions and 213 deletions
Edu.Common/Plugin/ConvertHelper.cs
View file @ c32052d4
......@@ -25,11 +25,54 @@ namespace Edu.Common
try
{
timeStr = Convert.ToDateTime(time.ToString()).ToString("yyyy-MM-dd HH:mm:ss");
}
catch
{
{
}
}
return timeStr;
}
/// <summary>
/// 获取时间格式
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
public static string FormatTimeStr(this object time)
{
string timeStr = "";
if (time != null)
{
try
{
timeStr = Convert.ToDateTime(time.ToString()).ToString("HH:mm");
}
catch
{
}
}
return timeStr;
}
/// <summary>
/// 获取时间格式
/// </summary>
/// <param name="time"></param>
/// <returns></returns>
public static string FormatMonthDay(this object time)
{
string timeStr = "";
if (time != null)
{
try
{
timeStr = Convert.ToDateTime(time.ToString()).ToString("MM-dd");
}
catch
{
}
}
return timeStr;
......@@ -69,7 +112,7 @@ namespace Edu.Common
public static List<int> StringToList(object value)
{
List<int> list = new List<int>();
if (value!=null && !string.IsNullOrEmpty(value.ToString()))
if (value != null && !string.IsNullOrEmpty(value.ToString()))
{
var tempArray = value.ToString().Split(',');
if (tempArray != null && tempArray.Length > 0)
......@@ -111,5 +154,38 @@ namespace Edu.Common
}
return list;
}
/// <summary>
/// 根据日期获取星期几
/// </summary>
/// <param name="date">日期</param>
/// <returns></returns>
public static string GetWeekDay(this object date)
{
string weekDay = "";
if (date != null)
{
try
{
var dateTime = Convert.ToDateTime(date.ToString());
string strWeek = dateTime.DayOfWeek.ToString();
switch (strWeek)
{
case "Monday": weekDay = "星期一"; break;
case "Tuesday": weekDay = "星期二"; break;
case "Wednesday": weekDay = "星期三"; break;
case "Thursday": weekDay = "星期四"; break;
case "Friday": weekDay = "星期五"; break;
case "Saturday": weekDay = "星期六"; break;
case "Sunday": weekDay = "星期天"; break;
}
}
catch
{
}
}
return weekDay;
}
}
}
\ No newline at end of file
Edu.LogModule/Edu.LogModule.csproj 0 → 100644
View file @ c32052d4
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
</Project>
Edu.LogModule/UserChangeLogModule.cs 0 → 100644
View file @ c32052d4
using Edu.Model.ViewModel.Log;
using Edu.Repository.Log;
using System;
using System.Collections.Generic;
using System.Text;
namespace Edu.LogModule
{
public class UserChangeLogModule
{
/// <summary>
/// 用户信息修改日志仓储层对象
/// </summary>
private readonly RB_User_ChangeLogRepository changeLogRepository = new RB_User_ChangeLogRepository();
/// <summary>
/// 获取用户信息改变日志列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_User_ChangeLog_ViewModel> GetUserChangeLogListModule(RB_User_ChangeLog_ViewModel query)
{
return changeLogRepository.GetUserChangeLogListRepository(query);
}
/// <summary>
/// 新增日志
/// </summary>
/// <param name="extModel"></param>
/// <returns></returns>
public bool SetUserChangeLogModule(RB_User_ChangeLog_ViewModel extModel)
{
return changeLogRepository.Insert(extModel) > 0;
}
}
}
Edu.Model/Entity/Log/RB_User_ChangeLog.cs 0 → 100644
View file @ c32052d4
using System;
using VT.FW.DB;
namespace Edu.Model.Entity.Log
{
/// <summary>
/// 用户信息修改记录实体类
/// </summary>
[Serializable]
[DB(ConnectionName = "DefaultConnection")]
public class RB_User_ChangeLog
{
/// <summary>
/// 主键
/// </summary>
public int Id { get; set; }
/// <summary>
/// 创建时间
/// </summary>
public DateTime CreateTime { get; set; }
/// <summary>
/// 创建人
/// </summary>
public int CreateBy { get; set; }
/// <summary>
/// 日志内容
/// </summary>
public string LogContent { get; set; }
/// <summary>
/// 集团编号
/// </summary>
public int Group_Id { get; set; }
/// <summary>
/// 校区编号
/// </summary>
public int School_Id { get; set; }
}
}
Edu.Model/Entity/User/RB_Department.cs
View file @ c32052d4
......@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.User
/// 部门排序
/// </summary>
public int DeptSort { get; set; }
/// <summary>
/// 是否为公司(1-是)
/// </summary>
public int IsCompany { get; set; }
}
}
Edu.Model/ViewModel/Log/RB_User_ChangeLog_ViewModel.cs 0 → 100644
View file @ c32052d4
using Edu.Model.Entity.Log;
namespace Edu.Model.ViewModel.Log
{
/// <summary>
/// 用户信息修改记录视图实体类
/// </summary>
public class RB_User_ChangeLog_ViewModel : RB_User_ChangeLog
{
/// <summary>
/// 具体时间
/// </summary>
public string TimeStr { get { return Common.ConvertHelper.FormatTimeStr(this.CreateTime); } }
/// <summary>
/// 年月
/// </summary>
public string DayStr { get { return Common.ConvertHelper.FormatMonthDay(this.CreateTime); } }
/// <summary>
/// 创建人
/// </summary>
public string CreateByName { get; set; }
/// <summary>
/// 星期几
/// </summary>
public string WeekDay { get { return Common.ConvertHelper.GetWeekDay(this.CreateTime); } }
}
}
Edu.Model/ViewModel/User/AdminEmp_ViewModel.cs
View file @ c32052d4
......@@ -147,5 +147,10 @@ namespace Edu.Model.ViewModel.User
/// 结束生日日期
/// </summary>
public string EndBirthDate { get; set; }
/// <summary>
/// 是否近7日生日
/// </summary>
public int IsBirth { get; set; }
}
}
Edu.Module.User/DepartmentModule.cs
View file @ c32052d4
......@@ -21,6 +21,11 @@ namespace Edu.Module.User
/// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary>
/// 学校仓储层对象
/// </summary>
private readonly RB_SchoolRepository schoolRepository = new RB_SchoolRepository();
/// <summary>
/// 获取部门分页列表
/// </summary>
......@@ -131,6 +136,12 @@ namespace Edu.Module.User
public List<DepartmentTree_ViewModel> GetDepartmentTreeModule(RB_Department_ViewModel query)
{
var deptList = GetDepartmentListModule(query);
var schoolList = schoolRepository.GetSchoolListRepository(new RB_School_ViewModel() { Group_Id = query.Group_Id });
if (deptList == null)
{
deptList = new List<RB_Department_ViewModel>();
}
List<DepartmentTree_ViewModel> list = new List<DepartmentTree_ViewModel>();
if (deptList != null && deptList.Count > 0)
{
......
Edu.Repository/Log/RB_User_ChangeLogRepository.cs 0 → 100644
View file @ c32052d4
using Edu.Model.Entity.Log;
using Edu.Model.ViewModel.Log;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Edu.Repository.Log
{
/// <summary>
/// 用户信息改变日志
/// </summary>
public class RB_User_ChangeLogRepository : BaseRepository<RB_User_ChangeLog>
{
/// <summary>
/// 获取用户信息改变日志列表
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
public List<RB_User_ChangeLog_ViewModel> GetUserChangeLogListRepository(RB_User_ChangeLog_ViewModel query)
{
StringBuilder builder = new StringBuilder();
builder.AppendFormat(@"
SELECT *
FROM RB_User_ChangeLog
WHERE 1=1
");
if (query != null)
{
if (query.Group_Id > 0)
{
builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.Group_Id)}={query.Group_Id} ");
}
if (query.School_Id > 0)
{
builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.School_Id)}={query.School_Id} ");
}
if (query.CreateBy > 0)
{
builder.AppendFormat($" AND {nameof(RB_User_ChangeLog_ViewModel.CreateBy)}={query.CreateBy} ");
}
}
return Get<RB_User_ChangeLog_ViewModel>(builder.ToString()).ToList();
}
}
}
\ No newline at end of file
Edu.Repository/User/RB_ManagerRepository.cs
View file @ c32052d4
......@@ -70,6 +70,10 @@ WHERE 1=1
builder.AppendFormat(@"
SELECT A.* ,IFNULL(G.GroupName,'') AS GroupName,IFNULL(s.SName,'') AS SchoolName
,IFNULL(d.DeptName,'') AS DeptName,IFNULL(p.PostName,'') AS PostName
, (CASE WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')
AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) <= DATE_FORMAT(date_add(now(),INTERVAL 6 DAY),'%Y-%m-%d')
THEN 1
ELSE 0 END) IsBirth
FROM
(
SELECT A.MId AS TabKeyId,A.MName AS EmployeeName,A.School_Id,A.Group_Id,A.Dept_Id,A.Post_Id,IFNULL(A.Sex,0) AS Sex,A.MTel AS EmployeePhone,A.BirthDate,A.Education,A.LeaveStatus,A.LeaveTime
......@@ -132,14 +136,12 @@ WHERE 1=1
{
builder.AppendFormat(" AND a.{0}<='{1} 23:59:59' ", nameof(AdminEmp_ViewModel.LeaveTime), query.EndLeaveTime);
}
if (!string.IsNullOrEmpty(query.StartBirthDate))
{
}
if (!string.IsNullOrEmpty(query.EndBirthDate))
{
if (!string.IsNullOrEmpty(query.StartBirthDate) && !string.IsNullOrEmpty(query.EndBirthDate))
{
builder.AppendFormat(@"AND (
CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= '{0}'
AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) <= '{1}'
)",query.StartBirthDate,query.EndBirthDate);
}
}
return GetPage<AdminEmp_ViewModel>(pageIndex, pageSize, out rowsCount, builder.ToString(), parameters).ToList();
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ c32052d4
......@@ -643,6 +643,7 @@ namespace Edu.WebApi.Controllers.User
qitem.EmployeeId,
qitem.Account,
qitem.AccountType,
qitem.IsBirth,
});
return ApiResult.Success(data: pageModel);
}
......@@ -764,13 +765,14 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[HttpPost]
public ApiResult GetCurrentAndChildDepartment()
public ApiResult GetChildDepartment()
{
int DeptId = base.ParmJObj.GetInt("DeptId");
if (DeptId<=0)
{
return ApiResult.ParamIsNull(message: "请选择部门编号!");
}
var groupId = base.UserInfo.Group_Id;
var list = departmentModule.GetCurrentAndChildDepartmentListModule(DeptId);
return ApiResult.Success(data: list);
}
......@@ -795,7 +797,6 @@ namespace Edu.WebApi.Controllers.User
[HttpPost]
public ApiResult GetOrganizationChart()
{
var query = Common.Plugin.JsonHelper.DeserializeObject<RB_Department_ViewModel>(RequestParm.Msg.ToString());
query.Group_Id = base.UserInfo.Group_Id;
var rootModel = groupModule.GetGroupEntityModule(query.Group_Id);
......
education.sln
View file @ c32052d4
......@@ -35,7 +35,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "docs", "docs", "{297A2A6E-5
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.User", "Edu.Module.User\Edu.Module.User.csproj", "{AD259CCC-048A-4F65-A368-91B8B4A9F200}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.Module.Public", "Edu.Module.Public\Edu.Module.Public.csproj", "{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Edu.Module.Public", "Edu.Module.Public\Edu.Module.Public.csproj", "{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Edu.LogModule", "Edu.LogModule\Edu.LogModule.csproj", "{5EF242B0-95E1-4D6B-884A-AD0050BA1818}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -87,6 +89,10 @@ Global
{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5}.Release|Any CPU.Build.0 = Release|Any CPU
{5EF242B0-95E1-4D6B-884A-AD0050BA1818}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5EF242B0-95E1-4D6B-884A-AD0050BA1818}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5EF242B0-95E1-4D6B-884A-AD0050BA1818}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5EF242B0-95E1-4D6B-884A-AD0050BA1818}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......@@ -102,6 +108,7 @@ Global
{F3E4D4C5-FD08-44DE-AB65-850071BE7FEF} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{AD259CCC-048A-4F65-A368-91B8B4A9F200} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{8E34CE2D-AAF3-481C-A5E3-5AECC8F7F1B5} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
{5EF242B0-95E1-4D6B-884A-AD0050BA1818} = {7AC0A4EC-3215-4FF2-96DC-DE8325ED6915}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {8763B446-FAB1-46BF-9743-F2628533241B}
......
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