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

三级安全教育 中途保存

Browse Source
This commit is contained in:
wyw 2025-11-20 10:01:34 +08:00
parent 1a932be031
commit 9940334f7e
3 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
APT.BaseData.Domain/Entities/FM/T_FM_DEPARTMENT.cs
View File

@ -46,6 +46,7 @@ namespace APT.BaseData.Domain.Entities.FM
/// <summary> /// <summary>
/// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20, /// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20,
/// FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
/// </summary> /// </summary>
[Description("部门层级")] [Description("部门层级")]
[EnumName("FMDepartmentType")] [EnumName("FMDepartmentType")]

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SEController.cs
View File

@ -266,7 +266,7 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
var endTime = DateTime.Now.AddDays(10); var endTime = DateTime.Now.AddDays(10);
var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59); var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59);
sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "-三级安全培训-" + eduCard.STATUS.GetDescription(), eduCard.ID, eduCard.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062")); sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(currTime.ToString("MMdd") + "-三级安全培训-" + eduCard.STATUS.GetDescription(), eduCard.ID, eduCard.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062"));
} }
T_FM_SYNC_TASK task = null; T_FM_SYNC_TASK task = null;
if (!string.IsNullOrEmpty(filter.Parameter1) && eduCard != null) if (!string.IsNullOrEmpty(filter.Parameter1) && eduCard != null)

28
APT.MicroApi/APT.SC.WebApi/Controllers/Api/SEController/SENewUsers.cs
View File

@ -65,13 +65,21 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var currUserDepId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var currUserDepId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var auditDep = GetEntity<T_FM_DEPARTMENT>(currUserDepId.ToString()); var auditDep = GetEntity<T_FM_DEPARTMENT>(currUserDepId.ToString());
var listCode = Nav_NewUserDetail.Where(e => e.CODE.Length > 0).Select(e => e.CODE); //var listCode = Nav_NewUserDetail.Where(e => e.CODE.Length > 0).Select(e => e.CODE);
var listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null); //var listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null);
var listCode = Nav_NewUserDetail.Where(e => e.CODE != null).Where(e => e.CODE.Length > 0).Select(e => e.CODE);
IEnumerable<T_FM_USER> listUserCheck = null;
if (listCode != null && listCode.Count() > 0)
{
listUserCheck = GetEntities<T_FM_USER>(e => listCode.Contains(e.CODE), null, null);
}
foreach (var item in Nav_NewUserDetail) foreach (var item in Nav_NewUserDetail)
{ {
var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID); var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID);
if (dep.DEPARTMENT_TYPE == auditDep.DEPARTMENT_TYPE) //if (dep.DEPARTMENT_TYPE == auditDep.DEPARTMENT_TYPE)//登录者的层级 等于 新用户的层级
if (dep.DEPARTMENT_TYPE <= auditDep.DEPARTMENT_TYPE)//登录者的层级 小于 新用户的层级
{ {
if (string.IsNullOrEmpty(item.CODE)) if (string.IsNullOrEmpty(item.CODE))
{ {
@ -95,16 +103,18 @@ namespace APT.SC.WebApi.Controllers.Api.SE
{ {
foreach (var item in Nav_NewUserDetail) foreach (var item in Nav_NewUserDetail)
{ {
/// 部门层级 FMDepartmentType 公司=5 部门=10, 车间=15, 班组=20,
/// FMDepartmentType 部门=0, 车间=1, 班组=2, 公司=3
var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID); var dep = alldeps.FirstOrDefault(t => t.ID == item.USER_DEPARTMENT_ID);
if (dep.DEPARTMENT_TYPE == 0) if (dep.DEPARTMENT_TYPE == 10)
{ {
item.NEXT_DEPARTMENT_ID = dep.ID; item.NEXT_DEPARTMENT_ID = dep.ID;
} }
if (dep.DEPARTMENT_TYPE == 1) if (dep.DEPARTMENT_TYPE == 15)
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.ID;
} }
else if (dep.DEPARTMENT_TYPE == 2) else if (dep.DEPARTMENT_TYPE == 20)
{ {
item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID; item.NEXT_DEPARTMENT_ID = dep.Nav_Parent.Nav_Parent.ID;
} }
@ -166,12 +176,8 @@ namespace APT.SC.WebApi.Controllers.Api.SE
BantchSaveEntityNoCommit(Nav_Files); BantchSaveEntityNoCommit(Nav_Files);
if (detailFiles.Any()) if (detailFiles.Any())
BantchSaveEntityNoCommit(detailFiles); BantchSaveEntityNoCommit(detailFiles);
}); });
return true; return true;
}); });
} }
@ -836,7 +842,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
public void GetOG001(Guid TaskID, T_FM_USER currUser, T_FM_PERSON currPerson, T_FM_DEPARTMENT departInfo, ref T_OG_SAFE_PDT_SIGNED signRecord, ref T_OG_SAFE_PDT_SIGNED_POST signPost, ref T_FM_NOTIFICATION_TASK sendNoticeRef) public void GetOG001(Guid TaskID, T_FM_USER currUser, T_FM_PERSON currPerson, T_FM_DEPARTMENT departInfo, ref T_OG_SAFE_PDT_SIGNED signRecord, ref T_OG_SAFE_PDT_SIGNED_POST signPost, ref T_FM_NOTIFICATION_TASK sendNoticeRef)
{ {
// 如果没有继续触发下一级 直接触发 安全生产责任制签订 OG001_SHOWPRINT 如果找不到对应的责任制 就给对应组织安全员（或班长） 触发今日提醒 // 如果没有继续触发下一级 直接触发 安全生产责任制签订 OG001_SHOWPRINT 如果找不到对应的责任制 就给对应组织安全员（或班长） 触发今日提醒
if (sendNoticeRef == null) if (sendNoticeRef == null && currPerson.POST_ID.HasValue)//&& currPerson.POST_ID.HasValue 三级安全教育的没填 岗位
{ {
var post = GetEntity<T_SC_DEPARTMENT_POST>(t => t.Nav_Dept.DEPARTMENT_ID == currUser.DEPARTMENT_ID && t.DEPOST_ID == currPerson.POST_ID, new string[] { "Nav_Dept.Nav_Post" }); var post = GetEntity<T_SC_DEPARTMENT_POST>(t => t.Nav_Dept.DEPARTMENT_ID == currUser.DEPARTMENT_ID && t.DEPOST_ID == currPerson.POST_ID, new string[] { "Nav_Dept.Nav_Post" });
if (post != null) if (post != null)