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

添加字段

Uat_Study
he 2022-03-30 10:32:50 +08:00
parent ed964278f8
commit de0baac834
4 changed files with 33 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.API/Controllers/InspectionController.cs
View File

@ -142,10 +142,10 @@ namespace IRaCIS.Core.API.Controllers
opt.AuditInfo.SubjectId = Guid.Parse(fun.Data); opt.AuditInfo.SubjectId = Guid.Parse(fun.Data);
var statusdata = new { var statusdata = new {
status = 1, Status = 1,
outEnrollmentTime = DateTime.Now.ToString("yyyy-MM-dd"), OutEnrollmentTime = DateTime.Now.ToString("yyyy-MM-dd"),
visitOverTime = DateTime.Now.ToString("yyyy-MM-dd"), VisitOverTime = DateTime.Now.ToString("yyyy-MM-dd"),
reason = string.Empty, Reason = string.Empty,
}; };

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

@ -12,33 +12,37 @@ namespace IRaCIS.Core.Application.ViewModel
public class FrontAuditConfigView public class FrontAuditConfigView
{ {
public Guid Id { get; set; } public Guid Id { get; set; }
public string Value { get; set; } public string Value { get; set; } = string.Empty;
public string ValueCN { get; set; } public string ValueCN { get; set; } = string.Empty;
public string Description { get; set; } public string Description { get; set; } = string.Empty;
public DateTime CreateTime { get; set; } public DateTime CreateTime { get; set; }
public Guid CreateUserId { get; set; } public Guid CreateUserId { get; set; }
public DateTime UpdateTime { get; set; } public DateTime UpdateTime { get; set; }
public Guid UpdateUserId { get; set; } public Guid UpdateUserId { get; set; }
public string Code { get; set; } 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 bool? IsConfig { get; set; }
public string ModuleTypeId { get; set; } public string ModuleTypeId { get; set; } = string.Empty;
public string OptTypeId { get; set; } public string OptTypeId { get; set; } = string.Empty;
public string ChildrenTypeId { get; set; } public string ChildrenTypeId { get; set; } = string.Empty;
public string ConfigType { get; set; } public string ConfigType { get; set; } = string.Empty;
public bool? IsShowParent { get; set; } public bool? IsShowParent { get; set; }
public string ChildrenTypeValue { get; set; } public string ChildrenTypeValue { get; set; } = string.Empty;
public string ChildrenTypeValueCN { get; set; } public string ChildrenTypeValueCN { get; set; } = string.Empty;
public string ModuleTypeValue { get; set; } public string ModuleTypeValue { get; set; } = string.Empty;
public string ModuleTypeValueCN { get; set; } public string ModuleTypeValueCN { get; set; } = string.Empty;
public string OptTypeValue { get; set; } public string OptTypeValue { get; set; } = string.Empty;
public string OptTypeValueCN { get; set; } public string OptTypeValueCN { get; set; } = string.Empty;
public int? Sort { get; set; }
} }
///<summary>FrontAuditConfigQuery 列表查询参数模型</summary> ///<summary>FrontAuditConfigQuery 列表查询参数模型</summary>
@ -87,6 +91,8 @@ namespace IRaCIS.Core.Application.ViewModel
public bool? IsShowParent { get; set; } public bool? IsShowParent { get; set; }
public int? Sort { get; set; }
} }

4
IRaCIS.Core.Application/Service/Common/FrontAuditConfigService.cs
View File

@ -67,7 +67,7 @@ namespace IRaCIS.Core.Application.Service
OptTypeValue = leftOptTypeId.Value, OptTypeValue = leftOptTypeId.Value,
OptTypeValueCN = leftOptTypeId.ValueCN, OptTypeValueCN = leftOptTypeId.ValueCN,
UpdateUserId = data.UpdateUserId, UpdateUserId = data.UpdateUserId,
Sort=data.Sort,
ValueCN = data.ValueCN, ValueCN = data.ValueCN,
ChildrenTypeValue = leftchildrenType.Value, ChildrenTypeValue = leftchildrenType.Value,
}; };
@ -80,7 +80,7 @@ namespace IRaCIS.Core.Application.Service
.WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Code == iq.Code) .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.Code == iq.Code)
.WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId); .WhereIf(!iq.Value.IsNullOrEmpty(), x => x.ChildrenTypeId == iq.ChildrenTypeId);
return await query.ToListAsync(); return await query.OrderBy(x=>x.Sort).ToListAsync();
} }

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

@ -99,6 +99,8 @@ namespace IRaCIS.Core.Domain.Models
public string ConfigType { get; set; } public string ConfigType { get; set; }
public int? Sort { get; set; }
} }
} }