a.puchkina/PIbd-22_Fedorenko_Puchkina_CourseWork
a.puchkina/PIbd-22_Fedorenko_Puchkina_CourseWork
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

мать накрывай поляну почта работает

Browse Source
This commit is contained in:
Галина Федоренко 2024-05-29 13:44:09 +04:00
parent cf486ae9cf
commit 7ae4464b36
5 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -398,3 +398,6 @@ FodyWeavers.xsd
# JetBrains Rider # JetBrains Rider
*.sln.iml *.sln.iml
/LawFim/LawFirmRestApi/file.pdf
/LawFim/LawFirmRestApi/pdf.file
/LawFim/LawFirmRestApi/string

6
LawFim/LawFirmBusinessLogic/BusinessLogics/ReportLogic.cs
View File

@ -259,8 +259,8 @@ namespace LawFirmBusinessLogic.BusinessLogics
public List<ReportClientCaseHearingViewModel> GetCaseHearing(ReportClientCaseHearingBindingModel model) public List<ReportClientCaseHearingViewModel> GetCaseHearing(ReportClientCaseHearingBindingModel model)
{ {
var list = new List<ReportClientCaseHearingViewModel>(); var list = new List<ReportClientCaseHearingViewModel>();
var clients = _clientStorage.GetFilteredList(new ClientSearchModel { ExecutorId = model.ExecutorId }); var clients = _clientStorage.GetFilteredList(new ClientSearchModel { Id = model.ClientId });
var cases = _caseStorage.GetFilteredList(new CaseSearchModel { ExecutorId = model.ExecutorId, DateFrom = model.DateFrom }); var cases = _caseStorage.GetFilteredList(new CaseSearchModel { ExecutorId = model.ExecutorId });
var hearings = _hearingStorage.GetFilteredList(new HearingSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo }); var hearings = _hearingStorage.GetFilteredList(new HearingSearchModel { DateFrom = model.DateFrom, DateTo = model.DateTo });
var visits = _visitStorage.GetFilteredList(new VisitSearchModel { ExecutorId = model.ExecutorId }); var visits = _visitStorage.GetFilteredList(new VisitSearchModel { ExecutorId = model.ExecutorId });
foreach (ClientViewModel client in clients) foreach (ClientViewModel client in clients)
@ -365,7 +365,7 @@ namespace LawFirmBusinessLogic.BusinessLogics
_saveToPdfClientCaseHearing.CreateDoc(new PDFClientCaseHearingInfo _saveToPdfClientCaseHearing.CreateDoc(new PDFClientCaseHearingInfo
{ {
FileName = model.FileName, FileName = model.FileName,
Title = "Отчёт по клиентам по делам и консультациям", Title = "Отчёт по делам и слушаниям по выбранным клиентам",
DateFrom = model.DateFrom, DateFrom = model.DateFrom,
DateTo = model.DateTo, DateTo = model.DateTo,
ClientCaseHearing = GetCaseHearing(model) ClientCaseHearing = GetCaseHearing(model)

3
LawFim/LawFirmBusinessLogic/MailWorker/MailKitWorker.cs
View File

@ -25,7 +25,8 @@ namespace LawFirmBusinessLogic.MailWorker
objMailMessage.Body = info.Text; objMailMessage.Body = info.Text;
objMailMessage.SubjectEncoding = Encoding.UTF8; objMailMessage.SubjectEncoding = Encoding.UTF8;
objMailMessage.BodyEncoding = Encoding.UTF8; objMailMessage.BodyEncoding = Encoding.UTF8;
Attachment attachment = new Attachment("D:\\Уник\\2 курс 4 семестр\\РПП\\курсач\\LawFirm\\LawFim\\LawFirmRestApi\\file4.pdf", new ContentType(MediaTypeNames.Application.Pdf)); //Attachment attachment = new Attachment("D:\\Уник\\2 курс 4 семестр\\РПП\\курсач\\LawFirm\\LawFim\\LawFirmRestApi\\file4.pdf", new ContentType(MediaTypeNames.Application.Pdf));
Attachment attachment = new Attachment("E:\\reports\\pdf\\file.pdf", new ContentType(MediaTypeNames.Application.Pdf));
objMailMessage.Attachments.Add(attachment); objMailMessage.Attachments.Add(attachment);
objSmtpClient.UseDefaultCredentials = false; objSmtpClient.UseDefaultCredentials = false;

1
LawFim/LawFirmContracts/BindingModels/ReportClientCaseHearingModel.cs
View File

@ -6,6 +6,7 @@
public DateTime DateFrom { get; set; } = DateTime.Now; public DateTime DateFrom { get; set; } = DateTime.Now;
public DateTime DateTo { get; set; } = DateTime.Now; public DateTime DateTo { get; set; } = DateTime.Now;
public int? ExecutorId { get; set; } public int? ExecutorId { get; set; }
public int? ClientId { get; set; }
public string? Email { get; set; } public string? Email { get; set; }
} }
} }

37
LawFim/LawFirmRestApi/Controllers/ReportExecutorController.cs
View File

@ -67,39 +67,30 @@ namespace LawFirmRestApi.Controllers
throw; throw;
} }
} }
//[HttpPost]
//public void MailSend(MailSendInfoBindingModel report)
//{
// try
// {
// _mailWorker.MailSendAsync(new MailSendInfoBindingModel
// {
// MailAddress = report.MailAddress,
// Subject = report.Subject,
// Text = report.Text
// });
// }
// catch (Exception ex)
// {
// _logger.LogError(ex, "Ошибка отправки письма");
// throw;
// }
//}
[HttpPost] [HttpPost]
public void SendClientReportToEmail(ReportClientCaseHearingBindingModel model) public void MailSend(ReportClientCaseHearingBindingModel report)
{ {
try try
{ {
_reportLogic.SaveClientCaseHearingToPdfFile(model); _reportLogic.SaveClientCaseHearingToPdfFile(new ReportClientCaseHearingBindingModel
{
DateFrom = report.DateFrom,
DateTo = report.DateTo,
FileName = report.FileName,
ExecutorId = report.ExecutorId,
ClientId = report.ClientId,
Email = report.Email,
});
_mailWorker.MailSendAsync(new MailSendInfoBindingModel _mailWorker.MailSendAsync(new MailSendInfoBindingModel
{ {
MailAddress = model.Email!, MailAddress = report.Email!,
Subject = "Отчет по визитам", Subject = "Отчет по выбранным клиентам с расшифровкой по слушаниям и делам",
Text = "Лови" Text = "Ваш отчет!"
}); });
} }
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Ошибка отправки письма");
throw; throw;
} }
} }