From 3ce4cf3966b23586c0027e5fc196544e1dbd9db4 Mon Sep 17 00:00:00 2001 From: mahan Date: Thu, 18 Dec 2025 13:34:31 +0330 Subject: [PATCH 1/3] add insurance print api for client --- .../IInsuranceListRepository.cs | 1 + .../IInsuranceListApplication.cs | 80 +++++++++++++++++++ .../InsuranceListApplication.cs | 5 ++ .../Repository/InsuranceListRepository.cs | 48 +++++++++++ .../Client/Controllers/InsuranceController.cs | 11 +++ 5 files changed, 145 insertions(+) diff --git a/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs b/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs index b8b95235..93d9f588 100644 --- a/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs +++ b/Company.Domain/InsuranceListAgg/IInsuranceListRepository.cs @@ -78,6 +78,7 @@ public interface IInsuranceListRepository:IRepository #endregion Task> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel); + Task ClientPrintOne(long id); } diff --git a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs index 1a36dafb..7896a271 100644 --- a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs +++ b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs @@ -5,6 +5,7 @@ using System.Text; using System.Threading.Tasks; using _0_Framework.Application; using CompanyManagment.App.Contracts.InsuranceList; +using CompanyManagment.App.Contracts.Workshop; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -96,6 +97,85 @@ public interface IInsuranceListApplication #endregion Task> GetNotCreatedWorkshop(InsuranceListSearchModel searchModel); + Task ClientPrintOne(long id); +} + +public class InsuranceClientPrintViewModel +{ + public List Items { get; set; } + public string EmployerShare { get; set; } + public string InsuredShare { get; set; } + public string UnEmploymentInsurance { get; set; } + public string AllInsuredShare { get; set; } +} +public class InsuranceClientPrintItemsViewModel +{ + /// + /// شماره بیمه + /// + public string InsuranceCode { get; set; } + /// + /// نام و نام خانوادگی + /// + public string FullName { get; set; } + /// + /// شغل + /// + public string JobName { get; set; } + /// + /// کد ملی + /// + public string NationalCode { get; set; } + /// + /// شروع به کار + /// + public string StartWork { get; set; } + /// + /// ترک کار + /// + public string LeftWork { get; set; } + /// + /// روزهای کارکرد + /// + public string WorkingDays { get; set; } + /// + /// دستمزد روزانه + /// + public string DailyWage { get; set; } + /// + /// پایه سنوات روزانه + /// + public string BaseYears { get; set; } + /// + /// دستمزد ماهانه + /// + public string MonthlySalary { get; set; } + /// + /// مزایای ماهیانه مشمول + /// + public string MonthlyBenefits { get; set; } + /// + /// حق تاهل + /// + public string MarriedAllowance { get; set; } + /// + /// حقوق و مزایای ماهیانه مشمول + /// + public string BenefitsIncludedContinuous { get; set; } + /// + /// حقوق و مزایای ماهیانه غیر مشمول + /// + public string BenefitsIncludedNonContinuous { get; set; } + /// + /// مجموع مزایای ماهیانه مشمول و غیر مشمول + /// + public string IncludedAndNotIncluded { get; set; } + /// + /// حق بیمه سهم بیمه شده + /// + public string EmployerShare { get; set; } + + } public class InsuranceClientSearchModel:PaginationRequest diff --git a/CompanyManagment.Application/InsuranceListApplication.cs b/CompanyManagment.Application/InsuranceListApplication.cs index 5a3c5fb0..d0fbb990 100644 --- a/CompanyManagment.Application/InsuranceListApplication.cs +++ b/CompanyManagment.Application/InsuranceListApplication.cs @@ -2381,5 +2381,10 @@ public class InsuranceListApplication : IInsuranceListApplication return await _insuranceListRepositpry.GetNotCreatedWorkshop(searchModel); } + public async Task ClientPrintOne(long id) + { + return await _insuranceListRepositpry.ClientPrintOne(id); + } + #endregion } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index da63d47b..0836a912 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -1960,6 +1960,54 @@ public class InsuranceListRepository : RepositoryBase, IIns return res; } + public async Task ClientPrintOne(long id) + { + var insurance = await _context.InsuranceListSet.FirstOrDefaultAsync(x => x.id == id); + if (insurance == null) + return null; + var employeeInsurance = _context.EmployeeInsurancListDataSet.Where(x=>x.InsuranceListId == insurance.id); + + var employeeIds =await employeeInsurance.Select(x=>x.EmployeeId).ToListAsync(); + var employees = await _context.Employees.Where(x => employeeIds.Contains(x.id)).ToListAsync(); + var jobIds = employeeInsurance.Select(x => x.JobId).ToList(); + var jobs = await _context.Jobs.Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x=>x.id,x=>x.JobName); + + var employeeData = employeeInsurance.ToList().Select(x => + { + var employee = employees.FirstOrDefault(e => e.id == x.EmployeeId); + return new InsuranceClientPrintItemsViewModel() + { + BaseYears = x.BaseYears.ToMoney(), + BenefitsIncludedContinuous = x.BenefitsIncludedContinuous.ToMoney(), + BenefitsIncludedNonContinuous = x.BenefitsIncludedNonContinuous.ToMoney(), + DailyWage = x.DailyWage.ToMoney(), + IncludedAndNotIncluded = (x.BenefitsIncludedNonContinuous + x.BenefitsIncludedContinuous).ToMoney(), + WorkingDays = x.WorkingDays.ToString(), + MarriedAllowance = x.MarriedAllowance.ToMoney(), + StartWork = x.StartWorkDate.ToFarsi(), + LeftWork = x.LeftWorkDate.ToFarsi(), + MonthlyBenefits = x.MonthlyBenefits.ToMoney(), + MonthlySalary = x.MonthlySalary.ToMoney(), + NationalCode = employee.NationalCode, + InsuranceCode = employee.InsuranceCode, + JobName = jobs.GetValueOrDefault(x.JobId, ""), + FullName = employee.FullName, + }; + }).ToList(); + + var result = new InsuranceClientPrintViewModel() + { + Items = employeeData.ToList(), + AllInsuredShare = (insurance.InsuredShare + + insurance.EmployerShare + + insurance.UnEmploymentInsurance).ToMoney(), + EmployerShare = insurance.EmployerShare.ToMoney(), + InsuredShare = insurance.InsuredShare.ToMoney(), + UnEmploymentInsurance = insurance.UnEmploymentInsurance.ToMoney(), + }; + return result; + } + /// /// /// diff --git a/ServiceHost/Areas/Client/Controllers/InsuranceController.cs b/ServiceHost/Areas/Client/Controllers/InsuranceController.cs index 00f8ee06..8c991778 100644 --- a/ServiceHost/Areas/Client/Controllers/InsuranceController.cs +++ b/ServiceHost/Areas/Client/Controllers/InsuranceController.cs @@ -19,4 +19,15 @@ public class InsuranceController:ClientBaseController var insurances =await _insuranceListApplication.GetInsuranceClientList(searchModel); return Ok(insurances); } + + [HttpGet("print-one")] + public async Task> ClientPrintList(long id) + { + InsuranceClientPrintViewModel res = await _insuranceListApplication.ClientPrintOne(id); + return res; + } +} + +public class InsuranceClientViewModel +{ } From 293ea0f6f427c1095767c2e4bbb44f8006181c05 Mon Sep 17 00:00:00 2001 From: mahan Date: Sat, 20 Dec 2025 10:13:13 +0330 Subject: [PATCH 2/3] feat: enhance insurance client print model with additional properties and update related logic --- .../IInsuranceListApplication.cs | 11 +- .../Repository/InsuranceListRepository.cs | 274 ++++++++++-------- 2 files changed, 157 insertions(+), 128 deletions(-) diff --git a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs index 7896a271..7964628d 100644 --- a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs +++ b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs @@ -102,11 +102,20 @@ public interface IInsuranceListApplication public class InsuranceClientPrintViewModel { + public string Monht { get; set; } + public string Year { get; set; } + public string WorkshopName { get; set; } + public string ListNo { get; set; } + public string AgreementNumber { get; set; } + public string WorkshopInsuranceCode { get; set; } + public string WorkshopEmployerName { get; set; } + public string WorkshopAddress { get; set; } public List Items { get; set; } public string EmployerShare { get; set; } public string InsuredShare { get; set; } public string UnEmploymentInsurance { get; set; } public string AllInsuredShare { get; set; } + } public class InsuranceClientPrintItemsViewModel { @@ -173,7 +182,7 @@ public class InsuranceClientPrintItemsViewModel /// /// حق بیمه سهم بیمه شده /// - public string EmployerShare { get; set; } + public string InsuranceShare { get; set; } } diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index 0836a912..82a83509 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -176,18 +176,20 @@ public class InsuranceListRepository : RepositoryBase, IIns if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney()) { checkout.SetUpdateNeeded(); - if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare)) + if (!_context.CheckoutWarningMessages.Any(x => + x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != + TypeOfCheckoutWarning.InsuranceEmployeeShare)) { var createWarrning = new CheckoutWarningMessage( - "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare); + "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", + checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare); _context.CheckoutWarningMessages.Add(createWarrning); } _context.SaveChanges(); } } - } } @@ -729,7 +731,7 @@ public class InsuranceListRepository : RepositoryBase, IIns var id = insuranceListObj.id; if (command.EmployeeInsurancListDataList != null && command.EmployeeInsurancListDataList.Count > 0) { - var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month); + var farisMonthName = Tools.ToFarsiMonthByNumber(command.Month); var checkouts = _context.CheckoutSet.Where(x => x.WorkshopId == command.WorkshopId && x.Year == command.Year && x.Month == farisMonthName && @@ -755,20 +757,21 @@ public class InsuranceListRepository : RepositoryBase, IIns if (item.InsuranceShare.ToMoney() != checkout.InsuranceDeduction.ToMoney()) { checkout.SetUpdateNeeded(); - if (!_context.CheckoutWarningMessages.Any(x => x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != TypeOfCheckoutWarning.InsuranceEmployeeShare)) + if (!_context.CheckoutWarningMessages.Any(x => + x.CheckoutId == checkout.id && x.TypeOfCheckoutWarning != + TypeOfCheckoutWarning.InsuranceEmployeeShare)) { var createWarrning = new CheckoutWarningMessage( - "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare); + "مبلغ بیمه سهم کارگر با مبلغ محاسبه شده در لیست بیمه مغایرت دارد", + checkout.id, TypeOfCheckoutWarning.InsuranceEmployeeShare); _context.CheckoutWarningMessages.Add(createWarrning); } - + _context.SaveChanges(); } } - } - } _employeeInsurancListDataRepository.SaveChanges(); @@ -1777,26 +1780,28 @@ public class InsuranceListRepository : RepositoryBase, IIns return res; } - public async Task> GetInsuranceClientList(InsuranceClientSearchModel searchModel) + public async Task> GetInsuranceClientList( + InsuranceClientSearchModel searchModel) { var workshopId = _authHelper.GetWorkshopId(); var query = _context.InsuranceListSet .Select(x => new InsuranceClientListViewModel - { - Id = x.id, - WorkShopId = x.WorkshopId, - Year = x.Year, - YearInt = Convert.ToInt32(x.Year), - Month = x.Month, - MonthName = x.Month.ToFarsiMonthByNumber(), - MonthInt = Convert.ToInt32(x.Month), - }).Where(x => x.WorkShopId == workshopId); + { + Id = x.id, + WorkShopId = x.WorkshopId, + Year = x.Year, + YearInt = Convert.ToInt32(x.Year), + Month = x.Month, + MonthName = x.Month.ToFarsiMonthByNumber(), + MonthInt = Convert.ToInt32(x.Month), + }).Where(x => x.WorkShopId == workshopId); - if (searchModel.Year>0) + if (searchModel.Year > 0) { query = query.Where(x => x.YearInt == searchModel.Year); - } + } + if (searchModel.Month > 0) { query = query.Where(x => x.MonthInt == searchModel.Month); @@ -1816,7 +1821,7 @@ public class InsuranceListRepository : RepositoryBase, IIns "Year-Min" => query.OrderBy(x => x.YearInt), _ => query.OrderByDescending(x => x.Id), }; - res.List =await query.ApplyPagination(searchModel.PageIndex,searchModel.PageSize).ToListAsync(); + res.List = await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync(); return res; } @@ -1846,41 +1851,41 @@ public class InsuranceListRepository : RepositoryBase, IIns .Include(x => x.LeftWorkInsurances) .Where(x => x.LeftWorkInsurances.Any(l => l.StartWorkDate <= firstDayOfMonth && (l.LeftWorkDate == null || l.LeftWorkDate >= firstDayOfMonth))); - - - var query = notCreatedWorkshop.Select(result=>new InsuranceListViewModel - { - Year = searchModel.Year, - Month = searchModel.Month, - WorkShopId = result.id, - WorkShopCode = result.InsuranceWorkshopInfo != null - ? result.InsuranceWorkshopInfo.InsuranceCode - : result.InsuranceCode, - WorkShopName = result.InsuranceWorkshopInfo != null - ? result.InsuranceWorkshopInfo.WorkshopName - : result.WorkshopFullName, - TypeOfInsuranceSend = result.TypeOfInsuranceSend == "NormalList" ? "عادی" : - result.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" : - result.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "", - FixedSalary = result.FixedSalary, - StrFixedSalary = result.FixedSalary ? "دارد" : "ندارد", - EmployerName = result.InsuranceWorkshopInfo != null - ? result.InsuranceWorkshopInfo.EmployerName - : result.WorkshopFullName, - Branch = "", - City = "", - ArchiveCode = result.ArchiveCode, - }); - - - if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0") - query = query.Where(x => x.Month == searchModel.Month).OrderByDescending(x => x.WorkShopName) - .ThenByDescending(x => x.EmployerName).ThenByDescending(x => x.Year); - if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0") - query = query.Where(x => x.Year == searchModel.Year).OrderByDescending(x => x.EmployerName) - .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month); - + + var query = notCreatedWorkshop.Select(result => new InsuranceListViewModel + { + Year = searchModel.Year, + Month = searchModel.Month, + WorkShopId = result.id, + WorkShopCode = result.InsuranceWorkshopInfo != null + ? result.InsuranceWorkshopInfo.InsuranceCode + : result.InsuranceCode, + WorkShopName = result.InsuranceWorkshopInfo != null + ? result.InsuranceWorkshopInfo.WorkshopName + : result.WorkshopFullName, + TypeOfInsuranceSend = result.TypeOfInsuranceSend == "NormalList" ? "عادی" : + result.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" : + result.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "", + FixedSalary = result.FixedSalary, + StrFixedSalary = result.FixedSalary ? "دارد" : "ندارد", + EmployerName = result.InsuranceWorkshopInfo != null + ? result.InsuranceWorkshopInfo.EmployerName + : result.WorkshopFullName, + Branch = "", + City = "", + ArchiveCode = result.ArchiveCode, + }); + + + if (!string.IsNullOrEmpty(searchModel.Month) && searchModel.Month != "0") + query = query.Where(x => x.Month == searchModel.Month).OrderByDescending(x => x.WorkShopName) + .ThenByDescending(x => x.EmployerName).ThenByDescending(x => x.Year); + + if (!string.IsNullOrEmpty(searchModel.Year) && searchModel.Year != "0") + query = query.Where(x => x.Year == searchModel.Year).OrderByDescending(x => x.EmployerName) + .ThenByDescending(x => x.WorkShopName).ThenByDescending(x => x.Month); + if (!string.IsNullOrEmpty(searchModel.WorkShopCode)) query = query.Where(x => x.WorkShopCode == searchModel.WorkShopCode).OrderByDescending(x => x.Year) @@ -1925,37 +1930,37 @@ public class InsuranceListRepository : RepositoryBase, IIns var workshopList = await query.Skip(searchModel.PageIndex).Take(30).ToListAsync(); - var workshopIds = workshopList.Select(x=>x.WorkShopId); - - var employers =await _context.WorkshopEmployers - .Where(x=>workshopIds.Contains(x.WorkshopId)) - .GroupBy(x=>x.WorkshopId) - .Select(x=>x.First()).ToListAsync(); - - var res = workshopList.Select(x => - { - var employer = employers.FirstOrDefault(e => e.WorkshopId ==x.WorkShopId)?.Employer; - - return new InsuranceListViewModel - { - WorkShopId = x.WorkShopId, - WorkShopCode = x.WorkShopCode, - WorkShopName = x.WorkShopName, - EmployerName = employer != null - ? employer.FullName - : (x.EmployerName), - Year = searchModel.Year, - Month = searchModel.Month, - TypeOfInsuranceSend = x.TypeOfInsuranceSend == "NormalList" ? "عادی" : - x.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" : - x.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "", - FixedSalary = (bool)x.FixedSalary, - StrFixedSalary = (bool)x.FixedSalary ? "دارد" : "ندارد", - EmployerId = employer?.id ?? 0, - ArchiveCode = x.ArchiveCode, - City = x.City, - }; - }).ToList(); + var workshopIds = workshopList.Select(x => x.WorkShopId); + + var employers = await _context.WorkshopEmployers + .Where(x => workshopIds.Contains(x.WorkshopId)) + .GroupBy(x => x.WorkshopId) + .Select(x => x.First()).ToListAsync(); + + var res = workshopList.Select(x => + { + var employer = employers.FirstOrDefault(e => e.WorkshopId == x.WorkShopId)?.Employer; + + return new InsuranceListViewModel + { + WorkShopId = x.WorkShopId, + WorkShopCode = x.WorkShopCode, + WorkShopName = x.WorkShopName, + EmployerName = employer != null + ? employer.FullName + : (x.EmployerName), + Year = searchModel.Year, + Month = searchModel.Month, + TypeOfInsuranceSend = x.TypeOfInsuranceSend == "NormalList" ? "عادی" : + x.TypeOfInsuranceSend == "Govermentlist" ? "کمک دولت" : + x.TypeOfInsuranceSend == "Familylist" ? "خانوادگی" : "", + FixedSalary = (bool)x.FixedSalary, + StrFixedSalary = (bool)x.FixedSalary ? "دارد" : "ندارد", + EmployerId = employer?.id ?? 0, + ArchiveCode = x.ArchiveCode, + City = x.City, + }; + }).ToList(); return res; } @@ -1965,47 +1970,62 @@ public class InsuranceListRepository : RepositoryBase, IIns var insurance = await _context.InsuranceListSet.FirstOrDefaultAsync(x => x.id == id); if (insurance == null) return null; - var employeeInsurance = _context.EmployeeInsurancListDataSet.Where(x=>x.InsuranceListId == insurance.id); - - var employeeIds =await employeeInsurance.Select(x=>x.EmployeeId).ToListAsync(); - var employees = await _context.Employees.Where(x => employeeIds.Contains(x.id)).ToListAsync(); - var jobIds = employeeInsurance.Select(x => x.JobId).ToList(); - var jobs = await _context.Jobs.Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x=>x.id,x=>x.JobName); - - var employeeData = employeeInsurance.ToList().Select(x => + + var employeeInsurance = _context.EmployeeInsurancListDataSet.Where(x => x.InsuranceListId == insurance.id); + + var workshop = await _context.Workshops + .Include(x => x.InsuranceWorkshopInfo) + .FirstOrDefaultAsync(x => x.id == insurance.WorkshopId); + + var employeeIds = await employeeInsurance.Select(x => x.EmployeeId).ToListAsync(); + var employees = await _context.Employees.Where(x => employeeIds.Contains(x.id)).ToListAsync(); + var jobIds = employeeInsurance.Select(x => x.JobId).ToList(); + var jobs = await _context.Jobs.Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x => x.id, x => x.JobName); + + var employeeData = employeeInsurance.ToList().Select(x => + { + var employee = employees.FirstOrDefault(e => e.id == x.EmployeeId); + return new InsuranceClientPrintItemsViewModel() { - var employee = employees.FirstOrDefault(e => e.id == x.EmployeeId); - return new InsuranceClientPrintItemsViewModel() - { - BaseYears = x.BaseYears.ToMoney(), - BenefitsIncludedContinuous = x.BenefitsIncludedContinuous.ToMoney(), - BenefitsIncludedNonContinuous = x.BenefitsIncludedNonContinuous.ToMoney(), - DailyWage = x.DailyWage.ToMoney(), - IncludedAndNotIncluded = (x.BenefitsIncludedNonContinuous + x.BenefitsIncludedContinuous).ToMoney(), - WorkingDays = x.WorkingDays.ToString(), - MarriedAllowance = x.MarriedAllowance.ToMoney(), - StartWork = x.StartWorkDate.ToFarsi(), - LeftWork = x.LeftWorkDate.ToFarsi(), - MonthlyBenefits = x.MonthlyBenefits.ToMoney(), - MonthlySalary = x.MonthlySalary.ToMoney(), - NationalCode = employee.NationalCode, - InsuranceCode = employee.InsuranceCode, - JobName = jobs.GetValueOrDefault(x.JobId, ""), - FullName = employee.FullName, - }; - }).ToList(); - - var result = new InsuranceClientPrintViewModel() - { - Items = employeeData.ToList(), - AllInsuredShare = (insurance.InsuredShare + - insurance.EmployerShare + - insurance.UnEmploymentInsurance).ToMoney(), - EmployerShare = insurance.EmployerShare.ToMoney(), - InsuredShare = insurance.InsuredShare.ToMoney(), - UnEmploymentInsurance = insurance.UnEmploymentInsurance.ToMoney(), - }; - return result; + BaseYears = x.BaseYears.ToMoney(), + BenefitsIncludedContinuous = x.BenefitsIncludedContinuous.ToMoney(), + BenefitsIncludedNonContinuous = x.BenefitsIncludedNonContinuous.ToMoney(), + DailyWage = x.DailyWage.ToMoney(), + IncludedAndNotIncluded = (x.BenefitsIncludedNonContinuous + x.BenefitsIncludedContinuous).ToMoney(), + WorkingDays = x.WorkingDays.ToString(), + MarriedAllowance = x.MarriedAllowance.ToMoney(), + StartWork = x.StartWorkDate.ToFarsi(), + LeftWork = x.LeftWorkDate.ToFarsi(), + MonthlyBenefits = x.MonthlyBenefits.ToMoney(), + MonthlySalary = x.MonthlySalary.ToMoney(), + NationalCode = employee.NationalCode, + InsuranceCode = employee.InsuranceCode, + JobName = jobs.GetValueOrDefault(x.JobId, ""), + FullName = employee.FullName, + InsuranceShare = x.InsuranceShare.ToMoney(), + }; + }).ToList(); + + var result = new InsuranceClientPrintViewModel() + { + Items = employeeData.ToList(), + AllInsuredShare = (insurance.InsuredShare + + insurance.EmployerShare + + insurance.UnEmploymentInsurance).ToMoney(), + EmployerShare = insurance.EmployerShare.ToMoney(), + InsuredShare = insurance.InsuredShare.ToMoney(), + UnEmploymentInsurance = insurance.UnEmploymentInsurance.ToMoney(), + WorkshopName = workshop.InsuranceWorkshopInfo.WorkshopName, + WorkshopAddress = workshop.InsuranceWorkshopInfo.Address, + WorkshopEmployerName = workshop.InsuranceWorkshopInfo.EmployerName, + WorkshopInsuranceCode = workshop.InsuranceWorkshopInfo.InsuranceCode, + AgreementNumber = workshop.InsuranceWorkshopInfo.AgreementNumber, + ListNo = "01", + Monht = insurance.Month, + Year = insurance.Year + + }; + return result; } /// From 8e5d4c312ee9eb7f1eae06c683a74f44c8a4eeb3 Mon Sep 17 00:00:00 2001 From: mahan Date: Sun, 21 Dec 2025 11:03:23 +0330 Subject: [PATCH 3/3] fix: correct spelling of 'Month' and enhance insurance client list retrieval with additional properties --- .../IInsuranceListApplication.cs | 9 +- .../Repository/InsuranceListRepository.cs | 98 +++++++++++++------ 2 files changed, 75 insertions(+), 32 deletions(-) diff --git a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs index 7964628d..1a44d328 100644 --- a/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs +++ b/CompanyManagment.App.Contracts/InsuranceList/IInsuranceListApplication.cs @@ -102,7 +102,7 @@ public interface IInsuranceListApplication public class InsuranceClientPrintViewModel { - public string Monht { get; set; } + public string Month { get; set; } public string Year { get; set; } public string WorkshopName { get; set; } public string ListNo { get; set; } @@ -202,4 +202,11 @@ public class InsuranceClientListViewModel public int YearInt { get; set; } public string MonthName { get; set; } public int MonthInt { get; set; } + public int PersonnelCount { get; set; } + public int LeftWorkCount { get; set; } + public string AllInsuredShare { get; set; } + public string InsuredShare { get; set; } + public string EmployerShare { get; set; } + public string UnEmploymentInsurance { get; set; } + } \ No newline at end of file diff --git a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs index 82a83509..1402df2e 100644 --- a/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs +++ b/CompanyManagment.EFCore/Repository/InsuranceListRepository.cs @@ -1785,6 +1785,39 @@ public class InsuranceListRepository : RepositoryBase, IIns { var workshopId = _authHelper.GetWorkshopId(); var query = _context.InsuranceListSet + .Where(x => x.WorkshopId == workshopId); + + + if (searchModel.Year > 0) + { + query = query.Where(x => x.Year == searchModel.Year.ToString("0000")); + } + + if (searchModel.Month > 0) + { + query = query.Where(x => x.Month == searchModel.Month.ToString("00")); + } + + var res = new PagedResult + { + TotalCount = query.Count() + }; + + var list = (await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync()); + + var insuranceListIds = list.Select(x => x.id).ToList(); + + var employeeData = await _context.EmployeeInsurancListDataSet + .Where(x => insuranceListIds.Contains(x.InsuranceListId)) + .GroupBy(x => x.InsuranceListId) + .Select(g => new + { + g.Key, + Count = g.Count(x=>x.LeftWorkDate != null) + }).ToListAsync(); + + + var resList = list .Select(x => new InsuranceClientListViewModel { Id = x.id, @@ -1794,34 +1827,29 @@ public class InsuranceListRepository : RepositoryBase, IIns Month = x.Month, MonthName = x.Month.ToFarsiMonthByNumber(), MonthInt = Convert.ToInt32(x.Month), - }).Where(x => x.WorkShopId == workshopId); - - - if (searchModel.Year > 0) + EmployerShare = x.EmployerShare.ToMoney(), + InsuredShare = x.InsuredShare.ToMoney(), + UnEmploymentInsurance = x.UnEmploymentInsurance.ToMoney(), + PersonnelCount = x.SumOfEmployees, + AllInsuredShare = (x.InsuredShare + + x.EmployerShare + + x.UnEmploymentInsurance).ToMoney(), + LeftWorkCount =employeeData.FirstOrDefault(e=>e.Key == x.id)?.Count ?? 0, + }).ToList(); + + resList = searchModel.Sorting switch { - query = query.Where(x => x.YearInt == searchModel.Year); - } - - if (searchModel.Month > 0) - { - query = query.Where(x => x.MonthInt == searchModel.Month); - } - - var res = new PagedResult - { - TotalCount = query.Count() + "CreationDate-Max" => resList.OrderByDescending(x => x.Id).ToList(), + "CreationDate-Min" => resList.OrderBy(x => x.Id).ToList(), + "Month-Max" => resList.OrderByDescending(x => x.MonthInt).ToList(), + "Month-Min" => resList.OrderBy(x => x.MonthInt).ToList(), + "Year-Max" => resList.OrderByDescending(x => x.YearInt).ToList(), + "Year-Min" => resList.OrderBy(x => x.YearInt).ToList(), + _ => resList.OrderByDescending(x => x.Id).ToList(), }; - query = searchModel.Sorting switch - { - "CreationDate-Max" => query.OrderByDescending(x => x.Id), - "CreationDate-Min" => query.OrderBy(x => x.Id), - "Month-Max" => query.OrderByDescending(x => x.MonthInt), - "Month-Min" => query.OrderBy(x => x.MonthInt), - "Year-Max" => query.OrderByDescending(x => x.YearInt), - "Year-Min" => query.OrderBy(x => x.YearInt), - _ => query.OrderByDescending(x => x.Id), - }; - res.List = await query.ApplyPagination(searchModel.PageIndex, searchModel.PageSize).ToListAsync(); + + + res.List = resList; return res; } @@ -1968,19 +1996,27 @@ public class InsuranceListRepository : RepositoryBase, IIns public async Task ClientPrintOne(long id) { var insurance = await _context.InsuranceListSet.FirstOrDefaultAsync(x => x.id == id); + if (insurance == null) return null; - var employeeInsurance = _context.EmployeeInsurancListDataSet.Where(x => x.InsuranceListId == insurance.id); + var employeeInsurance = _context.EmployeeInsurancListDataSet + .Where(x => x.InsuranceListId == insurance.id); var workshop = await _context.Workshops .Include(x => x.InsuranceWorkshopInfo) .FirstOrDefaultAsync(x => x.id == insurance.WorkshopId); - var employeeIds = await employeeInsurance.Select(x => x.EmployeeId).ToListAsync(); - var employees = await _context.Employees.Where(x => employeeIds.Contains(x.id)).ToListAsync(); + var employeeIds = await employeeInsurance + .Select(x => x.EmployeeId).ToListAsync(); + + var employees = await _context.Employees + .Where(x => employeeIds.Contains(x.id)).ToListAsync(); + var jobIds = employeeInsurance.Select(x => x.JobId).ToList(); - var jobs = await _context.Jobs.Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x => x.id, x => x.JobName); + + var jobs = await _context.Jobs + .Where(x => jobIds.Contains(x.id)).ToDictionaryAsync(x => x.id, x => x.JobName); var employeeData = employeeInsurance.ToList().Select(x => { @@ -2021,7 +2057,7 @@ public class InsuranceListRepository : RepositoryBase, IIns WorkshopInsuranceCode = workshop.InsuranceWorkshopInfo.InsuranceCode, AgreementNumber = workshop.InsuranceWorkshopInfo.AgreementNumber, ListNo = "01", - Monht = insurance.Month, + Month = insurance.Month, Year = insurance.Year };