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:
何美荣 2026-04-03 17:14:23 +08:00
parent 5b165e3a92
commit b49ce874a5
4 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12311,7 +12311,7 @@ namespace APT.BaseData.Services.DomainServices
major.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION; major.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
} }
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.消息, "SK091"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");
} }
UnifiedCommit(() => UnifiedCommit(() =>
{ {

16
APT.MicroApi/APT.PP.WebApi/Controllers/Api/FOController.cs
View File

@ -2204,27 +2204,27 @@ namespace APT.PP.WebApi.Controllers.Api.PP
{ {
dt = DateTime.Parse(filter.Parameter1); dt = DateTime.Parse(filter.Parameter1);
} }
var dtThree = dt.AddMonths(-3);//前三个月 var dtThree = dt.AddMonths(3);//前三个月
//找安全总监 //找安全总监
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("安全总监"));
//找营业期限或者采矿许可证有效期或者安全生产许可证有效期到期前3个月的数据 //找营业期限或者采矿许可证有效期或者安全生产许可证有效期到期前3个月的数据
var infos = this.GetEntities<T_FO_ENTERPRISE_INFORMATION_REGISTRATION>(t =>(t.WORK_DATE!=null&& t.WORK_DATE < dtThree) || (t.ALLOW_DATE != null && t.ALLOW_DATE < dtThree) || (t.SAFE_ALLOW_DATE != null && t.SAFE_ALLOW_DATE < dtThree), new BaseFilter(filter.OrgId), "Nav_Users"); var infos = this.GetEntities<T_FO_ENTERPRISE_INFORMATION_REGISTRATION>(t =>(t.WORK_END_DATE!=null&& t.WORK_END_DATE < dtThree) || (t.ALLOW_END_DATE != null && t.ALLOW_END_DATE < dtThree) || (t.SAFE_ALLOW_END_DATE != null && t.SAFE_ALLOW_END_DATE < dtThree), new BaseFilter(filter.OrgId));
if (user != null && infos != null && infos.Any() && dt.Hour == 8)//每小时跑批，只在8点触发 if (user != null && infos != null && infos.Any() && dt.Hour == 8)//每小时跑批，只在8点触发
{ {
foreach (var item in infos) foreach (var item in infos)
{ {
var msg = item.COMPANY_NAME+item.IDENTIFY_CODE+"，"; var msg = item.COMPANY_NAME+item.IDENTIFY_CODE+"，";
if (item.WORK_DATE != null && item.WORK_DATE < dtThree) if (item.WORK_END_DATE != null && item.WORK_END_DATE < dtThree)
{ {
msg = msg + "营业期限还有三个月到期，请及时处理；"; msg = msg + "营业期限还有不到三个月到期，请及时处理；";
} }
if (item.ALLOW_DATE != null && item.ALLOW_DATE < dtThree) if (item.ALLOW_END_DATE != null && item.ALLOW_END_DATE < dtThree)
{ {
msg = msg + "采矿许可证还有三个月到期，请及时处理；"; msg = msg + "采矿许可证还有不到三个月到期，请及时处理；";
} }
if (item.SAFE_ALLOW_DATE != null && item.SAFE_ALLOW_DATE < dtThree) if (item.SAFE_ALLOW_END_DATE != null && item.SAFE_ALLOW_END_DATE < dtThree)
{ {
msg = msg + "安全生产许可证还有三个月到期，请及时处理。"; msg = msg + "安全生产许可证还有不到三个月到期，请及时处理。";
} }
var notice = NotificationTaskService.InsertUserNoticeTaskModel(msg, item.ID, item.ORG_ID, user.ID, user.NAME, DateTime.Now, var notice = NotificationTaskService.InsertUserNoticeTaskModel(msg, item.ID, item.ORG_ID, user.ID, user.NAME, DateTime.Now,
DateTime.Now.AddDays(2), (int)FMNoticeTypeEnum.今日提醒, "PF135"); DateTime.Now.AddDays(2), (int)FMNoticeTypeEnum.今日提醒, "PF135");

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

@ -59,27 +59,27 @@ namespace APT.SK.WebApi.Controllers
throw new Exception("不合格验收意见必须填写"); throw new Exception("不合格验收意见必须填写");
} }
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected)
{ //{
var taskId = entity.TaskID; // var taskId = entity.TaskID;
if (taskId == Guid.Empty) // if (taskId == Guid.Empty)
{ // {
var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId // var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId
&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK022"); //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK022");
if (taskTemp != null) // if (taskTemp != null)
{ // {
taskTemp.NOTICE_STATUS = 1; // taskTemp.NOTICE_STATUS = 1;
taskTemp.SOURCE_FORMCODE = "SK022_SHOWPRINT"; // taskTemp.SOURCE_FORMCODE = "SK022_SHOWPRINT";
finishNotice = taskTemp; // finishNotice = taskTemp;
} // }
} // }
if (taskId != Guid.Empty) // if (taskId != Guid.Empty)
{ // {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK022_SHOWPRINT"); // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK022_SHOWPRINT");
} // }
UpdateEntity(finishNotice); // UpdateEntity(finishNotice);
throw new Exception("你已提交,请勿重复提交!"); // throw new Exception("你已提交,请勿重复提交!");
} //}
if (string.IsNullOrEmpty(entity.CODE)) if (string.IsNullOrEmpty(entity.CODE))
entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); entity.CODE = "YHZG" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(entity.ID); var record = this.GetEntity<T_SK_HIDDEN_DANGER_RECTIFY_RECORD>(entity.ID);
@ -309,7 +309,7 @@ namespace APT.SK.WebApi.Controllers
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK006_SHOWPRINT"; task.SOURCE_FORMCODE = "SK022_SHOWPRINT";
} }
UnifiedCommit(() => UnifiedCommit(() =>
{ {

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

@ -53,27 +53,27 @@ namespace APT.SK.WebApi.Controllers.Api
throw new Exception("复查结论必须填写!"); throw new Exception("复查结论必须填写!");
} }
T_FM_NOTIFICATION_TASK finishNotice = null; T_FM_NOTIFICATION_TASK finishNotice = null;
if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected) //if (entity.STATUS != PFStandardStatus.Draft && entity.STATUS != PFStandardStatus.Rejected)
{ //{
var taskId = entity.TaskID; // var taskId = entity.TaskID;
if (taskId == Guid.Empty) // if (taskId == Guid.Empty)
{ // {
var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId // var taskTemp = GetEntity<T_FM_NOTIFICATION_TASK>(i => i.SOURCE_DATA_ID == entity.ID && i.USER_ID == userId
&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK091"); //&& i.NOTICE_STATUS == FMNoticeStatusEnum.未处理.GetInt() && i.SOURCE_FORMCODE == "SK091");
if (taskTemp != null) // if (taskTemp != null)
{ // {
taskTemp.NOTICE_STATUS = 1; // taskTemp.NOTICE_STATUS = 1;
taskTemp.SOURCE_FORMCODE = "SK091_SHOWPRINT"; // taskTemp.SOURCE_FORMCODE = "SK091_SHOWPRINT";
finishNotice = taskTemp; // finishNotice = taskTemp;
} // }
} // }
if (taskId != Guid.Empty) // if (taskId != Guid.Empty)
{ // {
finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK091_SHOWPRINT"); // finishNotice = NotificationTaskService.FOGetTaskFinishModel(taskId, entity.ID, "SK091_SHOWPRINT");
} // }
UpdateEntity(finishNotice); // UpdateEntity(finishNotice);
throw new Exception("你已提交,请勿重复提交!"); // throw new Exception("你已提交,请勿重复提交!");
} //}
if (string.IsNullOrEmpty(entity.CODE)) if (string.IsNullOrEmpty(entity.CODE))
entity.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); entity.CODE = "YHXH" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
@ -124,7 +124,7 @@ namespace APT.SK.WebApi.Controllers.Api
sysFilter.OrgId = entity.ORG_ID; sysFilter.OrgId = entity.ORG_ID;
var codes = CodeRuleService.NewGenSerial(sysFilter); var codes = CodeRuleService.NewGenSerial(sysFilter);
var serialCode = codes.Split(new char[] { ',' }); var serialCode = codes.Split(new char[] { ',' });
MFlowPermitService.InsertApprove(serialCode[0], "SK091", "", entity.ID, "SK091_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "SK080", "", entity.ID, "SK080_SHOWPRINT", entity.TaskID, true, () =>
{ {
if (entity != null) if (entity != null)
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);
@ -132,7 +132,7 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(userList); BantchSaveEntityNoCommit(userList);
if (fileList != null && fileList.Any()) if (fileList != null && fileList.Any())
BantchSaveEntityNoCommit(fileList); BantchSaveEntityNoCommit(fileList);
}, null, null, null, null, null, "SK091_SHOWPRINT", null); }, null, null, null, null, null, "SK080_SHOWPRINT", null);
return true; return true;
} }
else else
@ -171,7 +171,7 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.TaskID != Guid.Empty) if (entity.TaskID != Guid.Empty)
{ {
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID); task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
task.SOURCE_FORMCODE = "SK091_SHOWPRINT"; task.SOURCE_FORMCODE = "SK080_SHOWPRINT";
} }
} }
this.UnifiedCommit(() => this.UnifiedCommit(() =>
@ -252,7 +252,7 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
//发消息 //发消息
notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表审批被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now, notice = NotificationTaskService.InsertUserNoticeTaskModel("重大事故隐患治理销号表审批被驳回", entity.ID, entity.ORG_ID, (Guid)entity.APPLY_USER_ID, entity.Nav_ApplyUser?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK091"); DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK080");
} }
UnifiedCommit(() => UnifiedCommit(() =>
{ {