From 9a5b5636e91296dc36c27856e7c680c70d6bc762 Mon Sep 17 00:00:00 2001
From: "{872297557@qq.com}" <872297557@qq.com>
Date: Thu, 29 Dec 2022 09:24:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=A8=BD=E6=9F=A5=E5=AD=97?=
=?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Common/DTO/FrontAuditConfigViewModel.cs | 21 ++++++++++++-------
.../Inspection/FrontAuditConfigService.cs | 7 +++++++
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs | 11 ++++++----
.../Common/AuditingData.cs | 11 ----------
4 files changed, 28 insertions(+), 22 deletions(-)
diff --git a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
index fbbc78b1..5b1d0735 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
@@ -151,7 +151,6 @@ namespace IRaCIS.Core.Application.ViewModel
public string Code { get; set; } = string.Empty;
public Guid? ParentId { get; set; }
public bool IsEnable { get; set; }
- public bool IsConfig { get; set; }
public Guid? ModuleTypeId { get; set; }
public Guid? OptTypeId { 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 DictionaryKey { 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 bool? IsSpecialType { get; set; }
///
@@ -284,8 +277,22 @@ namespace IRaCIS.Core.Application.ViewModel
+ ///
+ /// 是否为特殊类型
+ ///
+
+ public bool? IsSpecialType { get; set; }
+ public bool IsConfig { get; set; }
+ public string DictionaryKey { get; set; } = string.Empty;
+
+
+
//byzhouahng
+
+ public bool IsTableFiled { get; set; } = false;
+ public string TableFiledName { get; set; } = String.Empty;
+
public string TableConfigJsonStr { get; set; } = String.Empty;
public string UrlConfigJsonStr { get; set; } = String.Empty;
diff --git a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
index a3ce5ba6..8be929d6 100644
--- a/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+++ b/IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
@@ -995,6 +995,8 @@ namespace IRaCIS.Core.Application.Service
TableConfigJsonStr= lst.Select(x => x.TableConfigJsonStr).FirstOrDefault(),
UrlConfigJsonStr=lst.Select(x => x.UrlConfigJsonStr).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(),
Code = lst.Max(x => x.Code),
ConfigType = lst.Select(x => x.ConfigType).FirstOrDefault(),
@@ -1145,6 +1147,11 @@ namespace IRaCIS.Core.Application.Service
DictionaryCode = data.DictionaryCode,
DictionaryType = data.DictionaryType,
InterfaceName = data.InterfaceName,
+
+ IsTableFiled=data.IsTableFiled,
+ TableFiledName=data.TableFiledName,
+ UrlConfigJsonStr=data.UrlConfigJsonStr,
+ TableConfigJsonStr=data.TableConfigJsonStr,
};
query = query
diff --git a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
index a10b3e0c..2ad308eb 100644
--- a/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
+++ b/IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
@@ -139,20 +139,23 @@ namespace IRaCIS.Core.Domain.Models
public string UrlConfigJsonStr { get; set; } = String.Empty;
+ //仅仅在业务数据的时候显示 供选择
+ public bool IsTableFiled { get; set; } = false;
+ public string TableFiledName { get; set; } = String.Empty;
#region 废弃
//未知是否有用
public bool IsConfig { get; set; }
+ ///
+ /// 是否为特殊类型
+ ///
+ public bool IsSpecialType { get; set; }
public string DictionaryKey { get; set; }
public bool IsShowByTrialConfig { get; set; }
public string TrialConfigRelyFieldName { get; set; }
- ///
- /// 是否为特殊类型
- ///
- public bool IsSpecialType { get; set; }
#endregion
}
diff --git a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
index 05dbf7ac..9dde7c46 100644
--- a/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
+++ b/IRaCIS.Core.Infra.EFCore/Common/AuditingData.cs
@@ -2051,9 +2051,6 @@ namespace IRaCIS.Core.Infra.EFCore.Common
#endregion
-
-
-
}
///
@@ -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.CreateUserRealName = _userInfo.RealName;
inspection.RoleName = _userInfo.UserTypeShortName;