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:
wyw 2026-04-08 16:04:27 +08:00
commit 2c43cc8a88
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,6 +53,7 @@ using System.Reflection;
using System.Security.Cryptography; using System.Security.Cryptography;
using static Google.Protobuf.WireFormat; using static Google.Protobuf.WireFormat;
using static IdentityModel.OidcConstants; using static IdentityModel.OidcConstants;
using static NPOI.HSSF.UserModel.HeaderFooter;
namespace APT.BaseData.Services.DomainServices namespace APT.BaseData.Services.DomainServices
{ {
@ -12298,6 +12299,8 @@ namespace APT.BaseData.Services.DomainServices
var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全总监")); var user = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全总监"));
T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null; T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE major = null;
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
var majorUserIds = new List<Guid>();
var majorFileIds = new List<Guid>();
if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null) if (entity.HIDDEN_LEVEL == SKHiddenLevel.Major && user != null)
{ {
//先查下销号表是否已经触发过 //先查下销号表是否已经触发过
@ -12306,6 +12309,19 @@ namespace APT.BaseData.Services.DomainServices
{ {
//直接触发原来那张销号表 //直接触发原来那张销号表
major.STATUS = PFStandardStatus.Draft; major.STATUS = PFStandardStatus.Draft;
major.HIDDEN_DANGER_RECTIFY_RECORD_ID = entity.ID;
major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
major.APPLY_USER_ID = user.ID;
major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
major.HIDDEN_REASON = null;
major.CHARGE_USER_ID = null;
major.REVIEW_DESCRIPTION = null;
major.REVIEW_RESULT = null;
major.REPORT_DATE = null;
major.MONITOR_DEPART_ID = null;
major.MONITOR_OPINION = null;
majorUserIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
majorFileIds = this.GetEntities<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(t => t.MAJOR_ACCIDENT_HAZARD_MANAGE_ID == major.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
} }
else else
{ {
@ -12318,6 +12334,7 @@ namespace APT.BaseData.Services.DomainServices
major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID; major.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); major.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION; major.HIDDEN_DESCRIPTION = entity.Nav_Question?.DESCREPTION;
major.NOTICE_CODE = entity.NOTICE_CODE;
} }
notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now, notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表"+ DateTime.Now.ToShortDateString().Replace("/", ""), major.ID, major.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");
@ -12334,6 +12351,10 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(listTaskNext); BantchSaveEntityNoCommit(listTaskNext);
if (entity != null) if (entity != null)
this.UpdateEntityNoCommit(entity); this.UpdateEntityNoCommit(entity);
if (majorUserIds != null && majorUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_USER>(majorUserIds);
if (majorFileIds != null && majorFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE>(majorFileIds);
if (major != null) if (major != null)
this.UpdateEntityNoCommit(major); this.UpdateEntityNoCommit(major);
if (notice != null) if (notice != null)

18
APT.MicroApi/APT.SK.WebApi/Controllers/Api/MajorAccidentHazardManageController.cs
View File

@ -98,7 +98,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
if (files != null && files.Any()) if (files != null && files.Any())
{ {
foreach (var file in files) foreach (var file in files.Where(t => !t.IS_DELETED))
{ {
T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE item = new T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE(); T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE item = new T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE_FILE();
item.ORG_ID = entity.ORG_ID; item.ORG_ID = entity.ORG_ID;
@ -110,6 +110,7 @@ namespace APT.SK.WebApi.Controllers.Api
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>(); List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
T_FM_NOTIFICATION_TASK task = null; T_FM_NOTIFICATION_TASK task = null;
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null; T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = null;
var recordFileIds = new List<Guid>();
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
//同意销号触发审批 //同意销号触发审批
@ -148,6 +149,13 @@ namespace APT.SK.WebApi.Controllers.Api
if (record != null) if (record != null)
{ {
record.STATUS = PFStandardStatus.Rejected; record.STATUS = PFStandardStatus.Rejected;
record.ACCEPT_DATE = null;
record.ACCEPT_OPINION = null;
record.ACCEPT_USER_ID = null;
record.RECTIFICATION_DESCRIPTION = null;
record.RECTIFICATION_MONEY = null;
record.COMPLETE_DATE = null;
recordFileIds = this.GetEntities<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(t => t.HIDDEN_DANGER_RECTIFY_RECORD_ID == record.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
if (record.IMPLEMENT_USER_ID != null) if (record.IMPLEMENT_USER_ID != null)
{ {
var user = this.GetEntity<T_FM_USER>(t => t.ID == record.IMPLEMENT_USER_ID); var user = this.GetEntity<T_FM_USER>(t => t.ID == record.IMPLEMENT_USER_ID);
@ -194,6 +202,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(fileList); BantchSaveEntityNoCommit(fileList);
if (notices != null && notices.Any()) if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices); BantchSaveEntityNoCommit(notices);
if (record != null)
UpdateEntityNoCommit(record);
if (recordFileIds != null && recordFileIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_PHOTOB>(recordFileIds);
}); });
return true; return true;
}); });
@ -212,7 +224,9 @@ namespace APT.SK.WebApi.Controllers.Api
if (string.IsNullOrEmpty(id)) if (string.IsNullOrEmpty(id))
this.ThrowError("060010"); this.ThrowError("060010");
filter.IgnoreDataRule = true; filter.IgnoreDataRule = true;
var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ChargeUser", "Nav_ApplyDepartment","Nav_RectifyRecord","Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"}); var result = this.GetEntity<T_SK_MAJOR_ACCIDENT_HAZARD_MANAGE>(id, new string[] { "Nav_ApplyUser", "Nav_ChargeUser", "Nav_ApplyDepartment", "Nav_RectifyRecord.Nav_ProductionUnit",
"Nav_RectifyRecord.Nav_RiskArea", "Nav_RectifyRecord.Nav_RectifyPhotoas.Nav_ImgFile","Nav_RectifyRecord.Nav_RectifyPhotobs.Nav_ImgFile",
"Nav_Users.Nav_User","Nav_MonitorDepart", "Nav_Files.Nav_ImgFile"});
if (result != null && result.STATUS == PFStandardStatus.Rejected) if (result != null && result.STATUS == PFStandardStatus.Rejected)
{ {
result.CONTEXT = ApproveCallBackService.RejectContent(result.ID); result.CONTEXT = ApproveCallBackService.RejectContent(result.ID);