ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

延期申请 加载整改项 filiter 不传入 不然有department 限制会加1=0

Browse Source 
整改通知 加附件显示
This commit is contained in:
wyw 2024-04-16 16:39:50 +08:00
parent f49f72d1a3
commit 394862b960
5 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -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");

1
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -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

7
APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_NOTICE_PERSON.cs
View File

@ -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; }
}
}

2
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitDelayApplyController.cs
View File

@ -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);

8
APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitNoticePersonController.cs
View File

@ -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;
});