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

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
何美荣 2026-08-04 14:58:29 +08:00
commit d52d11822c
1 changed files with 91 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -60,6 +60,7 @@ namespace APT.SC.WebApi.Controllers.Api.SE
foreach (var item in Nav_Teachers) foreach (var item in Nav_Teachers)
item.Nav_User = null; item.Nav_User = null;
} }
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
var listCodeCheck = Nav_NewUserDetail.Where(e => !e.IS_DELETED && e.CODE != null && e.CODE.Length > 0).Select(e => e.CODE); var listCodeCheck = Nav_NewUserDetail.Where(e => !e.IS_DELETED && e.CODE != null && e.CODE.Length > 0).Select(e => e.CODE);
@ -207,6 +208,49 @@ namespace APT.SC.WebApi.Controllers.Api.SE
} }
finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE061_SHOWPRINT"); finishNotice = NotificationTaskService.GetTaskFinishModel(entity.TaskID, "SE061_SHOWPRINT");
} }
else
{
var allDepartment = Nav_NewUserDetail.Where(t => t.IS_DELETED == false).Select(t => t.USER_DEPARTMENT_ID);
if (allDepartment == null || allDepartment.Count() < 1)
{
//全部都删除了
entity.IS_DELETED = true;
foreach (var item in Nav_NewUserDetail)
{
item.IS_DELETED = true;
}
foreach (var item in Nav_Teachers)
{
item.IS_DELETED = true;
}
foreach (var item in Nav_Files)
{
item.IS_DELETED = true;
}
foreach (var item in detailFiles)
{
item.IS_DELETED = true;
}
}
else
{
var allUser = GetEntities<T_FM_USER>(t => allDepartment.Contains(t.DEPARTMENT_ID) && t.Nav_ApproveRole != null, new BaseFilter(entity.ORG_ID));
foreach (var item in Nav_NewUserDetail)
{
if (item.IS_DELETED)
continue;
if (item.Nav_Files != null && item.Nav_Files.Count() > 0)
{
item.Nav_Files.ForEach(nf =>
{
nf.USER_DETAIL_ID = item.ID;
});
detailFiles.AddRange(item.Nav_Files);
item.Nav_Files = null;
}
}
}
}
var deleteD = Nav_NewUserDetail.Where(e => e.IS_DELETED && e.USER_ID.HasValue); var deleteD = Nav_NewUserDetail.Where(e => e.IS_DELETED && e.USER_ID.HasValue);
List<T_FM_USER> listUserDel = null; List<T_FM_USER> listUserDel = null;
@ -382,21 +426,21 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var currUser = GetEntity<T_FM_USER>(t => t.ID == userID); var currUser = GetEntity<T_FM_USER>(t => t.ID == userID);
var currUserDeail = GetEntity<T_SE_NEW_USER_DETAIL>(t => t.ID == currID); var currUserDeail = GetEntity<T_SE_NEW_USER_DETAIL>(t => t.ID == currID);
var currPerson = GetEntity<T_FM_PERSON>(t => t.ID == currUser.PERSON_ID); var currPerson = GetEntity<T_FM_PERSON>(t => t.ID == currUser.PERSON_ID);
T_FM_DEPARTMENT departInfo = null;
T_FM_DEPARTMENT departInfo = this.GetEntity<T_FM_DEPARTMENT>(currUserDeail.USER_DEPARTMENT_ID.ToString());
if (departInfo != null && departInfo.MineType != null)
{
var enumList = this.GetEntity<T_FM_ENUMS>(t => t.CODE == "BSMineTypeEnum" && t.VALUE == departInfo.MineType);
currUser.MineType = departInfo.MineType.ToString();
T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
unit.ORG_ID = orgId;
unit.USER_ID = (Guid)userID;
unit.ENUMS_ID = enumList?.ID;
unit.Nav_Enums = null;
units.Add(unit);
}
if (!string.IsNullOrEmpty(currUserDeail.CODE))//不一样才进行 修改 比如一开始 是手机号码 配置的是工号 if (!string.IsNullOrEmpty(currUserDeail.CODE))//不一样才进行 修改 比如一开始 是手机号码 配置的是工号
{ {
departInfo = this.GetEntity<T_FM_DEPARTMENT>(currUserDeail.USER_DEPARTMENT_ID.ToString());
if (departInfo != null && departInfo.MineType != null)
{
var enumList = this.GetEntity<T_FM_ENUMS>(t => t.CODE == "BSMineTypeEnum" && t.VALUE == departInfo.MineType);
currUser.MineType = departInfo.MineType.ToString();
T_FM_USER_PRODUCTION_UNIT unit = new T_FM_USER_PRODUCTION_UNIT();
unit.ORG_ID = orgId;
unit.USER_ID = (Guid)userID;
unit.ENUMS_ID = enumList?.ID;
unit.Nav_Enums = null;
units.Add(unit);
}
if (!string.IsNullOrEmpty(currUserDeail.CODE) && currUserDeail.CODE != currUser.CODE) if (!string.IsNullOrEmpty(currUserDeail.CODE) && currUserDeail.CODE != currUser.CODE)
{ {
var userCodeCheck = GetEntity<T_FM_USER>(e => e.CODE == currUserDeail.CODE && e.ID != currUser.ID); var userCodeCheck = GetEntity<T_FM_USER>(e => e.CODE == currUserDeail.CODE && e.ID != currUser.ID);
@ -421,6 +465,17 @@ namespace APT.SC.WebApi.Controllers.Api.SE
UpdateEntity(currUser); UpdateEntity(currUser);
UpdateEntity(currPerson); UpdateEntity(currPerson);
} }
else
{
if ((currUserDeail.USER_DEPARTMENT_ID.HasValue && !currUser.DEPARTMENT_ID.HasValue) || (currUserDeail.USER_POST_ID.HasValue && !currPerson.POST_ID.HasValue))
{
currUser.DEPARTMENT_ID = currUserDeail.USER_DEPARTMENT_ID;
currPerson.DEPARTMENT_ID = currUserDeail.USER_DEPARTMENT_ID;
currPerson.POST_ID = currUserDeail.USER_POST_ID;
UpdateEntity(currUser);
UpdateEntity(currPerson);
}
}
T_SE_NEW_USERS eduCardRef = null; T_SE_NEW_USERS eduCardRef = null;
T_SE_NEW_USERS newEduCard = null; T_SE_NEW_USERS newEduCard = null;
List<T_SE_NEW_USER_DETAIL> userDetailList = null; List<T_SE_NEW_USER_DETAIL> userDetailList = null;
@ -922,17 +977,37 @@ namespace APT.SC.WebApi.Controllers.Api.SE
var basefilter = new BaseFilter(orgId); var basefilter = new BaseFilter(orgId);
var userDetails = GetEntities<T_SE_NEW_USER_DETAIL>(t => t.EDU_CARD_ID == eduCardID, basefilter); var userDetails = GetEntities<T_SE_NEW_USER_DETAIL>(t => t.EDU_CARD_ID == eduCardID, basefilter);
var currDetailT = userDetails.FirstOrDefault(t => t.ID == currID);//不能直接用 故定义中间参数 var currDetailT = userDetails.FirstOrDefault(t => t.ID == currID);//不能直接用 故定义中间参数
eduCard = GetEntity<T_SE_NEW_USERS>(eduCardID);
if (currDetailT != null) if (currDetailT != null)
{ {
if (score != null) if (score != null)
{ {
currDetailT.SCORE = score; currDetailT.SCORE = score;
currDetailT.EXAMINATION_RESULTS = SEExaminationResultsEnum.合格; if (!currDetailT.EXAMINATION_RESULTS.HasValue)
currDetailT.EXAMINATION_RESULTS = SEExaminationResultsEnum.合格;
}
switch (eduCard.TRAIN_STATUS)
{
case SEThreeLevelSafeTrainType.公司级:
currDetailT.STATUS = SEThreeLevelSafeTrainStatus.公司培训;
break;
case SEThreeLevelSafeTrainType.部门级:
currDetailT.STATUS = SEThreeLevelSafeTrainStatus.部门培训;
break;
case SEThreeLevelSafeTrainType.车间级:
case SEThreeLevelSafeTrainType.班组级:
currDetailT.STATUS = SEThreeLevelSafeTrainStatus.班组培训;
break;
default:
break;
}
if (currDetail != null && currDetailT.ID == currDetail.ID)
{
currDetail = currDetailT;
} }
currDetailT.STATUS = SEThreeLevelSafeTrainStatus.公司培训;
} }
var isFinish = userDetails.Count(t => t.NEXT_DEPARTMENT_ID == currDetailT.NEXT_DEPARTMENT_ID && t.ID != currID && t.STATUS == 0); var isFinish = userDetails.Count(t => t.NEXT_DEPARTMENT_ID == currDetailT.NEXT_DEPARTMENT_ID && t.ID != currID && t.STATUS == 0);
eduCard = GetEntity<T_SE_NEW_USERS>(eduCardID);
var currSattus = SEThreeLevelSafeTrainType.公司级; var currSattus = SEThreeLevelSafeTrainType.公司级;
if (isFinish == 0 && eduCard.TRAIN_STATUS != SEThreeLevelSafeTrainType.班组级) if (isFinish == 0 && eduCard.TRAIN_STATUS != SEThreeLevelSafeTrainType.班组级)
{ {
@ -1123,26 +1198,6 @@ namespace APT.SC.WebApi.Controllers.Api.SE
default: default:
break; break;
} }
//public enum SEThreeLevelSafeTrainStatus
//{
// 草稿 = 0,
// 公司培训 = 1,
// 部门培训 = 2,
// 班组培训 = 3,
// 员工签到 = 4,
// 审阅中 = 5,
// 归档 = 6,
//}
// <summary>培训组织部门类型</summary>
//public enum SEThreeLevelSafeTrainType
//{
// 公司级 = 0,
// 部门级 = 1,
// 车间级 = 2,
// 班组级 = 3,
//}
} }
} }
//private void CreateNextLevel(Guid ORG_ID, Guid RECORD_ID, Guid TaskID, Guid EDU_CARD_ID, string score) //private void CreateNextLevel(Guid ORG_ID, Guid RECORD_ID, Guid TaskID, Guid EDU_CARD_ID, string score)