From 06c131d7aa08898d2b855f7d77964f1aaca24ab6 Mon Sep 17 00:00:00 2001 From: wjn Date: Sat, 11 May 2024 13:43:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../APT.HM.WebApi/Controllers/Api/RiskTaskController.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs index 6497c6a..fa9d910 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskTaskController.cs @@ -237,10 +237,6 @@ namespace APT.HM.WebApi.Controllers.Api List facilities = new List(); List sendNotices = null; T_FM_NOTIFICATION_TASK finishNotice = null; - if (riskTask.TaskID != null) - { - finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID); - } if (todoCount == 0 && currDetail.Any()) { entity = GetEntity(riskTask.ID, new string[] { "Nav_Identifyings", "Nav_Files", "Nav_Detail.Nav_Area", "Nav_Detail.Nav_User" }); @@ -395,6 +391,10 @@ namespace APT.HM.WebApi.Controllers.Api } sendNotices = NotificationTaskService.InsertUserNoticeTaskModels(noticeTitles, noticeDataIds, orgId, noticeUserIds, noticeUserNames, DateTime.Now, DateTime.Parse(DateTime.Now.AddDays(7).ToShortDateString() + " 23:59:59"), 0, "HM064"); } + if (riskTask.TaskID != null) + { + finishNotice = NotificationTaskService.FOGetTaskFinishModel(riskTask.TaskID, riskTask.ID); + } } UnifiedCommit(() => { From 1dece03875260f95bd4668b0877458b402cca39d Mon Sep 17 00:00:00 2001 From: wjn Date: Sat, 11 May 2024 17:27:05 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/Api/RiskRecordController.cs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs index f1e3d99..3967665 100644 --- a/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs +++ b/APT.MicroApi/APT.HM.WebApi/Controllers/Api/RiskRecordController.cs @@ -195,20 +195,22 @@ namespace APT.HM.WebApi.Controllers.Api var result = WitEntity(null, filter); var ID = new Guid(filter.FilterGroup.Rules.ToList()[0].Value.ToString()); var filter1 = new BaseFilter(filter.GetOrgId()); - filter1.Include = new string[] { "Nav_EvaluateRiskRecordEquipment.Nav_Equipment", "Nav_EvaluateRiskRecordWorkduty.Nav_Workduty", "Nav_Area", "Nav_Identifying", "Nav_Type", "Nav_OperationStep", "Nav_LiableUser", "Nav_DepartmentLiable", "Nav_PostLiable" }; + filter1.SelectField = new string[] { "Nav_EvaluateRiskRecordEquipment.Nav_Equipment.NAME", "Nav_EvaluateRiskRecordWorkduty.Nav_Workduty.NAME", "Nav_Area.NAME", "Nav_Identifying.NAME", "Nav_Type.NAME", "Nav_OperationStep.NAME", "Nav_LiableUser.NAME", "Nav_DepartmentLiable.NAME", "Nav_PostLiable.NAME","RISK_NAME", "RISK_PLACE" }; var detailData = GetEntities(t => t.RECORD_ID == ID, filter1); var record = GetEntity(ID); var filter2 = new BaseFilter(filter.GetOrgId()); - filter2.Include = new string[] { "Nav_Area","Nav_Users.Nav_User" }; + filter2.SelectField = new string[] { "Nav_Area.NAME","Nav_Users.Nav_User.NAME", "Nav_Users.DEAL_STATUS", "Nav_Users.Nav_User.Nav_UserSignFiles.Nav_ImgFile.Nav_File" }; var riskUsers = GetEntities(t => t.TASK_ID == record.TASK_ID && t.RECORD_USER_ID == record.NOTE_TAKER_ID,filter2); List Nav_Users = new List(); result.Data.Nav_Users= Nav_Users; foreach ( var riskUser in riskUsers) { var userNames = ""; - foreach(var user in riskUser.Nav_Users) + List signfile = new List(); + foreach (var user in riskUser.Nav_Users) { userNames += user.Nav_User.NAME+" "; + signfile= user.Nav_User.Nav_UserSignFiles; } T_HM_RISK_AREA area = new T_HM_RISK_AREA(); T_FM_USER fmuser = new T_FM_USER(); @@ -219,6 +221,8 @@ namespace APT.HM.WebApi.Controllers.Api }; item.Nav_Area.NAME = riskUser.Nav_Area.NAME; item.Nav_User.NAME = userNames; + item.Nav_User.Nav_UserSignFiles = signfile; + item.DEAL_STATUS = FOUserShiftStatusEnum.已处理; result.Data.Nav_Users.Add(item); } result.Data.Nav_Details = detailData.ToList();