ker73rus/PIbd-21_Pyatakov_KM_Markov_DP_University
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
Danil Markov 2023-04-08 14:02:34 +04:00
parent 8caeebb8d3
commit e5b2dcdab6
5 changed files with 32 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UniversityBusinessLogic/BusinessLogics/ReportProviderLogic.cs
View File

@ -15,7 +15,7 @@ namespace UniversityBusinessLogic.BusinessLogics
{
private readonly IDocumentStorage _documentStorage;
public List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline()
public List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(ReportBindingModel model)
{
throw new NotImplementedException();
}

2
UniversityContracts/BusinessLogicContracts/IReportProviderLogic.cs
View File

@ -10,7 +10,7 @@ namespace UniversityContracts.BusinessLogicContracts
{
public interface IReportProviderLogic
{
List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline();
List<ReportStudentsDisciplineViewModel> GetStudentsDiscipline(ReportBindingModel model);
List<ReportStreamStudentEdStatPeriodViewModel> StreamStudentEdStatPeriod(ReportBindingModel model);

2
UniversityContracts/SearchModels/DocumentSearchModel.cs
View File

@ -11,5 +11,7 @@ namespace UniversityContracts.SearchModels
public int? Id { get; set; }
public string? Name { get; set; }
public int? UserId { get; set; }
public DateTime? DateFrom { get; set; }
public DateTime? DateTo { get; set; }
}
}

28
UniversityDataBaseImplemet/Implements/DocumentStorage.cs
View File

@ -39,6 +39,34 @@ namespace UniversityDataBaseImplemet.Implements
.Select(record => record.GetViewModel)
.ToList();
}
else if (model.DateFrom != null && model.DateTo != null && model.UserId.HasValue) // фильтрация для отчета#2 Поставщик
{
return context.Documents
.Where(d => d.Date >= model.DateFrom && d.Date <= model.DateTo)
.Join(context.StudentDocuments,
doc => doc.Id,
studDoc => studDoc.DocumentId,
(doc, studDoc) => new { Document = doc, StudentDocument = studDoc })
.Join(context.Students,
studDoc => studDoc.StudentDocument.StudentId,
stud => stud.Id,
(studDoc, stud) => new { studDoc.Document, Student = stud })
.Include(record => record.Student.EducationStatus)
.Join(context.StudentStreams,
studEdu => studEdu.Student.Id,
studStream => studStream.StudentId,
(studEdu, studStream) => new { studEdu.Document, studEdu.Student, studEdu.EducationStatus, StudentStream = studStream })
.Join(context.Streams,
studStream => studStream.StudentStream.StreamId,
stream => stream.Id,
(studStream, stream) => new { Stream = stream.Name, studStream.Student, studStream.EducationStatus.Name })
.Select(result => new {
result.Stream,
result.Student,
result.EducationStatus
})
.ToList();
}
else if (model.UserId.HasValue)
{
return context.Documents

33
UniversityDataBaseImplemet/Implements/StudentStorage.cs
View File

@ -51,39 +51,6 @@ namespace UniversityDataBaseImplemet.Implements
.Select(record => record.GetViewModel)
.ToList();
}
/*else if (model.Disciplines == true) // для отчета#1 Поставщик
{
return context.Students
.Join(context.StudentStreams, student => student.Id, studentStream => studentStream.StudentId, (student, studentStream) => new { Student = student, StreamId = studentStream })
.Join(context.Streams, studentStream => studentStream.StreamId, stream => stream.Id, (studentStream, stream) => new { Stream = stream })
.Join(context.Disciplines, record => record.stream.Id, discipline => discipline.StreamId, (record, discipline) => new { record.student, discipline })
.GroupBy(sd => sd.student)
.Select(g => new {
Student = g.Key.Name,
Disciplines = g.Select(sd => sd.discipline.Name).ToList()
})
.ToList();
}*/
/*else if (model.DateFrom != null && model.DateTo != null) // для отчета#2 Поставщик
{
return context.Students
.Include(record => record.User)
.Include(record => record.EducationStatus)
.Join(context.StudentStreams,
student => student.Id,
studentStream => studentStream.StudentId,
(student, studentStream) => new { Student = student, StreamId = studentStream })
.Join(context.Streams,
studentStream => studentStream.StreamId,
stream => stream.Id,
(studentStream, stream) => new { Stream = stream })
.Select(result => new
{
Stream = result.Stream,
Students = result.Select(record => (record.Student, record.EducationStatus)).ToList()
})
.ToList();
}*/
else
{
return new();