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

修改

Uat_Study
he 2022-08-17 10:40:49 +08:00
parent f90303c578
commit ad9e0208f3
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -14,6 +14,7 @@ using Microsoft.Data.SqlClient;
using Newtonsoft.Json; using Newtonsoft.Json;
using Newtonsoft.Json.Linq; using Newtonsoft.Json.Linq;
using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Domain.Share;
using IRaCIS.Core.Domain.Share.Management;
namespace IRaCIS.Core.Application.Service namespace IRaCIS.Core.Application.Service
{ {
@ -278,12 +279,12 @@ namespace IRaCIS.Core.Application.Service
{ {
try try
{ {
if (datefirst.DateType == "Date") if (datefirst.DateType == FrontAuditDateType.Date.GetDescription())
{ {
jsonDataDic[item] = DateTime.Parse(jsonDataDic[item].ToString()).ToString("yyyy-MM-dd"); jsonDataDic[item] = DateTime.Parse(jsonDataDic[item].ToString()).ToString("yyyy-MM-dd");
} }
if (datefirst.DateType == "DateTime") if (datefirst.DateType == FrontAuditDateType.DateTime.GetDescription())
{ {
jsonDataDic[item] = DateTime.Parse(jsonDataDic[item].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); jsonDataDic[item] = DateTime.Parse(jsonDataDic[item].ToString()).ToString("yyyy-MM-dd HH:mm:ss");
} }
@ -425,7 +426,7 @@ namespace IRaCIS.Core.Application.Service
if (value.GetType() == typeof(JArray)) if (value.GetType() == typeof(JArray))
{ {
JArray arrays = (JArray)value; JArray arrays = (JArray)value;
if (item.Type.ToLower() == "id".ToLower()) if (item.Type.ToLower() == FrontAudit.Id.GetDescription().ToLower())
{ {
List<Guid> guids = new List<Guid>(); List<Guid> guids = new List<Guid>();
arrays.ForEach(x => arrays.ForEach(x =>
@ -434,7 +435,7 @@ namespace IRaCIS.Core.Application.Service
}); });
jsonDataDic[item.Key] = string.Join(',', await _dictionaryRepository.Where(x => guids.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync()); jsonDataDic[item.Key] = string.Join(',', await _dictionaryRepository.Where(x => guids.Contains(x.Id)).Select(x => x.ValueCN).ToListAsync());
} }
else if (item.Type.ToLower() == "ChildGroup".ToLower()) else if (item.Type.ToLower() == FrontAudit.ChildGroup.GetDescription().ToLower())
{ {
List<string> guids = new List<string>(); List<string> guids = new List<string>();
arrays.ForEach(x => arrays.ForEach(x =>
@ -473,12 +474,12 @@ namespace IRaCIS.Core.Application.Service
} }
else else
{ {
if (item.Type.ToLower() == "id".ToLower()) if (item.Type.ToLower() == FrontAudit.Id.GetDescription().ToLower())
{ {
Guid guid = Guid.Parse(value.ToString()); Guid guid = Guid.Parse(value.ToString());
jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => guid == x.Id).Select(x => x.ValueCN).FirstOrDefaultAsync(); jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => guid == x.Id).Select(x => x.ValueCN).FirstOrDefaultAsync();
} }
else if (item.Type.ToLower() == "ChildGroup".ToLower()) else if (item.Type.ToLower() == FrontAudit.ChildGroup.GetDescription().ToLower())
{ {
jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Code == item.Code).Join(_dictionaryRepository.Where(x => x.ChildGroup == value.ToString()), a => a.Id, b => b.ParentId, (a, b) => new jsonDataDic[item.Key] = await _dictionaryRepository.Where(x => x.Code == item.Code).Join(_dictionaryRepository.Where(x => x.ChildGroup == value.ToString()), a => a.Id, b => b.ParentId, (a, b) => new
{ {
@ -528,12 +529,12 @@ namespace IRaCIS.Core.Application.Service
{ {
try try
{ {
if (datefirst.DateType == "Date") if (datefirst.DateType == FrontAuditDateType.Date.GetDescription())
{ {
JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd"); JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd");
} }
if (datefirst.DateType == "DateTime") if (datefirst.DateType == FrontAuditDateType.DateTime.GetDescription())
{ {
JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd HH:mm:ss"); JsonData[item] = DateTime.Parse(JsonData[item].ToString()).ToString("yyyy-MM-dd HH:mm:ss");
} }

43
IRaCIS.Core.Domain.Share/Management/SystemNotice.cs
View File

@ -1,4 +1,6 @@
namespace IRaCIS.Core.Domain.Share.Management using System.ComponentModel.DataAnnotations;
namespace IRaCIS.Core.Domain.Share.Management
{ {
public enum SystemNotice_NoticeModeEnum public enum SystemNotice_NoticeModeEnum
{ {
@ -49,4 +51,43 @@
} }
public enum FrontAudit
{
/// <summary>
///id
/// </summary>
[DisplayAttribute(Name = "id")]
Id = 0,
/// <summary>
///ChildGroup
/// </summary>
[DisplayAttribute(Name = "ChildGroup")]
ChildGroup = 0,
/// <summary>
///id
/// </summary>
[DisplayAttribute(Name = "Code")]
Code = 0,
}
public enum FrontAuditDateType
{
/// <summary>
///Date
/// </summary>
[DisplayAttribute(Name = "Date")]
Date = 0,
/// <summary>
///DateTime
/// </summary>
[DisplayAttribute(Name = "DateTime")]
DateTime = 0,
}
} }