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

三级安全教育 单添加 父级ID 即使数据重复也不会多次添加 下一级三级安全教育记录单数据

Browse Source
This commit is contained in:
wyw 2026-05-11 13:40:54 +08:00
parent f29a5ed071
commit 1c78b649d0
5 changed files with 139757 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139652
APT.Data.Migrations/Migrations/20260511035652_wyw2026051101.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20260511035652_wyw2026051101.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class wyw2026051101 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "PARENT_ID",
table: "T_SE_NEW_USERS",
type: "uniqueidentifier",
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "PARENT_ID",
table: "T_SE_NEW_USERS");
}
}
}

3
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -73320,6 +73320,9 @@ namespace APT.Data.Migrations.Migrations
.IsRequired() .IsRequired()
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<Guid?>("PARENT_ID")
.HasColumnType("uniqueidentifier");
b.Property<DateTime?>("START_TIME") b.Property<DateTime?>("START_TIME")
.HasColumnType("datetime2"); .HasColumnType("datetime2");

5
APT.MS.Domain/Entities/SC/SE/101T_SE_NEW_USERS.cs
View File

@ -145,5 +145,10 @@ namespace APT.MS.Domain.Entities.SE
/// </summary> /// </summary>
[Description("培训老师")] [Description("培训老师")]
public ICollection<T_SE_NEW_USERS_TEACHER> Nav_Teachers { get; set; } public ICollection<T_SE_NEW_USERS_TEACHER> Nav_Teachers { get; set; }
/// <summary>
/// 父项ID
/// </summary>
[Description("父项ID")]
public Guid? PARENT_ID { get; set; }
} }
} }

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

@ -45,6 +45,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
List<T_SE_NEW_USER_DETAIL_FILE> detailFiles = new List<T_SE_NEW_USER_DETAIL_FILE>(); List<T_SE_NEW_USER_DETAIL_FILE> detailFiles = new List<T_SE_NEW_USER_DETAIL_FILE>();
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
var Nav_NewUserDetail = entity.Nav_NewUserDetail; var Nav_NewUserDetail = entity.Nav_NewUserDetail;
entity.Nav_NewUserDetail = null;
var Nav_Files = entity.Nav_Files; var Nav_Files = entity.Nav_Files;
entity.Nav_Files = null; entity.Nav_Files = null;
var Nav_Teachers = entity.Nav_Teachers; var Nav_Teachers = entity.Nav_Teachers;
@ -306,7 +307,14 @@ namespace APT.SC.WebApi.Controllers.Api.SE
BantchUpdateEntity_noneBase(listRoleDel); BantchUpdateEntity_noneBase(listRoleDel);
if (listUT != null && listUT.Any()) if (listUT != null && listUT.Any())
BantchUpdateEntity_noneBase(listUT); BantchUpdateEntity_noneBase(listUT);
//if (entity.IS_DELETED)
//{
BantchUpdateEntity_noneBase(new List<T_SE_NEW_USERS>() { entity }); BantchUpdateEntity_noneBase(new List<T_SE_NEW_USERS>() { entity });
//}
//else
//{
// UpdateEntityNoCommit(entity);
//}
}); });
if (listUserDel != null && listUserDel.Count() > 0) if (listUserDel != null && listUserDel.Count() > 0)
@ -966,86 +974,89 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
if (sendUser != null) if (sendUser != null)
{ {
newEduCard = new T_SE_NEW_USERS(); newEduCard = GetEntity<T_SE_NEW_USERS>(e => e.PARENT_ID.HasValue && e.PARENT_ID.Value == EDU_CARD_ID);
newEduCard.ID = Guid.NewGuid(); if (newEduCard == null || newEduCard.ID == Guid.Empty)
newEduCard.ORG_ID = orgId;
newEduCard.USER_ID = sendUser.ID;
newEduCard.DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
newEduCard.CONTENT_ID = train_contents.ID;
newEduCard.TRAIN_STATUS = currSattus;
var commonDeptartmentUsers = userDetails.Where(t => t.NEXT_DEPARTMENT_ID == currDetailT.NEXT_DEPARTMENT_ID);
var commonUserIds = commonDeptartmentUsers.Select(t => t.USER_ID);
var userFilter = new BaseFilter(orgId);
userFilter.Include = new string[] { "Nav_Person" };
var listDeps = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED, null);
T_FM_DEPARTMENT modelDep = null;
foreach (var user in commonDeptartmentUsers)
{ {
T_SE_NEW_USER_DETAIL userDetail = new T_SE_NEW_USER_DETAIL(); newEduCard = new T_SE_NEW_USERS();
userDetail.ID = Guid.NewGuid(); newEduCard.ID = Guid.NewGuid();
userDetail.CODE = user.CODE; newEduCard.ORG_ID = orgId;
userDetail.EDU_CARD_ID = newEduCard.ID; newEduCard.USER_ID = sendUser.ID;
userDetail.USER_ID = user.USER_ID; newEduCard.DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
userDetail.ID_CARD_NUMBER = user.ID_CARD_NUMBER; newEduCard.CONTENT_ID = train_contents.ID;
userDetail.ORG_ID = newEduCard.ORG_ID; newEduCard.TRAIN_STATUS = currSattus;
userDetail.IN_TIME = user.CREATE_TIME; var commonDeptartmentUsers = userDetails.Where(t => t.NEXT_DEPARTMENT_ID == currDetailT.NEXT_DEPARTMENT_ID);
userDetail.USER_POST_ID = user.USER_POST_ID; var commonUserIds = commonDeptartmentUsers.Select(t => t.USER_ID);
userDetail.USER_DEPARTMENT_ID = user.USER_DEPARTMENT_ID; var userFilter = new BaseFilter(orgId);
//userDetail.EXAMINATION_RESULTS = SEExaminationResultsEnum.合格;//260228 不能直接上来就合格 userFilter.Include = new string[] { "Nav_Person" };
#region NEXT_DEPARTMENT_ID var listDeps = GetEntities<T_FM_DEPARTMENT>(e => e.ENABLE_STATUS == 0 && !e.IS_DELETED, null);
T_FM_DEPARTMENT modelDep = null;
if (user.USER_DEPARTMENT_ID.HasValue && currSattus != SEThreeLevelSafeTrainType.班组级) foreach (var user in commonDeptartmentUsers)
{ {
//userDetail.NEXT_DEPARTMENT_ID= T_SE_NEW_USER_DETAIL userDetail = new T_SE_NEW_USER_DETAIL();
modelDep = listDeps.FirstOrDefault(e => e.ID == user.USER_DEPARTMENT_ID.Value); userDetail.ID = Guid.NewGuid();
if (modelDep.DEPARTMENT_TYPE == 5) userDetail.CODE = user.CODE;
userDetail.EDU_CARD_ID = newEduCard.ID;
userDetail.USER_ID = user.USER_ID;
userDetail.ID_CARD_NUMBER = user.ID_CARD_NUMBER;
userDetail.ORG_ID = newEduCard.ORG_ID;
userDetail.IN_TIME = user.CREATE_TIME;
userDetail.USER_POST_ID = user.USER_POST_ID;
userDetail.USER_DEPARTMENT_ID = user.USER_DEPARTMENT_ID;
//userDetail.EXAMINATION_RESULTS = SEExaminationResultsEnum.合格;//260228 不能直接上来就合格
#region NEXT_DEPARTMENT_ID
if (user.USER_DEPARTMENT_ID.HasValue && currSattus != SEThreeLevelSafeTrainType.班组级)
{ {
//公司领导 //userDetail.NEXT_DEPARTMENT_ID=
} modelDep = listDeps.FirstOrDefault(e => e.ID == user.USER_DEPARTMENT_ID.Value);
else if (modelDep.DEPARTMENT_TYPE == 10) if (modelDep.DEPARTMENT_TYPE == 5)
{
//部门人员
if (modelDep.DEPARTMENT_STATUS == 1)//FMDepartmentStatus 职能部门 = 0, 生产部门 = 1, 安全部门 = 2,
{ {
userDetail.NEXT_DEPARTMENT_ID = modelDep.ID; //公司领导
} }
else else if (modelDep.DEPARTMENT_TYPE == 10)
{ {
modelDep = listDeps.FirstOrDefault(e => e.DEPARTMENT_STATUS == 2); //部门人员
if (modelDep != null) if (modelDep.DEPARTMENT_STATUS == 1)//FMDepartmentStatus 职能部门 = 0, 生产部门 = 1, 安全部门 = 2,
{ {
userDetail.NEXT_DEPARTMENT_ID = modelDep.ID; userDetail.NEXT_DEPARTMENT_ID = modelDep.ID;
} }
else
{
modelDep = listDeps.FirstOrDefault(e => e.DEPARTMENT_STATUS == 2);
if (modelDep != null)
{
userDetail.NEXT_DEPARTMENT_ID = modelDep.ID;
}
}
} }
} else if (modelDep.DEPARTMENT_TYPE == 15)
else if (modelDep.DEPARTMENT_TYPE == 15)
{
userDetail.NEXT_DEPARTMENT_ID = modelDep.PARENT_ID;//给组织对应上级组织
}
else if (modelDep.DEPARTMENT_TYPE == 20)
{
//班主 对应组织 的父级的父级
if (modelDep.PARENT_ID.HasValue)
{ {
modelDep = listDeps.FirstOrDefault(e => e.ID == modelDep.PARENT_ID.Value); userDetail.NEXT_DEPARTMENT_ID = modelDep.PARENT_ID;//给组织对应上级组织
} }
if (modelDep != null) else if (modelDep.DEPARTMENT_TYPE == 20)
{ {
userDetail.NEXT_DEPARTMENT_ID = modelDep.PARENT_ID; //班主 对应组织 的父级的父级
if (modelDep.PARENT_ID.HasValue)
{
modelDep = listDeps.FirstOrDefault(e => e.ID == modelDep.PARENT_ID.Value);
}
if (modelDep != null)
{
userDetail.NEXT_DEPARTMENT_ID = modelDep.PARENT_ID;
}
} }
} }
#endregion
userDetailList.Add(userDetail);
} }
var endTime = DateTime.Now.AddDays(10);
#endregion var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59);
sendNotice = NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "-三级安全培训-" + newEduCard.TRAIN_STATUS.GetDescription(), newEduCard.ID, orgId, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062");
userDetailList.Add(userDetail);
} }
var endTime = DateTime.Now.AddDays(10);
var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59);
sendNotice = NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "-三级安全培训-" + newEduCard.TRAIN_STATUS.GetDescription(), newEduCard.ID, orgId, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE062");
} }
var isAllDone = userDetails.Count(t => t.STATUS == 0); var isAllDone = userDetails.Count(t => t.STATUS == 0);
if (isAllDone == 0) if (isAllDone == 0)