wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wyw:5b9bc66c20c562145a81651f27579a005e8db69a
Branches Tags
wyw:master
..
compare: wyw:d7f34dd05d1003d5a724dae9357c30067f86a893
Branches Tags
wyw:master

No commits in common. "5b9bc66c20c562145a81651f27579a005e8db69a" and "d7f34dd05d1003d5a724dae9357c30067f86a893" have entirely different histories.
5b9bc66c20 ... d7f34dd05d

3 changed files with 8 additions and 15 deletions
Show Stats Expand all files Collapse all files

4
APT.BaseData.Domain/IServices/FM/IFMUserService.cs
View File

@ -105,9 +105,9 @@ namespace APT.BaseData.Domain.IServices.FM
List<T_FM_USER> GetDepPostUser(ref string Msg, Guid DEPARTMENT_ID, Guid POST_ID, bool IsOnly);
/// <summary>
/// 找安环部人员 默认 安环安全员
/// 找安环部人员
/// </summary>
/// <param name="UserType">1 NUM 从小到大 找第一个 10 NUM 找老大</param>
/// <param name="UserType">1 NUM 从小到大 找第一个 2 NUM 找老大</param>
/// <param name="ORG_ID">1</param>
/// <returns></returns>
T_FM_USER GetSafeApproveUser(Guid ORG_ID, int UserType = 1);

2
APT.BaseData.Services/Services/FM/FMUserService.cs
View File

@ -997,7 +997,7 @@ namespace APT.BaseData.Services.Services.FM
#region 找安环部人员
/// <summary>
/// 找安环部人员 默认 安环安全员
/// 找安环部人员
/// </summary>
/// <param name="UserType">1 NUM 从小到大 找第一个 10 NUM 找老大</param>
/// <param name="ORG_ID">1</param>

17
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/6SETrainRecordController.cs
View File

@ -25,11 +25,9 @@ namespace APT.SC.WebApi.Controllers.Api.SE
public class SETrainRecordController : AuthorizeApiController<T_SE_TRAIN_RECORD>
{
IFMNotificationTaskService NotificationTaskService { get; set; }
IFMUserService UserService { get; set; }
public SETrainRecordController(IFMNotificationTaskService notificationTaskService, IFMUserService userService)
public SETrainRecordController(IFMNotificationTaskService notificationTaskService)
{
NotificationTaskService = notificationTaskService;
UserService = userService;
}
/// <summary>
/// 保存
@ -519,17 +517,12 @@ namespace APT.SC.WebApi.Controllers.Api.SE
if (userCount == 0 && !isReSend)
{
record.STATUS = SETrainRecordStatus.审阅中;
T_FM_USER chargeUser = UserService.GetSafeApproveUser(record.ORG_ID.Value, 10);
//var chargeUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部负责人");
//if (chargeUser == null)
//{
// chargeUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部安全员");
//}
if (chargeUser != null)
var chargeUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部负责人");
if (chargeUser == null)
{
sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + record.Nav_Notify.NAME, Guid.Parse(filter.Keyword), filter.GetOrgId(), chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT"));
chargeUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole.NAME == "安环部安全员");
}
sendNotices.Add(NotificationTaskService.InsertUserNoticeTaskModel("培训记录完成待审阅-" + record.Nav_Notify.NAME, Guid.Parse(filter.Keyword), filter.GetOrgId(), chargeUser.ID, chargeUser.NAME, DateTime.Now, DateTime.Now.AddDays(2), 1, "SE017_SHOWPRINT"));
}
UnifiedCommit(() =>
{