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

修改稽查配置

Uat_Study
hang 2022-09-09 09:28:45 +08:00
parent f7348b5d28
commit 5663a3f74c
4 changed files with 202 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -129,6 +129,14 @@ namespace IRaCIS.Core.Application.ViewModel
} }
public class FrontAuditConfigDTO: FrontAuditConfigAddOrEdit
{
}
///<summary> FrontAuditConfigAddOrEdit 列表查询参数模型</summary> ///<summary> FrontAuditConfigAddOrEdit 列表查询参数模型</summary>
public class FrontAuditConfigAddOrEdit public class FrontAuditConfigAddOrEdit
{ {
@ -272,6 +280,11 @@ namespace IRaCIS.Core.Application.ViewModel
public string InterfaceName { get; set; } = string.Empty; public string InterfaceName { get; set; } = string.Empty;
public string TableConfigJsonStr { get; set; }
public List<TableConfig> TableConfigList { get; set; } = new List<TableConfig>();
} }

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

@ -893,11 +893,20 @@ namespace IRaCIS.Core.Application.Service
/// <param name="frontAuditConfigId"></param> /// <param name="frontAuditConfigId"></param>
/// <returns></returns> /// <returns></returns>
[HttpGet] [HttpGet]
public async Task<List<FrontAuditConfig>> GetAuditConfigChildList(Guid frontAuditConfigId) public async Task<List<FrontAuditConfigDTO>> GetAuditConfigChildList(Guid frontAuditConfigId)
{ {
var list = await (from data in _repository.GetQueryable<FrontAuditConfig>().Where(x => x.Id == frontAuditConfigId) //var list = await (from data in _repository.GetQueryable<FrontAuditConfig>().Where(x => x.Id == frontAuditConfigId)
join childrenType in _repository.GetQueryable<FrontAuditConfig>() on data.Id equals childrenType.ParentId // join childrenType in _repository.GetQueryable<FrontAuditConfig>() on data.Id equals childrenType.ParentId
select childrenType).OrderBy(x => x.Sort).ToListAsync(); // select childrenType).OrderBy(x => x.Sort).ToListAsync();
//return list;
var list = await _frontAuditConfigRepository.Where(t => t.ParentId == frontAuditConfigId).OrderBy(x => x.Sort).ProjectTo<FrontAuditConfigDTO>(_mapper.ConfigurationProvider).ToListAsync();
foreach (var item in list)
{
item.TableConfigList = JsonConvert.DeserializeObject<List<TableConfig>>(item.TableConfigJsonStr) ?? new List<TableConfig>();
}
return list; return list;
} }
@ -1020,8 +1029,8 @@ namespace IRaCIS.Core.Application.Service
[HttpGet] [HttpGet]
public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId) public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId)
{ {
var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length>0).Select(x => new { x.Description,x.Sort } ).OrderBy(t=>t.Sort).ToListAsync(); var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length > 0).Select(x => new { x.Description, x.Sort }).OrderBy(t => t.Sort).ToListAsync();
return result.Select(t=>t.Description).Distinct().ToList(); return result.Select(t => t.Description).Distinct().ToList();
} }
/// <summary> /// <summary>
@ -1147,6 +1156,8 @@ namespace IRaCIS.Core.Application.Service
addOrEditFrontAuditConfig.Description = ""; addOrEditFrontAuditConfig.Description = "";
} }
addOrEditFrontAuditConfig.TableConfigJsonStr = JsonConvert.SerializeObject(addOrEditFrontAuditConfig.TableConfigList);
var entity = await _frontAuditConfigRepository.InsertOrUpdateAsync(addOrEditFrontAuditConfig, true); var entity = await _frontAuditConfigRepository.InsertOrUpdateAsync(addOrEditFrontAuditConfig, true);
return ResponseOutput.Ok(entity.Id.ToString()); return ResponseOutput.Ok(entity.Id.ToString());

2
IRaCIS.Core.Application/Service/Inspection/_MapConfig.cs
View File

@ -19,6 +19,8 @@ namespace IRaCIS.Core.Application.Service
CreateMap<DataInspectionAddDTO, DataInspection>(); CreateMap<DataInspectionAddDTO, DataInspection>();
CreateMap<FrontAuditConfig, FrontAuditConfigDTO>();

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

@ -9,209 +9,233 @@ using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema; using System.ComponentModel.DataAnnotations.Schema;
namespace IRaCIS.Core.Domain.Models namespace IRaCIS.Core.Domain.Models
{ {
///<summary> ///<summary>
///FrontAuditConfig ///FrontAuditConfig
///</summary> ///</summary>
[Table("FrontAuditConfig")] [Table("FrontAuditConfig")]
public class FrontAuditConfig : Entity, IAuditUpdate, IAuditAdd public class FrontAuditConfig : Entity, IAuditUpdate, IAuditAdd
{ {
/// <summary> /// <summary>
/// Value /// Value
/// </summary> /// </summary>
public string Value { get; set; } = String.Empty; public string Value { get; set; } = String.Empty;
/// <summary> /// <summary>
/// ValueCN /// ValueCN
/// </summary> /// </summary>
public string ValueCN { get; set; } = String.Empty; public string ValueCN { get; set; } = String.Empty;
/// <summary> /// <summary>
/// Description /// Description
/// </summary> /// </summary>
public string Description { get; set; } = String.Empty; public string Description { get; set; } = String.Empty;
/// <summary> /// <summary>
/// CreateTime /// CreateTime
/// </summary> /// </summary>
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
/// <summary> /// <summary>
/// CreateUserId /// CreateUserId
/// </summary> /// </summary>
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
/// <summary> /// <summary>
/// UpdateTime /// UpdateTime
/// </summary> /// </summary>
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
/// <summary> /// <summary>
/// UpdateUserId /// UpdateUserId
/// </summary> /// </summary>
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
/// <summary> /// <summary>
/// Code /// Code
/// </summary> /// </summary>
public string Code { get; set; } = String.Empty; public string Code { get; set; } = String.Empty;
/// <summary> /// <summary>
/// ParentId /// ParentId
/// </summary> /// </summary>
public Guid? ParentId { get; set; } public Guid? ParentId { get; set; }
/// <summary> /// <summary>
/// IsEnable /// IsEnable
/// </summary> /// </summary>
public bool IsEnable { get; set; } public bool IsEnable { get; set; }
/// <summary> /// <summary>
/// IsConfig /// IsConfig
/// </summary> /// </summary>
public bool IsConfig { get; set; } public bool IsConfig { get; set; }
/// <summary> /// <summary>
/// ModuleTypeId /// ModuleTypeId
/// </summary> /// </summary>
public Guid? ModuleTypeId { get; set; } public Guid? ModuleTypeId { get; set; }
/// <summary> /// <summary>
/// OptTypeId /// OptTypeId
/// </summary> /// </summary>
public Guid? OptTypeId { get; set; } public Guid? OptTypeId { get; set; }
/// <summary> /// <summary>
/// ChildrenTypeId /// ChildrenTypeId
/// </summary> /// </summary>
public Guid? ChildrenTypeId { get; set; } public Guid? ChildrenTypeId { get; set; }
public int IsShowParent { get; set; } public int IsShowParent { get; set; }
public string ConfigType { get; set; } = String.Empty; public string ConfigType { get; set; } = String.Empty;
public int Sort { get; set; } public int Sort { get; set; }
public string DictionaryKey { get; set; } public string DictionaryKey { get; set; }
public string EnumType { get; set; } public string EnumType { get; set; }
public Guid? ObjectTypeId { get; set; } public Guid? ObjectTypeId { get; set; }
public bool IsShowByTrialConfig { get; set; } public bool IsShowByTrialConfig { get; set; }
public string TrialConfigRelyFieldName { get; set; } public string TrialConfigRelyFieldName { get; set; }
/// <summary> /// <summary>
/// 标识 /// 标识
/// </summary> /// </summary>
public string Identification { get; set; } public string Identification { get; set; }
/// <summary> /// <summary>
/// 是否有签名 /// 是否有签名
/// </summary> /// </summary>
public bool IsHaveSign { get; set; } public bool IsHaveSign { get; set; }
/// <summary> /// <summary>
/// 是否有原因 /// 是否有原因
/// </summary> /// </summary>
public bool IsHaveReason { get; set; } public bool IsHaveReason { get; set; }
/// <summary> /// <summary>
/// 是否完成 /// 是否完成
/// </summary> /// </summary>
public bool IsFinish { get; set; } public bool IsFinish { get; set; }
/// <summary> /// <summary>
/// 是否加入计划 /// 是否加入计划
/// </summary> /// </summary>
public bool IsJoinPlan { get; set; } public bool IsJoinPlan { get; set; }
/// <summary> /// <summary>
/// 数据类型 /// 数据类型
/// </summary> /// </summary>
public string DataType { get; set; } public string DataType { get; set; }
/// <summary> /// <summary>
/// 子数据Lable /// 子数据Lable
/// </summary> /// </summary>
public string ChildDataLabel { get; set; } public string ChildDataLabel { get; set; }
/// <summary> /// <summary>
/// 子数据Value /// 子数据Value
/// </summary> /// </summary>
public string ChildDataValue { get; set; } public string ChildDataValue { get; set; }
/// <summary> /// <summary>
/// 是否为特殊类型 /// 是否为特殊类型
/// </summary> /// </summary>
public bool IsSpecialType { get; set; } public bool IsSpecialType { get; set; }
/// <summary> /// <summary>
/// 日期类型 /// 日期类型
/// </summary> /// </summary>
public string DateType { get; set; } = String.Empty; public string DateType { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 字典Code /// 字典Code
/// </summary> /// </summary>
public string DictionaryCode { get; set; } = String.Empty; public string DictionaryCode { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 字典Type /// 字典Type
/// </summary> /// </summary>
public string DictionaryType { get; set; } = String.Empty; public string DictionaryType { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 字典表 /// 字典表
/// </summary> /// </summary>
public string ForeignKeyTableName { get; set; } = String.Empty; public string ForeignKeyTableName { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 字典Value /// 字典Value
/// </summary> /// </summary>
public string ForeignKeyValue { get; set; } = String.Empty; public string ForeignKeyValue { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 字典 /// 字典
/// </summary> /// </summary>
public string ForeignKeyText { get; set; } = String.Empty; public string ForeignKeyText { get; set; } = String.Empty;
/// <summary> /// <summary>
/// 接口名 /// 接口名
/// </summary> /// </summary>
public string InterfaceName { get; set; } = String.Empty; public string InterfaceName { get; set; } = String.Empty;
}
public string TableConfigJsonStr { get; set; }
}
public class TableConfig
{
public bool IsList { get; set; }
public string ListName { get; set; } = String.Empty;
public bool IsFixedColumn { get; set; }
public string FixedColumnName { get; set; } = String.Empty;
public string ColumnName { get; set; } = String.Empty;
public string ColumnValue { get; set; } = String.Empty;
public bool IsMerge { get; set; }
public string MergeColumnName { get; set; } = String.Empty;
}
} }