Alexandr/ISEbd-21_Milyushkin_A.A._Accounting-Time-It-Company
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

s

Browse Source
This commit is contained in:
Pipiaka 2024-12-22 22:39:50 +04:00
parent 1821f463db
commit 1ddd541402
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Accounting-Time-It-Company/Accounting-Time-It-Company/Repositories/Implementations/EmployeeRepositories.cs
View File

@ -120,8 +120,7 @@ public class EmployeeRepositories : IEmployeeRepositories
FROM Employee e
LEFT JOIN Post p ON p.id = e.postid";
var employees = connection.Query<Employee>(querySelect);
_logger.LogDebug("Полученные объекты: {json}",
JsonConvert.SerializeObject(employees));
_logger.LogDebug("Полученные объекты: {json}", JsonConvert.SerializeObject(employees));
return employees;
}
catch (Exception ex)

3
Accounting-Time-It-Company/Accounting-Time-It-Company/Repositories/Implementations/PostRepositories.cs
View File

@ -1,4 +1,5 @@
using Accounting_Time_It_Company.Entities;
using Accounting_Time_It_Company.Entities.Enums;
using Dapper;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json;
@ -29,7 +30,7 @@ public class PostRepositories : IPostRepositories
var queryInsert = @"
INSERT INTO Post
VALUES (DEFAULT, @NamePost, @LevelPost, @Wage)";
connection.Execute(queryInsert, post);
connection.Execute(queryInsert, new { NamePost = post.NamePost.ToString(), post.LevelPost, post.Wage });
}
catch (Exception ex)
{

8
Accounting-Time-It-Company/Accounting-Time-It-Company/Repositories/Implementations/TypeJobRepositories.cs
View File

@ -111,6 +111,7 @@ public class TypeJobRepositories : ITypeJobRepositories
{
builder.AddCondition("tj.directorId = @directorId");
}
using var connection = new NpgsqlConnection(_connectionString.ConnectionString);
connection.Open();
var querySelect = @$"SELECT
@ -129,6 +130,9 @@ public class TypeJobRepositories : ITypeJobRepositories
LEFT JOIN Employee e ON e.id = wt.employeeid
{builder.Build()}";
var ManagerId = connection.Query<int>($"SELECT p.Id FROM Post p WHERE p.NamePost='{(int)TypePost.Manager}'");
var DeveloperId = connection.Query<int>($"SELECT p.Id FROM Post p WHERE p.NamePost='{(int)TypePost.Developer}'");
var jobDictDev = new Dictionary<int, List<WorkTime>>();
var jobDictMan = new Dictionary<int, List<WorkTime>>();
@ -145,8 +149,8 @@ public class TypeJobRepositories : ITypeJobRepositories
tjwtm = [];
jobDictMan.Add(tj.Id, tjwtm);
}
if (e.PostId == (int)TypePost.Developer) tjwtd.Add(wt);
if (e.PostId == (int)TypePost.Manager) tjwtm.Add(wt);
if (DeveloperId.Any(x => x == e.PostId)) tjwtd.Add(wt);
if (ManagerId.Any(x => x == e.PostId)) tjwtm.Add(wt);
return tj;
}, splitOn: "employeeid, name", param: new { dateFrom, dateTo, productId, directorId });