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

修改
continuous-integration/drone/push Build is passing Details

Uat_IRC_Net8
he 2025-04-02 13:44:36 +08:00
parent aa42d64cac
commit c49f16b055
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
IRaCIS.Core.Application/Service/Document/AuditDocumentService.cs
View File

@ -116,19 +116,15 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
else else
{ {
return alikeData; return alikeData;
} }
} }
else else
{ {
var entityData = await _auditDocumentRepository.InsertOrUpdateAsync(inDto, true); var entityData = await _auditDocumentRepository.InsertOrUpdateAsync(inDto, true);
var historicalVersionIds = await _auditDocumentRepository.Where(x => x.MainFileId == alikeData.Id).OrderBy(x => x.Version).Select(x => x.Id).ToListAsync(); var historicalVersionIds = await _auditDocumentRepository.Where(x => x.MainFileId == alikeData.Id).OrderBy(x => x.Version).Select(x => x.Id).ToListAsync();
historicalVersionIds.Add(alikeData.Id); historicalVersionIds.Add(alikeData.Id);
int num = 1; int num = 1;
foreach (var item in historicalVersionIds) foreach (var item in historicalVersionIds)
{ {
await _auditDocumentRepository.UpdatePartialFromQueryAsync(item, x => new AuditDocument() await _auditDocumentRepository.UpdatePartialFromQueryAsync(item, x => new AuditDocument()
@ -177,17 +173,6 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
} }
///// <summary>
///// 新增稽查文档
///// </summary>
///// <returns></returns>
//public async Task<IResponseOutput> InsertAuditDocument()
//{
//}
/// <summary> /// <summary>
/// 获取文件树形结构 (传Id 根节点就是自己) /// 获取文件树形结构 (传Id 根节点就是自己)
/// </summary> /// </summary>
@ -199,12 +184,13 @@ public class AuditDocumentService(IRepository<AuditDocument> _auditDocumentRepos
var defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), nameof(AuditDocumentData.Name) }; var defalutSortArray = new string[] { nameof(AuditDocumentData.AuditDocumentTypeEnum), nameof(AuditDocumentData.Name) };
// 新取出来排序 然后再找子项
var data= (await _auditDocumentRepository var data= (await _auditDocumentRepository
.Where(x=>x.AuditDocumentTypeEnum!=AuditDocumentType.HistoricalVersion) .Where(x=>x.AuditDocumentTypeEnum!=AuditDocumentType.HistoricalVersion)
.WhereIf(inDto.IsAuthorization!=null,x=>x.IsAuthorization==inDto.IsAuthorization) .WhereIf(inDto.IsAuthorization!=null,x=>x.IsAuthorization==inDto.IsAuthorization)
.ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToPagedListAsync(new PageInput() { .ProjectTo<AuditDocumentData>(_mapper.ConfigurationProvider).ToPagedListAsync(new PageInput() {
PageIndex=1, PageIndex=1,
PageSize=999999, PageSize=999999,
}, defalutSortArray) ).CurrentPageData.ToList(); }, defalutSortArray) ).CurrentPageData.ToList();

6
IRaCIS.Core.Application/Service/TrialSiteUser/TrialSiteService.cs
View File

@ -148,9 +148,9 @@ namespace IRaCIS.Core.Application.Services
public async Task<List<TrialSiteSelect>> GetTrialSiteSelectList(string? siteName) public async Task<List<TrialSiteSelect>> GetTrialSiteSelectList(string? siteName)
{ {
var list = _siteRepository var list = _trialSiteRepository
.WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.SiteName.Contains(siteName) || t.SiteNameCN.Contains(siteName) || t.AliasName.Contains(siteName)) .WhereIf(!string.IsNullOrWhiteSpace(siteName), t => t.TrialSiteName.Contains(siteName) || t.TrialSiteAliasName.Contains(siteName) || t.TrialSiteCode.Contains(siteName))
.Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.SiteName : t.SiteNameCN, AliasName = t.AliasName }) .Select(t => new TrialSiteSelect() { SiteId = t.Id, SiteName = _userInfo.IsEn_Us ? t.TrialSiteName : t.TrialSiteName, AliasName = t.TrialSiteAliasName })
.OrderBy(x=>x.SiteName) .OrderBy(x=>x.SiteName)
.ToList(); .ToList();