SW/SystemX.Web
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[성현모] Overview Merged 통합, 컬럼 필터링 추가

Browse Source
This commit is contained in:
SHM
2025-09-03 16:45:28 +09:00
parent 32139123ba
commit 9a18f51bef
5 changed files with 106 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
Projects/WebClient/Web.Tra/Services/CPXV2LogService.cs
View File

@ -20,9 +20,9 @@ namespace Web.Tra.Services
}
//Get Overview
public async Task<List<Overview>> GetOverview(RequestSearch request)
public async Task<List<SearchData>> GetSearchDataOverview(RequestSearch request)
{
List<Overview> overview = new List<Overview>();
List<SearchData> searchData = new List<SearchData>();
int startYear = request.SearchStart.Year;
int endYear = request.SearchEnd.Year;
@ -67,94 +67,48 @@ namespace Web.Tra.Services
});
var ListSearchData = search
.Where(x => x.Summary.TestListVariantNo > 0)
// .Where(x => x.Summary.TestListVariantNo > 0)
.OrderBy(x => x.Summary.TestDT).ToList();
var group = ListSearchData
.GroupBy(x => (x.Summary.HostID, x.Summary.Section))
.Select(x => x.ToOverview())
.OrderBy(x => x.Host);
overview.AddRange(group);
searchData.AddRange(ListSearchData);
}
}
}
return overview.OrderBy(x=>x.TestDate).ToList();
return searchData;
}
public async Task<List<OverviewMerged>> GetOverviewMerged(RequestSearch request)
public async Task<List<Overview>> GetOverviews(List<SearchData> request)
{
List<OverviewMerged> overview = new List<OverviewMerged>();
var group = request
.GroupBy(x => (x.Summary.HostID, x.Summary.Section))
.Select(x => x.ToOverview())
.OrderBy(x => x.Host);
int startYear = request.SearchStart.Year;
int endYear = request.SearchEnd.Year;
await Task.CompletedTask;
return group.OrderBy(x => x.TestDate).ToList();
}
//search log
List<HIST_LogSummary> SearchLogList = new List<HIST_LogSummary>();
for (int i = startYear; i <= endYear; i++)
{
using (var scope = _scopeFactory.CreateScope())
{
var provider = scope.ServiceProvider.GetRequiredService<DbContextProvider>();
using (var context = GetDBContext<CPXV2Log>(provider, i))
{
if (context is not null)
{
SearchLogList.AddRange(await context.HIST_LogSummaries.Where(x => request.SearchStart <= DateOnly.FromDateTime(x.TestDT) && DateOnly.FromDateTime(x.TestDT) <= request.SearchEnd).ToListAsync());
}
}
}
}
//search testlist
using (var scope = _scopeFactory.CreateScope())
{
var provider = scope.ServiceProvider.GetRequiredService<DbContextProvider>();
using (var context = GetDBContext<CPXV2>(provider, 1))
{
if (context is not null)
{
var varProdVariant = context.PROD_Variants.ToList();
var varProudGroup = context.PROD_Groups.ToList();
var TesetInfoList = varProdVariant.Select(x => new TestInfo
{
PROD_Variant = x,
PROD_Group = varProudGroup.Find(y => y.No == x.GroupNo)
}).ToList();
public async Task<List<Overview>> GetOverviewMerged(List<SearchData> request)
{
var group = request.OrderByDescending(x=>x.Summary.TestDT).GroupBy(x =>
(DateOnly.FromDateTime(x.Summary.TestDT.Date),
x.Summary.TestType,
x.Summary.ProdNo_C,
x.Summary.Testcode,
x.Summary.TestListFileNo,
x.Summary.TestListVariantNo,
x.Summary.ProdNo_P,
x.Summary.ProdCode,
x.Summary.Version,
x.Summary.StepVersion))
.Select(x => x.ToOverviewMerged())
.DistinctBy(x => (x.TestType, x.ProductNo, x.TestCode,
x.ParentNo,x.FileCode, x.FileVersion))
.OrderBy(x => (x.ProductNo, x.ParentNo));
var search = SearchLogList.Select(x => new SearchData
{
Summary = x,
TestInfo = TesetInfoList.Find(y => y.PROD_Variant.No == x.TestListVariantNo)
});
var ListSearchData = search
//.Where(x => x.Summary.TestListVariantNo > 0)
.OrderByDescending(x => x.Summary.TestDT).ToList();
var group = ListSearchData.GroupBy(x =>
(DateOnly.FromDateTime(x.Summary.TestDT.Date),
x.Summary.TestType,
x.Summary.ProdNo_C,
x.Summary.Testcode,
x.Summary.TestListFileNo,
x.Summary.TestListVariantNo,
x.Summary.ProdNo_P,
x.Summary.ProdCode,
x.Summary.Version,
x.Summary.StepVersion))
.Select(x => x.ToOverviewMerged())
.DistinctBy(x => (x.ModelName, x.TestType, x.ProductNo, x.TestCode, x.ParentNo,
x.TestListFileNo, x.TestListVariantNo, x.FileCode, x.FileVersion))
.OrderBy(x => (x.ProductNo, x.ParentNo, x.TestDate));
overview.AddRange(group);
}
}
}
return overview;
await Task.CompletedTask;
return group.ToList();
}
//Get DBContext