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:
何美荣 2025-12-07 21:56:11 +08:00
parent 403cfeb4a8
commit eafb92933f
3 changed files with 34 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -87,7 +87,15 @@ namespace APT.FO.WebApi.Controllers
} }
if (string.IsNullOrEmpty(entity.CODE)) if (string.IsNullOrEmpty(entity.CODE))
{ {
entity.CODE = "DHZY" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); var num = "001";
var record = this.GetEntities<T_FO_FIRE_JOB>(t => t.CREATE_TIME.Value.Date == DateTime.Now.Date,new BaseFilter(entity.ORG_ID)).OrderByDescending(m => m.CREATE_TIME).FirstOrDefault();
if (record != null)
{
var codeTake = record.CODE.Reverse().Take(3).ToString();
var temp = int.Parse(codeTake) + 1;
num = temp.ToString().PadLeft(3, '0');
}
entity.CODE = "DHZY" + DateTime.Now.Date.ToString("yyyyMMdd") + num;
} }
if (entity.FIRE_USER_ID == null) if (entity.FIRE_USER_ID == null)
{ {
@ -379,11 +387,10 @@ namespace APT.FO.WebApi.Controllers
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[] { ',' });
var department = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departmentId); var param = "工作日";
var param = Enum.GetName(typeof(FMDepartmentType), department.DEPARTMENT_TYPE); if (entity.IS_HOLIDAY == true)
if (department.DEPARTMENT_STATUS == 2)
{ {
param = "公司"; param = "节假日";
} }
MFlowPermitService.InsertApprove(serialCode[0], "FO043", param, entity.ID, "FO043_SHOWPRINT", entity.TaskID, true, () => MFlowPermitService.InsertApprove(serialCode[0], "FO043", param, entity.ID, "FO043_SHOWPRINT", entity.TaskID, true, () =>
{ {

2
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -980,7 +980,7 @@ namespace APT.PP.WebApi.Controllers.Api
} }
} }
} }
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划(" + DateTime.Now.ToShortDateString().Replace("/", "") + ")", plan.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "SK031"); var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全风险辨识与评估计划" + DateTime.Now.Month.PadLeft(2,'0')+ DateTime.Now.Day.PadLeft(2, '0'), plan.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, dtEnd, (int)FMNoticeTypeEnum.消息, "SK031");
notices.Add(noticeTask); notices.Add(noticeTask);
} }
} }

24
APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs
View File

@ -58,6 +58,7 @@ namespace APT.SK.WebApi.Controllers.Api
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
List<Guid> deleteMeasureIds = new List<Guid>(); List<Guid> deleteMeasureIds = new List<Guid>();
List<Guid> deleteDetailIds = new List<Guid>(); List<Guid> deleteDetailIds = new List<Guid>();
List<T_SK_RISK_IDENTIFY_DETAIL> detailList = new List<T_SK_RISK_IDENTIFY_DETAIL>();
List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>(); List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE> measureList = new List<T_SK_RISK_IDENTIFY_DETAIL_MEASURE>();
//更新标识字段 //更新标识字段
var record = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.ID, "Nav_Details"); var record = this.GetEntity<T_SK_RISK_IDENTIFY>(t => t.ID == entity.ID, "Nav_Details");
@ -91,23 +92,34 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
foreach (var item in details) foreach (var item in details)
{ {
item.ORG_ID = entity.ORG_ID; T_SK_RISK_IDENTIFY_DETAIL de = new T_SK_RISK_IDENTIFY_DETAIL();
item.RISK_IDENTIFY_ID = entity.ID; de.ORG_ID = entity.ORG_ID;
de.RISK_IDENTIFY_ID = entity.ID;
de.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
de.AREA_ID = item.AREA_ID;
de.RISK_NAME = item.RISK_NAME;
de.RISK_DESCRIPTION = item.RISK_DESCRIPTION;
de.TYPE_ID = item.TYPE_ID;
de.ENABLE_STATUS = item.ENABLE_STATUS;
de.MARK = item.MARK;
de.EMERGENCY = item.EMERGENCY;
de.ENTERPRISE_LIBRARY_ID = item.ENTERPRISE_LIBRARY_ID;
if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any()) if (item.Nav_DetailMeasures != null && item.Nav_DetailMeasures.Any())
{ {
foreach (var mm in item.Nav_DetailMeasures) foreach (var mm in item.Nav_DetailMeasures)
{ {
T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE(); T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE();
item2.ORG_ID = entity.ORG_ID; item2.ORG_ID = entity.ORG_ID;
item2.RISK_IDENTIFY_DETAIL_ID = item.ID; item2.RISK_IDENTIFY_DETAIL_ID = de.ID;
item2.MEASURE = mm.MEASURE; item2.MEASURE = mm.MEASURE;
item2.NUM = mm.NUM; item2.NUM = mm.NUM;
measureList.Add(item2); measureList.Add(item2);
var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine; var temp = (item2.NUM == null || item2.NUM == 0) ? "1" : item2.NUM + "、" + item2.MEASURE + Environment.NewLine;
item.MEASURE = item.MEASURE + temp; de.MEASURE = de.MEASURE + temp;
} }
} }
item.Nav_DetailMeasures = null; item.Nav_DetailMeasures = null;
detailList.Add(de);
} }
} }
if (files != null && files.Any()) if (files != null && files.Any())
@ -172,8 +184,8 @@ namespace APT.SK.WebApi.Controllers.Api
this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL>(deleteDetailIds); this.BantchDeleteEntityNoCommit<T_SK_RISK_IDENTIFY_DETAIL>(deleteDetailIds);
if (entity != null) if (entity != null)
UpdateEntityNoCommit(entity); UpdateEntityNoCommit(entity);
if (details != null && details.Any()) if (detailList != null && detailList.Any())
BantchSaveEntityNoCommit(details); BantchSaveEntityNoCommit(detailList);
if (files != null && files.Any()) if (files != null && files.Any())
BantchSaveEntityNoCommit(files); BantchSaveEntityNoCommit(files);
if (requires != null && requires.Any()) if (requires != null && requires.Any())