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

Merge branch 'Test.IRC' of http://192.168.3.69:2000/XCKJ/irc-netcore-api into Test.IRC

Browse Source
This commit is contained in:
he
2023-10-13 13:39:13 +08:00
parent fbf86ab7e3 5dec67aa32
commit b62a1e5d88
28 changed files with 204 additions and 811 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IRaCIS.Core.Application/Service/Common/_MapConfig.cs
+15 -8
View File
@@ -3,6 +3,7 @@ using IRaCIS.Application.Contracts;
using IRaCIS.Core.Application.Contracts;
using IRaCIS.Core.Application.ViewModel;
using IRaCIS.Core.Domain.Models;
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Application.Service
{
@@ -20,25 +21,31 @@ namespace IRaCIS.Core.Application.Service
CreateMap<FrontAuditConfig, FrontAuditConfigAddOrEdit>().ReverseMap();
CreateMap<EmailNoticeConfigAddOrEdit, EmailNoticeConfig>().ReverseMap();
CreateMap<EmailNoticeUserType, EmailUserTypeDto>();
var trialId = Guid.Empty;
CreateMap<EmailNoticeConfig, TrialSelectEmailNoticeConfigView>().IncludeBase<EmailNoticeConfig, EmailNoticeConfigView>()
.ForMember(o => o.IsHaveSelected, t => t.MapFrom(u => u.TrialEmailNoticeConfigList.Any(c => c.TrialId == trialId && c.SysEmailNoticeConfigId == u.Id)))
;
CreateMap<EmailNoticeConfig, EmailNoticeConfigView>()
.ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList));
.ForMember(t => t.EmailNoticeUserList, u => u.MapFrom(c => c.EmailNoticeUserTypeList));
CreateMap<Dictionary, DicView>()
.ForMember(t => t.ParentCode, u => u.MapFrom(c => c.Parent.Code));
CreateMap<SystemBasicData, SystemBasicDataView>();
var isEn_Us = false;
CreateMap<SystemBasicData, SystemBasicDataSelect>()
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code))
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us? u.Value:u.ValueCN));
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN));
CreateMap<SystemBasicDataAddOrEdit, SystemBasicData>().ReverseMap();
CreateMap<Dictionary, BasicDicView>()
.ForMember(o => o.ConfigType, t => t.MapFrom(u => u.ConfigDictionary.Code));
@@ -51,7 +58,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Dictionary, BasicDicSelectCopy>()
.ForMember(o => o.ParentChildCodeEnum, t => t.MapFrom(u => u.Parent.ChildCodeEnum))
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us? u.Value : u.ValueCN ))
.ForMember(o => o.Value, t => t.MapFrom(u => isEn_Us ? u.Value : u.ValueCN))
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
CreateMap<Dictionary, BasicDicSelect>()
@@ -59,7 +66,7 @@ namespace IRaCIS.Core.Application.Service
.ForMember(o => o.ParentCode, t => t.MapFrom(u => u.Parent.Code));
var token = "";
CreateMap<CommonDocument, CommonDocumentView>()
CreateMap<CommonDocument, CommonDocumentView>()
.ForMember(d => d.FullFilePath, u => u.MapFrom(s => s.Path + "?access_token=" + token));
CreateMap<CommonDocument, CommonDocumentAddOrEdit>().ReverseMap();
@@ -68,7 +75,7 @@ namespace IRaCIS.Core.Application.Service
CreateMap<Internationalization, InternationalizationAddOrEdit>().ReverseMap();
CreateMap<BatchAddInternationalizationDto, InternationalizationAddOrEdit>();
CreateMap<PublishLog, PublishLogView>();
CreateMap<PublishLog, PublishLogAddOrEdit>().ReverseMap();
@@ -76,5 +83,5 @@ namespace IRaCIS.Core.Application.Service
}
}
}
IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs
+2
View File
@@ -571,6 +571,8 @@ namespace IRaCIS.Core.Application.Service
SqlParameter[] paravalue = new SqlParameter[] {
new SqlParameter("@para",para)
};
//https://learn.microsoft.com/zh-tw/ef/core/querying/sql-queries
jsonDataValueDic[item.Key] = string.Join(",", _frontAuditConfigRepository._dbContext.Database.SqlQuery<ForeignKey>(sql, paravalue).Select(x => x.Text).ToList());
}
}
IRaCIS.Core.Application/Service/Management/UserService.cs
-1
View File
@@ -8,7 +8,6 @@ using Panda.DynamicWebApi.Attributes;
using Microsoft.AspNetCore.Authorization;
using Microsoft.Extensions.Options;
using Microsoft.Extensions.Caching.Memory;
using IRaCIS.Core.Infra.Common.Cache;
using Microsoft.Identity.Client;
using static IRaCIS.Core.Domain.Share.StaticData;
using IRaCIS.Core.Application.ViewModel;