Skip to content

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

页面修改

parent 09a2b856
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 10 deletions
Edu.Model/Entity/User/RB_Assist.cs
View file @ 823fefce
......@@ -143,5 +143,10 @@ namespace Edu.Model.Entity.User
/// 邮箱
/// </summary>
public string Email { get; set; }
/// <summary>
/// 用户类型(1-甲鹤员工，2-旅游员工)
/// </summary>
public int AccountUserType { get; set; }
}
}
\ No newline at end of file
Edu.Model/Entity/User/RB_Manager.cs
View file @ 823fefce
......@@ -131,5 +131,10 @@ namespace Edu.Model.Entity.User
/// 是否是电话客服
/// </summary>
public int IsTenCccUser { get; set; }
/// <summary>
/// 用户类型(1-甲鹤员工，2-旅游员工)
/// </summary>
public int AccountUserType { get; set; }
}
}
Edu.Model/Entity/User/RB_Teacher.cs
View file @ 823fefce
......@@ -217,5 +217,10 @@ namespace Edu.Model.Entity.User
/// 增加的基础课时
/// </summary>
public int BaseHoursAdd { get; set; }
/// <summary>
/// 用户类型(1-甲鹤员工，2-旅游员工)
/// </summary>
public int AccountUserType { get; set; }
}
}
\ No newline at end of file
Edu.Model/ViewModel/User/Employee_ViewModel.cs
View file @ 823fefce
......@@ -222,5 +222,10 @@ namespace Edu.Model.ViewModel.User
/// </summary>
public int IsTenCccUser { get; set; }
/// <summary>
/// 用户类型(1-甲鹤员工，2-旅游员工)
/// </summary>
public int AccountUserType { get; set; }
}
}
Edu.Module.User/AssistModule.cs
View file @ 823fefce
......@@ -157,6 +157,7 @@ namespace Edu.Module.User
fileds.Add(nameof(RB_Assist_ViewModel.LeaveTime), model.LeaveTime);
fileds.Add(nameof(RB_Assist_ViewModel.Education), model.Education);
fileds.Add(nameof(RB_Assist_ViewModel.Email), model.Email);
fileds.Add(nameof(RB_Assist_ViewModel.AccountUserType), model.AccountUserType);
}
string logContent = "";
if (model.AssistName != oldModel.AssistName)
......@@ -211,6 +212,28 @@ namespace Edu.Module.User
{
logContent += string.Format(",将邮箱由【{0}】修改为【{1}】。", oldModel.Email, model.Email);
}
if (model.AccountUserType != oldModel.AccountUserType)
{
string oldStr = "";
if (oldModel.AccountUserType == 1)
{
oldStr = "甲鹤员工";
}
else if (oldModel.AccountUserType == 2)
{
oldStr = "旅游员工";
}
string newStr = "";
if (model.AccountUserType == 1)
{
newStr = "甲鹤员工";
}
else if (model.AccountUserType == 2)
{
newStr = "旅游员工";
}
logContent += string.Format(",用户类型【{0}】修改为【{1}】。", oldStr, newStr);
}
if (!string.IsNullOrEmpty(logContent))
{
//新增日志
......
Edu.Module.User/EmployeeModule.cs
View file @ 823fefce
......@@ -189,6 +189,7 @@ namespace Edu.Module.User
Password = extModel.Password,
Token = token,
UserRole=extModel.UserRole,
AccountUserType = extModel.AccountUserType,
});
break;
case Common.Enum.User.AccountTypeEnum.Teacher:
......@@ -222,6 +223,7 @@ namespace Edu.Module.User
Token = token,
UserRole = extModel.UserRole,
AuditStatus= Common.Enum.User.AccountStatusEnum.Pass,
AccountUserType = extModel.AccountUserType,
});
break;
case Common.Enum.User.AccountTypeEnum.Assist:
......@@ -253,6 +255,7 @@ namespace Edu.Module.User
Password=extModel.Password,
Token = token,
AuditStatus= Common.Enum.User.AccountStatusEnum.Pass,
AccountUserType = extModel.AccountUserType,
});
break;
}
......
Edu.Module.User/ManagerModule.cs
View file @ 823fefce
......@@ -121,6 +121,7 @@ namespace Edu.Module.User
{ nameof(RB_Manager_ViewModel.Email),model.Email },
{ nameof(RB_Manager_ViewModel.UserRole),model.UserRole },
{ nameof(RB_Manager_ViewModel.IsTenCccUser),model.IsTenCccUser },
{ nameof(RB_Manager_ViewModel.AccountUserType),model.AccountUserType },
};
#region 日志
......@@ -173,6 +174,28 @@ namespace Edu.Module.User
{
logContent += string.Format(",用户角色由【{0}】修改为【{1}】。", oldModel.UserRole.ToName(), model.UserRole.ToName());
}
if (model.AccountUserType != oldModel.AccountUserType)
{
string oldStr = "";
if (oldModel.AccountUserType == 1)
{
oldStr = "甲鹤员工";
}
else if (oldModel.AccountUserType == 2)
{
oldStr = "旅游员工";
}
string newStr = "";
if (model.AccountUserType == 1)
{
newStr = "甲鹤员工";
}
else if (model.AccountUserType == 2)
{
newStr = "旅游员工";
}
logContent += string.Format(",用户类型【{0}】修改为【{1}】。", oldStr,newStr);
}
if (!string.IsNullOrEmpty(logContent))
{
//新增日志
......
Edu.Module.User/TeacherModule.cs
View file @ 823fefce
......@@ -186,6 +186,7 @@ namespace Edu.Module.User
fileds.Add(nameof(RB_Teacher_ViewModel.Email), model.Email);
fileds.Add(nameof(RB_Teacher_ViewModel.UserRole), model.UserRole);
fileds.Add(nameof(RB_Teacher_ViewModel.IsTenCccUser), model.IsTenCccUser);
fileds.Add(nameof(RB_Teacher_ViewModel.AccountUserType), model.AccountUserType);
}
#region 修改日志
string logContent = "";
......@@ -249,6 +250,28 @@ namespace Edu.Module.User
{
logContent += string.Format(",将用户角色由【{0}】修改为【{1}】。", oldModel.UserRole, model.UserRole);
}
if (model.AccountUserType != oldModel.AccountUserType)
{
string oldStr = "";
if (oldModel.AccountUserType == 1)
{
oldStr = "甲鹤员工";
}
else if (oldModel.AccountUserType == 2)
{
oldStr = "旅游员工";
}
string newStr = "";
if (model.AccountUserType == 1)
{
newStr = "甲鹤员工";
}
else if (model.AccountUserType == 2)
{
newStr = "旅游员工";
}
logContent += string.Format(",用户类型【{0}】修改为【{1}】。", oldStr, newStr);
}
if (!string.IsNullOrEmpty(logContent))
{
//新增日志
......
Edu.Repository/User/RB_AccountRepository.cs
View file @ 823fefce
......@@ -390,6 +390,7 @@ FROM
{
where.AppendFormat(" AND A.{0} in({1}) ", nameof(Employee_ViewModel.WorkUserId), query.WorkUserIds);
}
if (query.AccountId > 0)
{
wheremanager.AppendFormat(" AND b.{0}={1} ", nameof(RB_Manager_ViewModel.MId), query.AccountId);
......@@ -468,6 +469,10 @@ FROM
where.AppendFormat(" AND ((B.LeaveStatus=4 AND b.{0}>='{1}') or ", nameof(Employee_ViewModel.LeaveTime), query.HoursStartTime);
where.AppendFormat(" (B.LeaveStatus<>4 and b.{0}<='{1} 23:59:59')) ", nameof(Employee_ViewModel.EntryTime), query.HoursEndTime);
}
if (query.AccountUserType > 0)
{
where.AppendFormat(" AND b.{0}={1} ", nameof(Employee_ViewModel.AccountUserType), query.AccountUserType);
}
}
StringBuilder builder = new StringBuilder();
......@@ -479,7 +484,7 @@ SELECT ar.AccountRemark,A.Id,A.Account,A.Password,A.AccountId,A.WorkUserId,A.IsW
,(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,A.UserRole,A.IsTenCccUser
ELSE 0 END) IsBirth,A.UserRole,A.IsTenCccUser,A.AccountUserType
FROM
(
SELECT A.Id,A.Account,A.`Password`, 1 as AccountType,B.MId as AccountId,A.WorkUserId,A.IsWorkTransfer
......@@ -487,7 +492,7 @@ FROM
,b.School_Id,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.MTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,B.UserRole,B.IsTenCccUser
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,B.UserRole,B.IsTenCccUser,IFNULL(B.AccountUserType,0) AS AccountUserType
FROM rb_manager AS B LEFT JOIN rb_account AS A ON A.AccountId=B.MId AND A.AccountType=1
WHERE 1=1 {0} {1}
UNION ALL
......@@ -496,7 +501,7 @@ FROM
,b.School_Id,IFNULL(B.TeacherName,'') AS EmployeeName,B.TeacherIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.TeacherTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.BaseHoursAdd,B.UserRole,B.IsTenCccUser
,B.BaseHourFee,B.BaseHoursEnabled,B.EnableTime,B.BaseHoursAdd,B.UserRole,B.IsTenCccUser,IFNULL(B.AccountUserType,0) AS AccountUserType
FROM rb_teacher AS B LEFT JOIN rb_account AS A ON A.AccountId=B.TId AND A.AccountType=2
WHERE 1=1 {0} {2}
UNION ALL
......@@ -505,7 +510,7 @@ FROM
,b.School_Id,IFNULL(B.AssistName,'') AS EmployeeName,B.AssistIcon AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard
,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
,B.LeaveStatus,B.LeaveTime,B.AssistTel AS EmployeeTel,IFNULL(B.Email,'') AS Email
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,0 AS UserRole,0 AS IsTenCccUser
,0 as BaseHourFee,0 as BaseHoursEnabled,'' as EnableTime,0 as BaseHoursAdd,0 AS UserRole,0 AS IsTenCccUser,IFNULL(B.AccountUserType,0) AS AccountUserType
FROM rb_assist AS B LEFT JOIN rb_account AS A ON A.AccountId=B.AId AND A.AccountType=3
WHERE 1=1 {0} {3}
) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
......
Edu.WebApi/Controllers/User/UserController.cs
View file @ 823fefce
......@@ -1642,6 +1642,7 @@ namespace Edu.WebApi.Controllers.User
StartEntryTime = base.ParmJObj.GetStringValue("StartEntryTime"),
StartLeaveTime = base.ParmJObj.GetStringValue("StartLeaveTime"),
IsLeave = base.ParmJObj.GetInt("IsLeave"),
AccountUserType=base.ParmJObj.GetInt("AccountUserType"),
};
query.Group_Id = base.UserInfo.Group_Id;
var list = employeeModule.GetEmployeePageListModule(pageModel.PageIndex, pageModel.PageSize, out long rowsCount, query);
......@@ -1721,7 +1722,8 @@ namespace Edu.WebApi.Controllers.User
Account = base.ParmJObj.GetStringValue("Account"),
Password = base.ParmJObj.GetStringValue("Password"),
UserRole = (UserRoleEnum)base.ParmJObj.GetInt("UserRole"),
IsTenCccUser = base.ParmJObj.GetInt("IsTenCccUser", 0)
IsTenCccUser = base.ParmJObj.GetInt("IsTenCccUser", 0),
AccountUserType=base.ParmJObj.GetInt("AccountUserType"),
};
if (!string.IsNullOrEmpty(extModel.Password.Trim()))
{
......@@ -1801,7 +1803,11 @@ namespace Edu.WebApi.Controllers.User
//获取通讯录token
TXLToken = GetEmployeeToken(base.UserInfo.Group_Id, configmodel);
if (string.IsNullOrEmpty(TXLToken)) { return ApiResult.Failed("企业微信token请求失败"); }
if (string.IsNullOrEmpty(TXLToken))
{
Common.Plugin.LogHelper.WriteInfo("企业微信token请求失败::" + Common.Plugin.JsonHelper.Serialize(extModel));
//return ApiResult.Failed("企业微信token请求失败");
}
}
}
}
......@@ -1809,11 +1815,16 @@ namespace Edu.WebApi.Controllers.User
{
//新增用户情况
var configmodel = departmentModule.GetWeChatConfigModel(base.UserInfo.Group_Id);
if (configmodel != null && configmodel.Enable == 1 && configmodel.DeptEmpEnable == 1)
//HK 2023-06-14 新增甲鹤员工才同步到企业微信
if (configmodel != null && configmodel.Enable == 1 && configmodel.DeptEmpEnable == 1 && extModel.AccountUserType==1)
{
//获取通讯录token
TXLToken = GetEmployeeToken(base.UserInfo.Group_Id, configmodel);
if (string.IsNullOrEmpty(TXLToken)) { return ApiResult.Failed("企业微信token请求失败"); }
if (string.IsNullOrEmpty(TXLToken))
{
Common.Plugin.LogHelper.WriteInfo("企业微信token请求失败::" + Common.Plugin.JsonHelper.Serialize(extModel));
//return ApiResult.Failed("企业微信token请求失败");
}
}
}
#endregion
......@@ -1826,7 +1837,7 @@ namespace Edu.WebApi.Controllers.User
var cccResult = await new TenCloudCCCHelper().SetUserToCCCUser(extModel);
if (!cccResult.result)
{
return ApiResult.Failed($"同步电话坐席失败，{cccResult.message}");
// return ApiResult.Failed($"同步电话坐席失败，{cccResult.message}");
}
}
else if (oldModel.IsTenCccUser == 1 && extModel.IsTenCccUser == 0)
......@@ -1834,7 +1845,7 @@ namespace Edu.WebApi.Controllers.User
var cccResult = await new TenCloudCCCHelper().DelUserToCCCUser(extModel);
if (!cccResult.result)
{
return ApiResult.Failed($"电话客服功能关闭失败，请联系管理员");
//return ApiResult.Failed($"电话客服功能关闭失败，请联系管理员");
}
}
}
......@@ -2049,6 +2060,7 @@ namespace Edu.WebApi.Controllers.User
UserRole = extModel?.UserRole ?? 0,
UserRoleName = extModel?.UserRole.ToName() ?? "",
IsTenCccUser = extModel?.IsTenCccUser ?? 0,
AccountUserType = extModel?.AccountUserType ?? 1,
};
return ApiResult.Success(data: obj);
}
......
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