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

1

Browse Source
This commit is contained in:
何美荣 2025-10-26 01:31:46 +08:00
parent d872e7eabd
commit 634a3d0e8b
3 changed files with 340 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

233
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -11337,27 +11337,36 @@ namespace APT.BaseData.Services.DomainServices
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_REPORT>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID);
entity.STATUS = PFStandardStatus.Archived;
var reportDetails = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_ReportDetailFiles", "Nav_ReportDetailBasics");
var reportDetails = this.GetEntities<T_SK_HIDDEN_DANGER_REPORT_DETAIL>(t => t.HIDDEN_DANGER_REPORT_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_ReportDetailFiles", "Nav_ReportDetailBasics", "Nav_ReportDetailReasons");
//List<T_SK_HIDDEN_DANGER_REPORT_DETAIL> reportDetails = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
List<T_FM_NOTIFICATION_TASK> sendNotices = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD> records = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA> photoList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_BASIC> basicList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_BASIC>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE> notices = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE> nfileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL> noticeDetails = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC> noticeBasicList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_BASIC>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE> noticeFileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>();
List<T_SK_DOUBLE_PREVENT_MECHANISM> prevents = new List<T_SK_DOUBLE_PREVENT_MECHANISM>();
List<T_SK_DOUBLE_PREVENT_MECHANISM_FILE> fileList = new List<T_SK_DOUBLE_PREVENT_MECHANISM_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> noticeReasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>();
if (entity != null && reportDetails != null && reportDetails.Any())
{
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_User");
var random = new Random();
foreach (var detail in reportDetails)
{
var departId = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID).DEPARTMENT_ID;
var departUserId = departs.FirstOrDefault(t => t.ID == departId)?.USER_ID;
if (detail.RECITIFY_USER_ID == entity.APPLY_USER_ID)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == detail.RECITIFY_USER_ID))
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
var user = users.FirstOrDefault(t => t.ID == entity.APPLY_USER_ID);
detail.ISCHECK = true;
detail.CHECKTIME = DateTime.Now;
@ -11377,6 +11386,8 @@ namespace APT.BaseData.Services.DomainServices
record.HIDDEN_LEVEL = detail.HIDDEN_LEVEL;
record.RECITIFY_TIME = detail.RECITIFY_TIME;
record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
record.IMPLEMENT_USER_ID = detail.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser.ID;
record.CHECK_PERSON = entity.CHECK_PERSON;
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
@ -11405,6 +11416,17 @@ namespace APT.BaseData.Services.DomainServices
basicList.Add(file);
}
}
if (detail.Nav_ReportDetailReasons != null && detail.Nav_ReportDetailReasons.Any())
{
foreach (var item in detail.Nav_ReportDetailReasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
reasonList.Add(file);
}
}
var endtime = DateTime.Now.AddDays(3);
if (record.RECITIFY_TIME != null && record.RECITIFY_TIME != DateTime.MinValue)
{
@ -11417,6 +11439,84 @@ namespace APT.BaseData.Services.DomainServices
detail.Nav_ReportDetailBasics = null;
//reportDetails.Add(detail);
}
else if (departUserId != null && detail.RECITIFY_USER_ID != departUserId)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == detail.RECITIFY_USER_ID))
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
var user = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID);
detail.ISCHECK = true;
detail.CHECKTIME = DateTime.Now;
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.ORG_ID = detail.ORG_ID;
record.APPLY_USER_ID = entity.APPLY_USER_ID;
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
record.HIDDEN_DANGER_REPORT_ID = entity.ID;
record.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
record.HIDDEN_DANGER_CONFIRM_ID = null;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + random.Next(1, 999);
record.MineType = entity.MineType;
record.RISK_AREA_ID = detail.RISK_AREA_ID;
record.HIDDEN_PLACE = detail.HIDDEN_PLACE;
record.HIDDEN_DESCRIPTION = detail.HIDDEN_DESCRIPTION;
record.HIDDEN_LEVEL = detail.HIDDEN_LEVEL;
record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
record.RECITIFY_TIME = detail.RECITIFY_TIME;
record.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
record.IMPLEMENT_USER_ID = detail.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser.ID;
record.CHECK_PERSON = entity.CHECK_PERSON;
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_TIME = entity.CHECK_TIME;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
foreach (var item in detail.Nav_ReportDetailFiles)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA();
file.ORG_ID = item.ORG_ID;
file.IMG_FILE_ID = item.IMG_FILE_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
photoList.Add(file);
}
}
if (detail.Nav_ReportDetailBasics != null && detail.Nav_ReportDetailBasics.Any())
{
foreach (var item in detail.Nav_ReportDetailBasics)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_BASIC file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_BASIC();
file.ORG_ID = item.ORG_ID;
file.LAW_ID = item.LAW_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
basicList.Add(file);
}
}
if (detail.Nav_ReportDetailReasons != null && detail.Nav_ReportDetailReasons.Any())
{
foreach (var item in detail.Nav_ReportDetailReasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
reasonList.Add(file);
}
}
var endtime = DateTime.Now.AddDays(3);
if (record.RECITIFY_TIME != null && record.RECITIFY_TIME != DateTime.MinValue)
{
endtime = DateTime.Parse(record.RECITIFY_TIME.Value.ToShortDateString() + " 23:59:59");
}
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录表", record.ID, record.ORG_ID, user.ID, user.NAME, DateTime.Now,
endtime, (int)FMNoticeTypeEnum.消息, "SK022");
sendNotices.Add(sendNotice);
detail.Nav_ReportDetailFiles = null;
detail.Nav_ReportDetailBasics = null;
}
else
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
@ -11482,7 +11582,17 @@ namespace APT.BaseData.Services.DomainServices
noticeBasicList.Add(file);
}
}
var departId = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID).DEPARTMENT_ID;
if (detail.Nav_ReportDetailReasons != null && detail.Nav_ReportDetailReasons.Any())
{
foreach (var item in detail.Nav_ReportDetailReasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = noticeDetail.ID;
noticeReasonList.Add(file);
}
}
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
@ -11497,7 +11607,7 @@ namespace APT.BaseData.Services.DomainServices
var checkUser = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID);
if (checkUser != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患上报表" + DateTime.Now.Month.PadLeft(2,'0')+ DateTime.Now.Day.PadLeft(2, '0') + "-确认", entity.ID, entity.ORG_ID, checkUser.ID, checkUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK014_SHOWPRINT");
sendNotices.Add(sendNotice);
}
@ -11573,16 +11683,16 @@ namespace APT.BaseData.Services.DomainServices
this.BantchSaveEntityNoCommit(photoList);
if (basicList != null && basicList.Any())
this.BantchSaveEntityNoCommit(basicList);
if (reasonList != null && reasonList.Any())
this.BantchSaveEntityNoCommit(reasonList);
if (noticeDetails != null && noticeDetails.Any())
this.BantchSaveEntityNoCommit(noticeDetails);
if (noticeFileList != null && noticeFileList.Any())
this.BantchSaveEntityNoCommit(noticeFileList);
if (noticeBasicList != null && noticeBasicList.Any())
this.BantchSaveEntityNoCommit(noticeBasicList);
if (prevents != null && prevents.Any())
this.BantchSaveEntityNoCommit(prevents);
if (fileList != null && fileList.Any())
this.BantchSaveEntityNoCommit(fileList);
if (noticeReasonList != null && noticeReasonList.Any())
this.BantchSaveEntityNoCommit(noticeReasonList);
});
}
return true;
@ -11618,7 +11728,7 @@ namespace APT.BaseData.Services.DomainServices
}
else
{
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report");
var entity = this.GetEntity<T_SK_HIDDEN_DANGER_CONFIRM>(modelApp != null ? modelApp.DATA_ID : entityInt.DATA_ID, "Nav_Report", "Nav_Reasons");
entity.STATUS = PFStandardStatus.Archived;
var photos = this.GetEntities<T_SK_HIDDEN_DANGER_CONFIRM_PHOTO>(t => t.HIDDEN_DANGER_CONFIRM_ID == entity.ID, new BaseFilter(entity.ORG_ID));
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
@ -11630,6 +11740,8 @@ namespace APT.BaseData.Services.DomainServices
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = null;
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL> noticeDetails = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE> noticeFileList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> noticeReasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON>();
List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> reasonList = new List<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON>();
//if (entity != null && entity.IS_STORE == SKIsStoreEnum.Yes && entity.RECITIFY_USER_ID != null)
//{
// //触发双重预防机制
@ -11673,8 +11785,15 @@ namespace APT.BaseData.Services.DomainServices
//}
if (entity != null && entity.RECITIFY_USER_ID != null)
{
var departId = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID).DEPARTMENT_ID;
var departUserId = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId)?.USER_ID;
if (entity.RECITIFY_USER_ID == entity.APPLY_USER_ID)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == entity.RECITIFY_USER_ID))
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
var user = users.FirstOrDefault(t => t.ID == entity.APPLY_USER_ID);
record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
@ -11696,6 +11815,8 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_TIME = entity.Nav_Report?.CREATE_TIME;
record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser.ID;
record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
if (photos != null && photos.Any())
{
@ -11708,6 +11829,17 @@ namespace APT.BaseData.Services.DomainServices
photoList.Add(file);
}
}
if (entity.Nav_Reasons != null && entity.Nav_Reasons.Any())
{
foreach (var item in entity.Nav_Reasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
reasonList.Add(file);
}
}
var endtime = DateTime.Now.AddDays(3);
if (record.RECITIFY_TIME != null && record.RECITIFY_TIME != DateTime.MinValue)
{
@ -11717,6 +11849,71 @@ namespace APT.BaseData.Services.DomainServices
endtime, (int)FMNoticeTypeEnum.消息, "SK022");
sendNotices.Add(sendNotice);
}
else if (departUserId != null && entity.RECITIFY_USER_ID != departUserId)
{
var user = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID);
if (user != null)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (acceptUser == null || (acceptUser != null && acceptUser.ID == entity.RECITIFY_USER_ID))
{
acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = entity.APPLY_USER_ID;
record.ORG_ID = entity.ORG_ID;
record.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID;
record.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
record.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
record.MineType = entity.MineType;
record.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
record.RISK_AREA_ID = entity.RISK_AREA_ID;
record.HIDDEN_PLACE = entity.HIDDEN_PLACE;
record.CHECK_CONTENTS_ID = entity.CHECK_CONTENTS_ID;
record.CHECK_QUESTION_ID = entity.CHECK_QUESTION_ID;
record.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
record.HIDDEN_LEVEL = entity.HIDDEN_LEVEL;
record.RECITIFY_TIME = entity.RECITIFY_TIME;
record.RECITIFY_USER_ID = entity.RECITIFY_USER_ID;
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_TIME = entity.Nav_Report?.CREATE_TIME;
record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser.ID;
record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
if (photos != null && photos.Any())
{
foreach (var item in photos)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOA();
file.ORG_ID = item.ORG_ID;
file.IMG_FILE_ID = item.IMG_FILE_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
photoList.Add(file);
}
}
if (entity.Nav_Reasons != null && entity.Nav_Reasons.Any())
{
foreach (var item in entity.Nav_Reasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_RECORD_ID = record.ID;
reasonList.Add(file);
}
}
var endtime = DateTime.Now.AddDays(3);
if (record.RECITIFY_TIME != null && record.RECITIFY_TIME != DateTime.MinValue)
{
endtime = DateTime.Parse(record.RECITIFY_TIME.Value.ToShortDateString() + " 23:59:59");
}
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改记录表", record.ID, record.ORG_ID, user.ID, user.NAME, DateTime.Now,
endtime, (int)FMNoticeTypeEnum.消息, "SK022");
sendNotices.Add(sendNotice);
}
}
else
{
notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
@ -11759,7 +11956,17 @@ namespace APT.BaseData.Services.DomainServices
noticeFileList.Add(file);
}
}
var departId = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID).DEPARTMENT_ID;
if (entity.Nav_Reasons != null && entity.Nav_Reasons.Any())
{
foreach (var item in entity.Nav_Reasons)
{
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON file = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON();
file.ORG_ID = item.ORG_ID;
file.REASON_ID = item.REASON_ID;
file.HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_ID = noticeDetail.ID;
noticeReasonList.Add(file);
}
}
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
@ -11795,12 +12002,16 @@ namespace APT.BaseData.Services.DomainServices
this.UpdateEntityNoCommit(record);
if (photoList != null && photoList.Any())
this.BantchSaveEntityNoCommit(photoList);
if (reasonList != null && reasonList.Any())
this.BantchSaveEntityNoCommit(reasonList);
if (notice != null)
this.UpdateEntityNoCommit(notice);
if (noticeDetails != null && noticeDetails.Any())
this.BantchSaveEntityNoCommit(noticeDetails);
if (noticeFileList != null && noticeFileList.Any())
this.BantchSaveEntityNoCommit(noticeFileList);
if (noticeReasonList != null && noticeReasonList.Any())
this.BantchSaveEntityNoCommit(noticeReasonList);
});
}
return true;

3
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -127,6 +127,9 @@ namespace APT.SK.WebApi.Controllers
if (entity.ACCEPT_USER_ID != null)
{
entity.STATUS = PFStandardStatus.Sign;
entity.ACCEPT_OPINION = null;
entity.ACCEPT_RESULTE = SKAcceptResultEnum.Yes;
entity.ACCEPT_DATE = DateTime.Now;
var departName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.APPLY_DEPARTMENT_ID && t.ENABLE_STATUS == 0)?.NAME;
var UserNames = new List<string>();
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && t.ID == entity.ACCEPT_USER_ID);

93
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -470,9 +470,11 @@ namespace APT.SK.WebApi.Controllers.Api
List<Guid> deleteFileIds = new List<Guid>();
List<Guid> deleteBasicIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>();
List<Guid> deleteReasonIds = new List<Guid>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER> userList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC> basicList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE> fileList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> reasonList = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>();
if (details != null && details.Any())
{
var evaluationIsExist = this.GetEntity<T_SK_SECURITY_INSPECTION_RECORD>(t => t.ID == entity.ID, new string[] { "Nav_CheckRecordDetails", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles", "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics" });
@ -496,6 +498,11 @@ namespace APT.SK.WebApi.Controllers.Api
var tempIds = t.Nav_CheckRecordDetailBasics.Select(m => m.ID).ToList();
deleteBasicIds.AddRange(tempIds);
}
if (t.Nav_CheckRecordDetailReasons != null && t.Nav_CheckRecordDetailReasons.Any())
{
var tempIds = t.Nav_CheckRecordDetailReasons.Select(m => m.ID).ToList();
deleteReasonIds.AddRange(tempIds);
}
deleteDetailIds.Add(t.ID);
});
}
@ -563,6 +570,16 @@ namespace APT.SK.WebApi.Controllers.Api
basicList.Add(item2);
}
}
if (item.Nav_CheckRecordDetailReasons != null && item.Nav_CheckRecordDetailReasons.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailReasons)
{
item2.ORG_ID = entity.ORG_ID;
item2.SECURITY_INSPECTION_RECORD_DETAIL_ID = item.ID;
item2.Nav_Reason = null;
reasonList.Add(item2);
}
}
item.ORG_ID = entity.ORG_ID;
item.SECURITY_INSPECTION_RECORD_ID = entity.ID;
//item.Nav_Question = null;
@ -609,11 +626,13 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL> summaryDetails = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER> summaryDetailUsers = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC> summaryDetailBasics = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> summaryDetailReasons = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> summaryDetailFiles = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
T_SK_HIDDEN_DANGER_REPORT report = null;
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL> reportDetails = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE> reportDetailFiles = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_FILE>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC> reportDetailBasics = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_BASIC>();
List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> reportDetailReasons = new List<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{
var checkTypeIds = this.GetEntities<T_SK_CHECK_TYPE>(t => t.NAME.Contains("岗位排查"), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
@ -669,6 +688,7 @@ namespace APT.SK.WebApi.Controllers.Api
var tempDetails = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>();
var tempDetailUsers = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
var tempDetailBasics = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC>();
var tempDetailReasons = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON>();
var tempDetailFiles = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
var recordFileTemps = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_FILE>(t => recordTempIds.Contains(t.SECURITY_INSPECTION_RECORD_ID), new BaseFilter(entity.ORG_ID)).ToList();
recordFileTemps.AddRange(files);
@ -682,7 +702,7 @@ namespace APT.SK.WebApi.Controllers.Api
summaryFiles.Add(summaryFile);
}
summaryFiles = summaryFiles.Distinct(t => t.IMG_FILE_ID).ToList();
var recordDetailTemps = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => recordTempIds.Contains(t.SECURITY_INSPECTION_RECORD_ID), new BaseFilter(entity.ORG_ID), "Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetailFiles").ToList();
var recordDetailTemps = this.GetEntities<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>(t => recordTempIds.Contains(t.SECURITY_INSPECTION_RECORD_ID), new BaseFilter(entity.ORG_ID), "Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetailBasics", "Nav_CheckRecordDetailFiles", "Nav_CheckRecordDetailReasons").ToList();
recordDetailTemps.AddRange(details);
foreach (var itemDetail in recordDetailTemps)
{
@ -738,6 +758,18 @@ namespace APT.SK.WebApi.Controllers.Api
tempDetailFiles.Add(summaryFile);
}
}
if (itemDetail.Nav_CheckRecordDetailReasons != null && itemDetail.Nav_CheckRecordDetailReasons.Any())
{
foreach (var itemFile in itemDetail.Nav_CheckRecordDetailReasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON summaryFile = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
summaryFile.ORG_ID = entity.ORG_ID;
summaryFile.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryFile.Nav_Reason = null;
summaryFile.REASON_ID = itemFile.REASON_ID;
tempDetailReasons.Add(summaryFile);
}
}
}
var groupDetails = tempDetails.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).ToList();
var groupDetailNos = tempDetails.Where(t=>t.CHECK_RESULT != SKCheckResultEnum.Yes).GroupBy(t => new { t.RISK_AREA_ID, t.CHECK_CONTENTS_ID, t.CHECK_QUESTION_ID }).Select(g=>g.FirstOrDefault()).ToList();
@ -789,6 +821,19 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetailBasics.Add(summaryBasic);
}
}
var groupReasons = tempDetailReasons.Where(t => ids.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).Select(m => m.REASON_ID).Distinct().ToList();
if (groupReasons.Any())
{
foreach (var itemBasic in groupReasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON summaryBasic = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
summaryBasic.ORG_ID = entity.ORG_ID;
summaryBasic.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryBasic.Nav_Reason = null;
summaryBasic.REASON_ID = itemBasic;
summaryDetailReasons.Add(summaryBasic);
}
}
var groupFiles = tempDetailFiles.Where(t => ids.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).Select(m => m.IMG_FILE_ID).Distinct().ToList();
if (groupFiles.Any())
{
@ -875,6 +920,18 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetailFiles.Add(summaryFile);
}
}
if (itemDetail.Nav_CheckRecordDetailReasons != null && itemDetail.Nav_CheckRecordDetailReasons.Any())
{
foreach (var itemFile in itemDetail.Nav_CheckRecordDetailReasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON summaryFile = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
summaryFile.ORG_ID = entity.ORG_ID;
summaryFile.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryFile.Nav_Reason = null;
summaryFile.REASON_ID = itemFile.REASON_ID;
summaryDetailReasons.Add(summaryFile);
}
}
}
}
}
@ -949,6 +1006,18 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetailFiles.Add(summaryFile);
}
}
if (itemDetail.Nav_CheckRecordDetailReasons != null && itemDetail.Nav_CheckRecordDetailReasons.Any())
{
foreach (var itemFile in itemDetail.Nav_CheckRecordDetailReasons)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON summaryFile = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON();
summaryFile.ORG_ID = entity.ORG_ID;
summaryFile.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryFile.Nav_Reason = null;
summaryFile.REASON_ID = itemFile.REASON_ID;
summaryDetailReasons.Add(summaryFile);
}
}
}
}
}
@ -967,6 +1036,7 @@ namespace APT.SK.WebApi.Controllers.Api
}
var detailIds = summaryDetails.Select(m => m.ID).ToList();
summaryDetailBasics = summaryDetailBasics.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
summaryDetailReasons = summaryDetailReasons.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
summaryDetailFiles = summaryDetailFiles.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
summaryDetailUsers = summaryDetailUsers.Where(t => detailIds.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).ToList();
}
@ -1047,6 +1117,18 @@ namespace APT.SK.WebApi.Controllers.Api
reportDetailBasics.Add(file);
}
}
if (item.Nav_CheckRecordDetailReasons != null && item.Nav_CheckRecordDetailReasons.Any())
{
foreach (var item2 in item.Nav_CheckRecordDetailReasons)
{
T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON file = new T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON();
file.ORG_ID = item2.ORG_ID;
file.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
file.REASON_ID = item2.REASON_ID;
file.Nav_Reason = null;
reportDetailReasons.Add(file);
}
}
}
//发消息
var notice = NotificationTaskService.InsertUserNoticeTaskModel("岗位排查表-隐患上报", report.ID, report.ORG_ID, (Guid)monitor.USER_ID, monitor.Nav_User?.NAME, DateTime.Now,
@ -1065,6 +1147,7 @@ namespace APT.SK.WebApi.Controllers.Api
t.Nav_Question = null;
t.Nav_Contents = null;
t.Nav_CheckRecordDetailBasics = null;
t.Nav_CheckRecordDetailReasons = null;
//t.Nav_CheckRecordDetailFiles = null;
t.Nav_CheckRecordDetailUsers = null;
});
@ -1078,6 +1161,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER>(deleteUserIds);
if (deleteBasicIds != null && deleteBasicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_BASIC>(deleteBasicIds);
if (deleteReasonIds != null && deleteReasonIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON>(deleteReasonIds);
if (deleteFileIds != null && deleteFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_FILE>(deleteFileIds);
if (deleteDetailIds != null && deleteDetailIds.Any())
@ -1088,6 +1173,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(userList);
if (basicList != null && basicList.Any())
BantchSaveEntityNoCommit(basicList);
if (reasonList != null && reasonList.Any())
BantchSaveEntityNoCommit(reasonList);
if (fileList != null && fileList.Any())
BantchSaveEntityNoCommit(fileList);
if (files != null && files.Any())
@ -1100,6 +1187,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(summaryDetails);
if (summaryDetailUsers != null && summaryDetailUsers.Any())
BantchSaveEntityNoCommit(summaryDetailUsers);
if (summaryDetailReasons != null && summaryDetailReasons.Any())
BantchSaveEntityNoCommit(summaryDetailReasons);
if (summaryDetailBasics != null && summaryDetailBasics.Any())
BantchSaveEntityNoCommit(summaryDetailBasics);
if (summaryFiles != null && summaryFiles.Any())
@ -1114,6 +1203,8 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(reportDetailFiles);
if (reportDetailBasics != null && reportDetailBasics.Any())
BantchSaveEntityNoCommit(reportDetailBasics);
if (reportDetailReasons != null && reportDetailReasons.Any())
BantchSaveEntityNoCommit(reportDetailReasons);
});
return true;
});