From 394862b960581f21f8f130b449c7fbb0257fc6b3 Mon Sep 17 00:00:00 2001
From: wyw <571921741@qq.com>
Date: Tue, 16 Apr 2024 16:39:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BB=B6=E6=9C=9F=E7=94=B3=E8=AF=B7=20?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E6=95=B4=E6=94=B9=E9=A1=B9=20=20filiter=20?=
 =?UTF-8?q?=E4=B8=8D=E4=BC=A0=E5=85=A5=20=E4=B8=8D=E7=84=B6=E6=9C=89depart?=
 =?UTF-8?q?ment=20=E9=99=90=E5=88=B6=E4=BC=9A=E5=8A=A01=3D0=20=E6=95=B4?=
 =?UTF-8?q?=E6=94=B9=E9=80=9A=E7=9F=A5=20=E5=8A=A0=E9=99=84=E4=BB=B6?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Migrations/MigrationContextModelSnapshot.cs           | 3 +++
 APT.MS.Data/Mapping/T4/T4Map.cs                           | 1 +
 .../Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs         | 7 +++++++
 .../Controllers/Api/BSRiskSubmitDelayApplyController.cs   | 2 +-
 .../Controllers/Api/BSRiskSubmitNoticePersonController.cs | 8 ++++++++
 5 files changed, 20 insertions(+), 1 deletion(-)

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<DateTime?>("CREATE_TIME")
                         .HasColumnType("datetime2");
 
+                    b.Property<Guid?>("DATAID")
+                        .HasColumnType("uniqueidentifier");
+
                     b.Property<Guid?>("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
         /// </summary>
         [DataFieldIngore]
         public string OPERATETYPE_SHOW { get; set; }
+
+        /// <summary>
+        /// 导航：隐患上报附件表
+        /// </summary>
+        [Description("导航：隐患上报附件表")]
+        [DataFieldIngore]
+        public virtual IEnumerable<T_BS_RISK_SUBMIT_FILE> 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<T_BS_RISK_SUBMIT_CONTENT>(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<T_BS_RISK_SUBMIT_CONTENT>(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<T_BS_RISK_SUBMIT_DELAY_APPLY_DETAIL>(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<T_BS_RISK_SUBMIT_FILE>(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;
             });