From eafb92933fc4df68fbe9f1d3130dd86d92cf6d24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BD=95=E7=BE=8E=E8=8D=A3?= <10755671+mei-rong-he@user.noreply.gitee.com> Date: Sun, 7 Dec 2025 21:56:11 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BE=A8=E8=AF=86=E8=A1=A8=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/FireJobController.cs | 17 +++++++---- .../Controllers/Api/SKController.cs | 2 +- .../Controllers/Api/RiskIdentifyController.cs | 30 +++++++++++++------ 3 files changed, 34 insertions(+), 15 deletions(-) diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs index 54a01b8..b6c7ede 100644 --- a/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs +++ b/APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs @@ -87,7 +87,15 @@ namespace APT.FO.WebApi.Controllers } 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 => 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) { @@ -379,11 +387,10 @@ namespace APT.FO.WebApi.Controllers sysFilter.OrgId = entity.ORG_ID; var codes = CodeRuleService.NewGenSerial(sysFilter); var serialCode = codes.Split(new char[] { ',' }); - var department = this.GetEntity(t => t.ID == departmentId); - var param = Enum.GetName(typeof(FMDepartmentType), department.DEPARTMENT_TYPE); - if (department.DEPARTMENT_STATUS == 2) + var param = "工作日"; + if (entity.IS_HOLIDAY == true) { - param = "公司"; + param = "节假日"; } MFlowPermitService.InsertApprove(serialCode[0], "FO043", param, entity.ID, "FO043_SHOWPRINT", entity.TaskID, true, () => { diff --git a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs index b568695..daeda3c 100644 --- a/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs +++ b/APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs @@ -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); } } diff --git a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs index e8b60f4..300cf37 100644 --- a/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs +++ b/APT.MicroApi/APT.SK.WebApi/Controllers/Api/RiskIdentifyController.cs @@ -57,7 +57,8 @@ namespace APT.SK.WebApi.Controllers.Api entity.ApplyDepartmentName = this.GetEntity(t => t.ID == departId).NAME; entity.ApplyPostName = this.GetEntity(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME; List deleteMeasureIds = new List(); - List deleteDetailIds = new List(); + List deleteDetailIds = new List(); + List detailList = new List(); List measureList = new List(); //更新标识字段 var record = this.GetEntity(t => t.ID == entity.ID, "Nav_Details"); @@ -90,24 +91,35 @@ namespace APT.SK.WebApi.Controllers.Api if (details != null && details.Any()) { foreach (var item in details) - { - item.ORG_ID = entity.ORG_ID; - item.RISK_IDENTIFY_ID = entity.ID; + { + T_SK_RISK_IDENTIFY_DETAIL de = new T_SK_RISK_IDENTIFY_DETAIL(); + 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()) { foreach (var mm in item.Nav_DetailMeasures) { T_SK_RISK_IDENTIFY_DETAIL_MEASURE item2 = new T_SK_RISK_IDENTIFY_DETAIL_MEASURE(); 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.NUM = mm.NUM; measureList.Add(item2); 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()) @@ -172,8 +184,8 @@ namespace APT.SK.WebApi.Controllers.Api this.BantchDeleteEntityNoCommit(deleteDetailIds); if (entity != null) UpdateEntityNoCommit(entity); - if (details != null && details.Any()) - BantchSaveEntityNoCommit(details); + if (detailList != null && detailList.Any()) + BantchSaveEntityNoCommit(detailList); if (files != null && files.Any()) BantchSaveEntityNoCommit(files); if (requires != null && requires.Any())