diff --git a/APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs b/APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs index ce59125..6ace8a3 100644 --- a/APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs +++ b/APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs @@ -19456,6 +19456,9 @@ namespace APT.Data.Migrations.Migrations b.Property("CREATE_TIME") .HasColumnType("datetime2"); + b.Property("DATAID") + .HasColumnType("uniqueidentifier"); + b.Property("DEPARTMENT_ID") .HasColumnType("uniqueidentifier"); diff --git a/APT.MS.Data/Mapping/T4/T4Map.cs b/APT.MS.Data/Mapping/T4/T4Map.cs index 21ad25e..2c27a98 100644 --- a/APT.MS.Data/Mapping/T4/T4Map.cs +++ b/APT.MS.Data/Mapping/T4/T4Map.cs @@ -628,6 +628,7 @@ builder.HasOne(t => t.Nav_Approve).WithMany().HasForeignKey(t => t.APPROVE_ID).O builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict); builder.Ignore(t => t.QUESTION_LEVEL_SHOW); builder.Ignore(t => t.OPERATETYPE_SHOW); +builder.Ignore(t => t.Nav_Files); } } #endregion diff --git a/APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs b/APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs index 4dbcf01..99bc294 100644 --- a/APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs +++ b/APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs @@ -125,5 +125,12 @@ namespace APT.MS.Domain.Entities.BS /// [DataFieldIngore] public string OPERATETYPE_SHOW { get; set; } + + /// + /// 导航:隐患上报附件表 + /// + [Description("导航:隐患上报附件表")] + [DataFieldIngore] + public virtual IEnumerable Nav_Files { get; set; } } } \ No newline at end of file diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs index 660d085..94748db 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs @@ -138,7 +138,7 @@ namespace APT.BS.WebApi.Controllers.Api DateTime dtNowDate = DateTime.Now.Date; Guid LoginID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID.Value; - var info = GetEntities(e => e.RISK_SUBMIT_NOTICE_PERSON_ID == NoticePersonID && e.ACTUAL_DEAL_USER_ID.HasValue && e.ACTUAL_DEAL_USER_ID.Value == LoginID && !e.IS_DELETED && e.LastDateUser.HasValue && e.LastDateUser.Value >= dtNowDate && (e.RiskContentState == (int)RiskContentState.ActualDealCheck || e.RiskContentState == (int)RiskContentState.OKNotBack), filter, null).ToList(); + var info = GetEntities(e => e.RISK_SUBMIT_NOTICE_PERSON_ID == NoticePersonID && e.ACTUAL_DEAL_USER_ID.HasValue && e.ACTUAL_DEAL_USER_ID.Value == LoginID && !e.IS_DELETED && e.LastDateUser.HasValue && e.LastDateUser.Value >= dtNowDate && (e.RiskContentState == (int)RiskContentState.ActualDealCheck || e.RiskContentState == (int)RiskContentState.OKNotBack), null, null).ToList(); var listContID = info.Select(e => e.ID); var listDelay = GetEntities(e => listContID.Contains(e.Nav_SubmitContent.ID), null, new string[] { "Nav_SubmitContent" }).Select(e => e.Nav_SubmitContent); diff --git a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitNoticePersonController.cs b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitNoticePersonController.cs index ff50deb..440317c 100644 --- a/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitNoticePersonController.cs +++ b/APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitNoticePersonController.cs @@ -104,6 +104,14 @@ namespace APT.BS.WebApi.Controllers.Api } catch { } } + if (nitocePerson.RISK_SUBMIT_ID.HasValue) + { + var listFile = GetEntities(e => e.RISK_SUBMIT_ID == nitocePerson.RISK_SUBMIT_ID, null, "Nav_ImgFile.Nav_File"); + if (listFile != null && listFile.Any()) + { + nitocePerson.Nav_Files = listFile; + } + } return nitocePerson; });