From 20c00893b6916d528d92001bb0e542daea0921ad Mon Sep 17 00:00:00 2001 From: mahan Date: Sat, 20 Dec 2025 14:23:23 +0330 Subject: [PATCH] feat: add API endpoint for printing contract details and enhance contract print logic --- .../ContractApplication.cs | 2 + .../Repository/ContractRepository.cs | 75 ++++++++++++++++++- .../Client/Controllers/ContractController.cs | 7 ++ 3 files changed, 80 insertions(+), 4 deletions(-) diff --git a/CompanyManagment.Application/ContractApplication.cs b/CompanyManagment.Application/ContractApplication.cs index 4229d01e..c8ed4524 100644 --- a/CompanyManagment.Application/ContractApplication.cs +++ b/CompanyManagment.Application/ContractApplication.cs @@ -2712,7 +2712,9 @@ public class ContractApplication : IContractApplication var emp = workshopEmpList.Where(x => x.WorkshopId == res.WorkshopIds) .Select(x => x.EmployerId).ToList(); + res.Employers = _employerRepository.GetEmployers(emp); + var workshopSelect = _workshopApplication.GetDetails(res.WorkshopIds); var workshop = new WorkshopViewModel() { diff --git a/CompanyManagment.EFCore/Repository/ContractRepository.cs b/CompanyManagment.EFCore/Repository/ContractRepository.cs index 66991e45..08a8a43f 100644 --- a/CompanyManagment.EFCore/Repository/ContractRepository.cs +++ b/CompanyManagment.EFCore/Repository/ContractRepository.cs @@ -5,6 +5,7 @@ using System.Globalization; using System.Linq; using System.Threading.Tasks; using _0_Framework.Application; +using _0_Framework.Application.Enums; using _0_Framework.Exceptions; using _0_Framework.InfraStructure; using Company.Domain.ContractAgg; @@ -1627,14 +1628,80 @@ public class ContractRepository : RepositoryBase, IContractRepos .Include(x => x.Employee).Where(x => ids.Contains(x.id)) .ToListAsync(); - var res = query.Select(x=> + var workshopIds = query.Select(x => x.WorkshopIds).Distinct().ToList(); + + var workshops = await _context.Workshops + .Where(x => workshopIds.Contains(x.id)) + .ToListAsync(); + + List exceptionWorkshops = [516,63,38,39]; + var res = query.Select(x => { - var employer = + var workshop = workshops.FirstOrDefault(w => w.id == x.WorkshopIds); + + var employerRes = new ContractPrintEmployerViewModel() + { + WorkshopName = workshop!.WorkshopName, + Address =$"{workshop.State} - {workshop.City} - {workshop.Address}", + LegalType = x.Employer.IsLegal == "حقیقی" ? LegalType.Real : LegalType.Legal, + LegalEmployer = x.Employer.IsLegal == "حقیقی" + ? null + : new ContractPrintLegalEmployerViewModel() + { + NationalId = x.Employer.NationalId, + RegisterId = x.Employer.RegisterId, + CompanyName = x.Employer.LName, + }, + RealEmployer = x.Employer.IsLegal == "حقیقی" + ? new ContractPrintRealEmployerViewModel() + { + FullName = x.Employer.FullName, + IdNumber = x.Employer.IdNumber, + NationalCode = x.Employer.Nationalcode + } + : null, + + }; + var employeeRes = new ContractPrintEmployeeViewModel() + { + Address =$"{x.Employee.State} - {x.Employee.City} - {x.Employee.Address}" , + FullName = x.Employee.FullName, + IdNumber = x.Employee.IdNumber, + NationalCode = x.Employee.NationalCode, + DateOfBirth = x.Employee.DateOfBirth.ToFarsi(), + FatherName = x.Employee.FatherName, + LevelOfEducation = x.Employee.LevelOfEducation + }; + + var typeOfContract = new ContractPrintTypeOfContractViewModel() + { + ContarctStart = x.ContarctStart.ToFarsi(), + ContractEnd = x.ContractEnd.ToFarsi(), + JobName = x.JobType, + ContractType = x.ContractType, + SetContractDate = x.SetContractDate.ToFarsi(), + WorkingHoursWeekly = WeeklyHourConvertor(x.WorkingHoursWeekly), + WorkshopAddress = [x.WorkshopAddress1, x.WorkshopAddress2], + }; + ContractPrintFeesViewModel fees= new ContractPrintFeesViewModel() + { + DailyWage = x.DayliWage, + FamilyAllowance = x.FamilyAllowance, + HousingAllowance = x.HousingAllowance, + ConsumableItems = x.ConsumableItems, + }; return new ContractPrintViewModel() { - Employer = + Employer = employerRes, + Employee = employeeRes, + TypeOfContract = typeOfContract, + Fees = fees, + ContractNo = x.ContractNo, + ConditionAndDetials = exceptionWorkshops.Contains(x.WorkshopIds) ? "بر اساس ماده 190 قانون کار جمهوری اسلامی ایران ، پرسنل اقرار مینماید کلیه مبالغ پیش بینی شده در قانون کار را وفق قرارداد منعقده دریافت مینماید. این مبالغ قسمتی بصورت مستقیم از سوی کارفرما و قسمتی بر اساس شرایط کارگاه از محل درآمد حاصله از مشتری اخذ میگردد . با توجه به شرایط کارگاه کلیه مبالغ بصورت واریز به حساب و وجه نقد رایج کشور ، تواما به پرسنل پرداخت میگردد. امضا تصفیه حساب دارای مبالغ ، توسط پرسنل نشانگر تصفیه قطعی ایشان میباشد.": "", + }; - }) + }).ToList(); + return res; } #endregion diff --git a/ServiceHost/Areas/Client/Controllers/ContractController.cs b/ServiceHost/Areas/Client/Controllers/ContractController.cs index 95d24437..523289e1 100644 --- a/ServiceHost/Areas/Client/Controllers/ContractController.cs +++ b/ServiceHost/Areas/Client/Controllers/ContractController.cs @@ -24,4 +24,11 @@ public class ContractController:ClientBaseController return res; } + [HttpGet("print/{id}")] + public async Task> PrintOne(long id) + { + var res = await _contractApplication.PrintOneAsync(id); + return res; + } + } \ No newline at end of file