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

增加稽查字段

Uat_Study
{872297557@qq.com} 2022-12-29 09:24:47 +08:00
parent 1ad7308108
commit 9a5b5636e9
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -151,7 +151,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string Code { get; set; } = string.Empty; public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
public bool IsConfig { get; set; }
public Guid? ModuleTypeId { get; set; } public Guid? ModuleTypeId { get; set; }
public Guid? OptTypeId { get; set; } public Guid? OptTypeId { get; set; }
public Guid? ChildrenTypeId { get; set; } public Guid? ChildrenTypeId { get; set; }
@ -164,7 +163,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string EnumList { get; set; } = string.Empty; public string EnumList { get; set; } = string.Empty;
public string DictionaryKey { get; set; } = string.Empty;
public string EnumType { get; set; } = string.Empty; public string EnumType { get; set; } = string.Empty;
@ -228,11 +226,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string ChildDataValue { get; set; } public string ChildDataValue { get; set; }
/// <summary>
/// 是否为特殊类型
/// </summary>
public bool? IsSpecialType { get; set; }
/// <summary> /// <summary>
@ -284,8 +277,22 @@ namespace IRaCIS.Core.Application.ViewModel
/// <summary>
/// 是否为特殊类型
/// </summary>
public bool? IsSpecialType { get; set; }
public bool IsConfig { get; set; }
public string DictionaryKey { get; set; } = string.Empty;
//byzhouahng //byzhouahng
public bool IsTableFiled { get; set; } = false;
public string TableFiledName { get; set; } = String.Empty;
public string TableConfigJsonStr { get; set; } = String.Empty; public string TableConfigJsonStr { get; set; } = String.Empty;
public string UrlConfigJsonStr { get; set; } = String.Empty; public string UrlConfigJsonStr { get; set; } = String.Empty;

7
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
View File

@ -995,6 +995,8 @@ namespace IRaCIS.Core.Application.Service
TableConfigJsonStr= lst.Select(x => x.TableConfigJsonStr).FirstOrDefault(), TableConfigJsonStr= lst.Select(x => x.TableConfigJsonStr).FirstOrDefault(),
UrlConfigJsonStr=lst.Select(x => x.UrlConfigJsonStr).FirstOrDefault(), UrlConfigJsonStr=lst.Select(x => x.UrlConfigJsonStr).FirstOrDefault(),
IsShowByTrialConfig = lst.Select(x => x.IsShowByTrialConfig).FirstOrDefault(), IsShowByTrialConfig = lst.Select(x => x.IsShowByTrialConfig).FirstOrDefault(),
IsTableFiled= lst.Select(x => x.IsTableFiled).FirstOrDefault(),
TableFiledName = lst.Select(x => x.TableFiledName).FirstOrDefault(),
TrialConfigRelyFieldName = lst.Select(x => x.TrialConfigRelyFieldName).FirstOrDefault(), TrialConfigRelyFieldName = lst.Select(x => x.TrialConfigRelyFieldName).FirstOrDefault(),
Code = lst.Max(x => x.Code), Code = lst.Max(x => x.Code),
ConfigType = lst.Select(x => x.ConfigType).FirstOrDefault(), ConfigType = lst.Select(x => x.ConfigType).FirstOrDefault(),
@ -1145,6 +1147,11 @@ namespace IRaCIS.Core.Application.Service
DictionaryCode = data.DictionaryCode, DictionaryCode = data.DictionaryCode,
DictionaryType = data.DictionaryType, DictionaryType = data.DictionaryType,
InterfaceName = data.InterfaceName, InterfaceName = data.InterfaceName,
IsTableFiled=data.IsTableFiled,
TableFiledName=data.TableFiledName,
UrlConfigJsonStr=data.UrlConfigJsonStr,
TableConfigJsonStr=data.TableConfigJsonStr,
}; };
query = query query = query

11
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -139,20 +139,23 @@ namespace IRaCIS.Core.Domain.Models
public string UrlConfigJsonStr { get; set; } = String.Empty; public string UrlConfigJsonStr { get; set; } = String.Empty;
//仅仅在业务数据的时候显示 供选择
public bool IsTableFiled { get; set; } = false;
public string TableFiledName { get; set; } = String.Empty;
#region 废弃 #region 废弃
//未知是否有用 //未知是否有用
public bool IsConfig { get; set; } public bool IsConfig { get; set; }
/// <summary>
/// 是否为特殊类型
/// </summary>
public bool IsSpecialType { get; set; }
public string DictionaryKey { get; set; } public string DictionaryKey { get; set; }
public bool IsShowByTrialConfig { get; set; } public bool IsShowByTrialConfig { get; set; }
public string TrialConfigRelyFieldName { get; set; } public string TrialConfigRelyFieldName { get; set; }
/// <summary>
/// 是否为特殊类型
/// </summary>
public bool IsSpecialType { get; set; }
#endregion #endregion
} }

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

@ -2051,9 +2051,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#endregion #endregion
} }
/// <summary> /// <summary>
@ -2106,14 +2103,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
//if (inspection.ParentId == null)
//{
// //inspection.ParentId = (await _dbContext.DataInspection.AsQueryable().Where(x => x.TrialId == inspection.TrialId && x.SubjectVisitId == inspection.SubjectVisitId && x.SubjectId == inspection.SubjectId && x.SiteId == inspection.SiteId && x.GeneralId == inspection.GeneralId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
// inspection.ParentId = (await _dbContext.DataInspection.AsQueryable().Where(x => x.GeneralId == inspection.GeneralId && x.ObjectRelationParentId == inspection.ObjectRelationParentId).OrderByDescending(x => x.CreateTime).FirstOrDefaultAsync())?.Id;
//}
inspection.CreateUserName = _userInfo.UserName; inspection.CreateUserName = _userInfo.UserName;
inspection.CreateUserRealName = _userInfo.RealName; inspection.CreateUserRealName = _userInfo.RealName;
inspection.RoleName = _userInfo.UserTypeShortName; inspection.RoleName = _userInfo.UserTypeShortName;