XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改
continuous-integration/drone/push Build is passing Details

Test_IRC_Net8
he 2025-04-27 13:05:31 +08:00
parent 64c275a91c
commit 1560a0278e
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
IRaCIS.Core.Infra.EFCore/AuthUser/IUserInfo.cs
View File

@ -46,7 +46,7 @@
/// <summary> /// <summary>
/// 稽查额外字符串 /// 稽查额外字符串
/// </summary> /// </summary>
string? AuditIdentification { get; set; } string AuditIdentification { get; set; }
bool IsNotNeedInspection { get; set; } bool IsNotNeedInspection { get; set; }

5
IRaCIS.Core.Infra.EFCore/AuthUser/UserInfo.cs
View File

@ -318,6 +318,11 @@ namespace IRaCIS.Core.Domain.Share
/// 是否不需要记录稽查 /// 是否不需要记录稽查
/// </summary> /// </summary>
public bool IsNotNeedInspection { get; set; } = false; public bool IsNotNeedInspection { get; set; } = false;
/// <summary>
/// 稽查额外字符串
/// </summary>
public string AuditIdentification { get; set; } = string.Empty;
} }
public static class ClaimAttributes public static class ClaimAttributes

12
IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
View File

@ -3228,7 +3228,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
u.ShowOrder u.ShowOrder
} }
).OrderBy(t => t.ShowOrder).ToList() ).OrderBy(t => t.ShowOrder).ToList()
}); },_userInfo.AuditIdentification);
////添加/修改病灶接口 只会对单个病灶进行操作 ////添加/修改病灶接口 只会对单个病灶进行操作
@ -3671,7 +3671,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// <param name="expression">表达式</param> /// <param name="expression">表达式</param>
/// <param name="otherItem">其他对象</param> /// <param name="otherItem">其他对象</param>
/// <returns></returns> /// <returns></returns>
public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null) where T : Entity public async Task InsertInspection<T>(T entityObj, string type, Expression<Func<T, InspectionConvertDTO>> expression = null, object otherItem = null,string auditIdentification = "") where T : Entity
{ {
InspectionConvertDTO inspection = new InspectionConvertDTO(); InspectionConvertDTO inspection = new InspectionConvertDTO();
@ -3688,7 +3688,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id; var generalId = (inspection.GeneralId != null && inspection.GeneralId != Guid.Empty) ? inspection.GeneralId : entityObj.Id;
inspection.GeneralId = generalId; inspection.GeneralId = generalId;
inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine) + inspection.ExtraIndentification; inspection.Identification = GetInspectionRecordIdentification(entityObj, type, inspection.IsDistinctionInterface, inspection.IsSelfDefine, auditIdentification) + inspection.ExtraIndentification;
//将实体对象属性 映射到稽查实体 //将实体对象属性 映射到稽查实体
MapEntityPropertyToAuditEntity(entityObj, inspection); MapEntityPropertyToAuditEntity(entityObj, inspection);
@ -3898,7 +3898,7 @@ namespace IRaCIS.Core.Infra.EFCore.Common
/// 获取稽查记录的标识符 部分业务会进行特殊处理 /// 获取稽查记录的标识符 部分业务会进行特殊处理
/// </summary> /// </summary>
/// <returns></returns> /// <returns></returns>
public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false) public string GetInspectionRecordIdentification<T>(T entityObj, string type, bool IsDistinctionInterface = true, bool isSelfDefine = false,string auditIdentification="")
{ {
//var entityType = _dbContext.Model.FindEntityType(entityObj.GetType()); //var entityType = _dbContext.Model.FindEntityType(entityObj.GetType());
//var tableName = entityType.GetTableName(); //var tableName = entityType.GetTableName();
@ -3940,9 +3940,9 @@ namespace IRaCIS.Core.Infra.EFCore.Common
} }
if (_userInfo.AuditIdentification != null) if (auditIdentification.IsNotNullOrEmpty())
{ {
result = result + "/" + _userInfo.AuditIdentification; result = result + "/" + auditIdentification;
} }
return result; return result;