mz/DiunaBI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Export R1 fix

Browse Source
This commit is contained in:
Michał Zieliński
2025-02-19 09:52:33 +01:00
parent 0d2b882c8a
commit eadf0f8126
4 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
WebAPI/Controllers/LayersController.cs
View File

@@ -451,15 +451,14 @@ public class LayersController : Controller
string[] processTypes = string[] processTypes =
[ [
"T3-SingleSource", //"T3-SingleSource",
"T3-SourceYearSummary", //"T3-SourceYearSummary",
"T3-MultiSourceSummary", // AA //"T3-MultiSourceSummary", // AA
"T3-MultiSourceYearSummary", // AA/13 //"T3-MultiSourceYearSummary", // AA/13
"T4-SingleSource", //"T4-SingleSource",
"T5-LastValues", //"T5-LastValues",
//"T1-R1_OLD", //"T1-R1",
"T1-R1", //"T4-R2",
"T4-R2",
"T1-R3" "T1-R3"
]; ];

12
WebAPI/Helpers/DbSeed/Admin-Monthly/CreateImportWorkerD1.sql
View File

@@ -5,17 +5,17 @@ SET @LayerId = NEWID();
INSERT INTO [diunabi-morska].[dbo].[Layers] INSERT INTO [diunabi-morska].[dbo].[Layers]
([Id], [Number], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], ([Id], [Number], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
[CreatedById], [ModifiedById], [Type]) [CreatedById], [ModifiedById], [Type])
VALUES ((SELECT @LayerId), 4907, 'L4907-A-IW_D1-2024/12-202501201247', VALUES ((SELECT @LayerId), 5375, 'L5375-A-IW_D1-2025/01-202502182004',
GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2);
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'StartDate', '2025.01.01', VALUES ((SELECT NEWID()), 'StartDate', '2025.02.10',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'EndDate', '2025.01.30', VALUES ((SELECT NEWID()), 'EndDate', '2025.03.30',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -25,7 +25,7 @@ GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'SheetTabName', 'Grudzien_2024', VALUES ((SELECT NEWID()), 'SheetTabName', 'Styczen_2025',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -45,12 +45,12 @@ GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'ImportYear', '2024', VALUES ((SELECT NEWID()), 'ImportYear', '2025',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'ImportMonth', '12', VALUES ((SELECT NEWID()), 'ImportMonth', '01',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]

8
WebAPI/Helpers/DbSeed/Admin-Monthly/CreateProcessWorker-T5LastValue.sql
View File

@@ -7,7 +7,7 @@ SET @LayerId = NEWID();
INSERT INTO [diunabi-morska].[dbo].[Layers] INSERT INTO [diunabi-morska].[dbo].[Layers]
([Id], [Number], [Name], [CreatedAt], [ModifiedAt], [IsDeleted], ([Id], [Number], [Name], [CreatedAt], [ModifiedAt], [IsDeleted],
[CreatedById], [ModifiedById], [Type]) [CreatedById], [ModifiedById], [Type])
VALUES ((SELECT @LayerId), 4658, 'L4658-A-PW_D1-2024/12-202501201252', VALUES ((SELECT @LayerId), 5376, 'L5376-A-PW_D1-2025/01-202502182007',
GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2); GETDATE(), GETDATE(), 0, '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 2);
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -17,7 +17,7 @@ VALUES ((SELECT NEWID()), 'Source', 'D1',
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'SourceLayer', 'L4657-A-IW_D1-2024/12-202501201247', VALUES ((SELECT NEWID()), 'SourceLayer', 'L5375-A-IW_D1-2025/01-202502182004',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
@@ -37,10 +37,10 @@ VALUES ((SELECT NEWID()), 'IsEnabled', 'True',
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Year', '2024', VALUES ((SELECT NEWID()), 'Year', '2025',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));
INSERT INTO [diunabi-morska].[dbo].[Records] INSERT INTO [diunabi-morska].[dbo].[Records]
([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId]) ([Id], [Code], [Desc1], [CreatedAt], [ModifiedAt], [CreatedById], [ModifiedById], [IsDeleted], [LayerId])
VALUES ((SELECT NEWID()), 'Month', '12', VALUES ((SELECT NEWID()), 'Month', '01',
GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId)); GETDATE(), GETDATE(), '117be4f0-b5d1-41a1-a962-39dc30cce368', '117be4f0-b5d1-41a1-a962-39dc30cce368', 0, (SELECT @LayerId));

8
WebAPI/dataProcessors/t1.r3.processor.cs
View File

@@ -103,21 +103,21 @@ public class T1R3Processor(
controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D")); controller.SaveRecords(processedLayer.Id, newRecords, Guid.Parse("F392209E-123E-4651-A5A4-0B1D6CF9FF9D"));
db.SaveChanges(); db.SaveChanges();
UpdateReport(); UpdateReport(processedLayer.Id, year);
} }
private void UpdateReport() private void UpdateReport(Guid LayerId, int Year)
{ {
const string sheetId = "10Xo8BBF92nM7_JzzeOuWp49Gz8OsYuCxLDOeChqpW_8"; const string sheetId = "10Xo8BBF92nM7_JzzeOuWp49Gz8OsYuCxLDOeChqpW_8";
var r3 = db.Layers var r3 = db.Layers
.Where(x => x.Number == 3954) .Where(x => x.Id == LayerId)
.Include(x => x.Records) .Include(x => x.Records)
.FirstOrDefault(); .FirstOrDefault();
for (var i = 1; i <= 12; i++) for (var i = 1; i <= 12; i++)
{ {
var sheetName = ProcessHelper.GetSheetName(i, 2024); var sheetName = ProcessHelper.GetSheetName(i, Year);
ValueRange? dataRangeResponse; ValueRange? dataRangeResponse;
try try
{ {