admin/Backend-Api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add salary and loan checkout

Browse Source
This commit is contained in:
MahanCh
2025-04-23 15:34:01 +03:30
parent 9f42af6a23
commit 8dd9ee508a
6 changed files with 136 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Company.Domain/CheckoutAgg/Checkout.cs
View File

@@ -1,6 +1,10 @@
using System;
using System.Collections;
using System.Collections.Generic;
using _0_Framework.Application;
using _0_Framework.Domain;
using Company.Domain.CheckoutAgg.ValueObjects;
using Company.Domain.CustomizeCheckoutAgg.ValueObjects;
using Company.Domain.WorkshopAgg;
namespace Company.Domain.CheckoutAgg;
@@ -21,7 +25,11 @@ public class Checkout : EntityBase
double salaryAidDeduction, double absenceDeduction, string sumOfWorkingDays
, string archiveCode, string personnelCode,
string totalClaims, string totalDeductions, double totalPayment, string signature, double marriedAllowance, bool leaveCheckout,
double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue, string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue, string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute)
double creditLeaves, double absencePeriod, double averageHoursPerDay, bool hasRollCall, string overTimeWorkvalue,
string overNightWorkValue, string fridayWorkValue, string rotatingShifValue, string absenceValue,
string totalDayOfLeaveCompute, string totalDayOfYearsCompute, string totalDayOfBunosesCompute,
ICollection<CheckoutLoanInstallment> loanInstallments,
ICollection<CheckoutSalaryAid> salaryAids)
{
EmployeeFullName = employeeFullName;
FathersName = fathersName;
@@ -78,6 +86,8 @@ public class Checkout : EntityBase
TotalDayOfLeaveCompute = totalDayOfLeaveCompute;
TotalDayOfYearsCompute = totalDayOfYearsCompute;
TotalDayOfBunosesCompute = totalDayOfBunosesCompute;
LoanInstallments = loanInstallments;
SalaryAids = salaryAids;
}
public string EmployeeFullName { get; private set; }
@@ -181,7 +191,15 @@ public class Checkout : EntityBase
/// </summary>
public string TotalDayOfBunosesCompute { get; private set; }
public Workshop Workshop { get; set; }
#region valueObjects
public ICollection<CheckoutLoanInstallment> LoanInstallments { get; set; } = [];
public ICollection<CheckoutSalaryAid> SalaryAids { get; set; } = [];
#endregion
public Workshop Workshop { get; set; }
//public WorkingHours WorkingHours { get; set; }
public void Edit(string employeeFullName, string fathersName, string nationalCode, string dateOfBirth,

23
Company.Domain/CheckoutAgg/ValueObjects/CheckoutLoanInstallment.cs Normal file
View File

@@ -0,0 +1,23 @@
using _0_Framework.Application;
namespace Company.Domain.CheckoutAgg.ValueObjects;
public class CheckoutLoanInstallment
{
public CheckoutLoanInstallment(string amountForMonth, string month, string year, IsActive isActive, string loanRemaining, string loanAmount)
{
AmountForMonth = amountForMonth;
Month = month;
Year = year;
IsActive = isActive;
LoanRemaining = loanRemaining;
LoanAmount = loanAmount;
}
public string AmountForMonth { get; private set; }
public string Month { get; private set; }
public string Year { get; private set; }
public string LoanRemaining { get; set; }
public IsActive IsActive { get; private set; }
public string LoanAmount { get; set; }
}

22
Company.Domain/CheckoutAgg/ValueObjects/CheckoutSalaryAid.cs Normal file
View File

@@ -0,0 +1,22 @@
using System;
using AccountManagement.Domain.AccountAgg;
namespace Company.Domain.CheckoutAgg.ValueObjects;
public class CheckoutSalaryAid
{
public CheckoutSalaryAid(string amount, DateTime salaryAidDateTime, string salaryAidDateTimeFa, DateTime calculationDateTime, string calculationDateTimeFa)
{
Amount = amount;
SalaryAidDateTime = salaryAidDateTime;
SalaryAidDateTimeFa = salaryAidDateTimeFa;
CalculationDateTime = calculationDateTime;
CalculationDateTimeFa = calculationDateTimeFa;
}
public string Amount { get; private set; }
public DateTime SalaryAidDateTime { get; private set; }
public string SalaryAidDateTimeFa { get; private set; }
public DateTime CalculationDateTime { get; private set; }
public string CalculationDateTimeFa { get; private set; }
}

6
Company.Domain/Company.Domain.csproj
View File

@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
@@ -14,4 +14,8 @@
<ProjectReference Include="..\CompanyManagment.App.Contracts\CompanyManagment.App.Contracts.csproj" />
</ItemGroup>
<ItemGroup>
<Folder Include="CheckoutAgg\ValueObjects\" />
</ItemGroup>
</Project>

16
CompanyManagment.App.Contracts/Contract/ComputingViewModel.cs
View File

@@ -1,5 +1,7 @@
using System;
using System.Collections.Generic;
using CompanyManagment.App.Contracts.Loan;
using CompanyManagment.App.Contracts.SalaryAid;
using CompanyManagment.App.Contracts.WorkingHoursTemp;
namespace CompanyManagment.App.Contracts.Contract;
@@ -39,5 +41,19 @@ public class ComputingViewModel
/// <summary>
/// مساعده
/// </summary>
public double SalaryAidDeduction { get; set; }
/// <summary>
/// قسط وام
/// </summary>
public double InstallmentDeduction { get; set; }
public List<LoanInstallmentViewModel> InstallmentViewModels { get; set; }
public List<SalaryAidViewModel> SalaryAidViewModels { get; set; }
//public List<string> holidays;
}

80
CompanyManagment.EFCore/Repository/RollCallMandatoryRepository.cs
View File

@@ -557,6 +557,35 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#endregion
#region SalaryAidDeduction
var salaryAidViewModel = GetCheckoutSalaryAids(employeeId, workshopId, contractStart, contractEnd);
double salaryAidDeduction = salaryAidViewModel.Sum(x => x.AmountDouble);
#endregion
#region Loan
var loanInstallments = _context.Loans
.Where(x => x.EmployeeId == employeeId && x.WorkshopId == workshopId)
.SelectMany(x => x.LoanInstallments)
.Where(i => i.InstallmentDate > contractStart && i.InstallmentDate < contractEnd && i.IsActive == IsActive.True)
.Select(x => new LoanInstallmentViewModel()
{
Month = x.Month,
IsActive = x.IsActive,
Amount = x.AmountForMonth.ToMoney(),
Year = x.Year,
AmountDouble = x.AmountForMonth,
RemainingAmount = _context.Loans.SelectMany(l => l.LoanInstallments).Where(i => i.LoanId == x.LoanId && i.IsActive == IsActive.True && i.InstallmentDate > x.InstallmentDate)
.Sum(i => i.AmountForMonth).ToMoney()
}).ToList();
double loanDeduction = loanInstallments.Sum(x => x.AmountDouble);
#endregion
#region Result
var res = new ComputingViewModel()
@@ -587,7 +616,11 @@ CreateWorkingHoursTemp command, bool holidayWorking)
TotalHolidayAndNotM = totalHolidaysAndNotM.ToString(),
DayliFeeComplete = dayliFeeComplete,
MarriedAllowance = MarriedAllowanceStr,
RotatingShiftValue = shiftPayValue
RotatingShiftValue = shiftPayValue,
InstallmentDeduction = loanDeduction,
InstallmentViewModels = loanInstallments,
SalaryAidDeduction = salaryAidDeduction,
SalaryAidViewModels = salaryAidViewModel
};
#endregion
@@ -1276,14 +1309,7 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#endregion
#region SalaryAidDeduction
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.SalaryAidDateTime >= contractStart && x.SalaryAidDateTime <= contractEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
AmountDouble = x.Amount,
SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
SalaryAidDateTimeGe = x.SalaryAidDateTime,
}).ToList();
var salaryAidViewModel = GetCheckoutSalaryAids(employeeId, workshopId, contractStart, contractEnd);
double salaryAidDeduction = salaryAidViewModel.Sum(x => x.AmountDouble);
#endregion
@@ -2078,17 +2104,7 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#region SalaryAidDeduction
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.CalculationDate >= checkoutStart && x.CalculationDate <= checkoutEnd &&
x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
AmountDouble = x.Amount,
SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
SalaryAidDateTimeGe = x.SalaryAidDateTime,
CalculationDateTimeGe = x.CalculationDate,
CalculationDateTimeFa = x.CalculationDate.ToFarsi()
}).ToList();
var salaryAidViewModel = GetCheckoutSalaryAids(employeeId, workshopId, checkoutStart, checkoutEnd);
double salaryAidDeduction = salaryAidViewModel.Sum(x => x.AmountDouble);
#endregion
@@ -2635,16 +2651,8 @@ CreateWorkingHoursTemp command, bool holidayWorking)
#region SalaryAidDeduction
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.SalaryAidDateTime >= contractStart && x.SalaryAidDateTime <= contractEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
AmountDouble = x.Amount,
SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
SalaryAidDateTimeGe = x.SalaryAidDateTime,
CalculationDateTimeGe = x.CalculationDate,
CalculationDateTimeFa = x.CalculationDate.ToFarsi()
}).ToList();
var salaryAidViewModel = GetCheckoutSalaryAids(employeeId, workshopId, contractStart, contractEnd);
double salaryAidDeduction = salaryAidViewModel.Sum(x => x.AmountDouble);
#endregion
@@ -2724,6 +2732,18 @@ CreateWorkingHoursTemp command, bool holidayWorking)
};
}
private List<SalaryAidViewModel> GetCheckoutSalaryAids(long employeeId, long workshopId, DateTime contractStart, DateTime contractEnd)
{
var salaryAidViewModel = _context.SalaryAids
.Where(x => x.SalaryAidDateTime >= contractStart && x.SalaryAidDateTime <= contractEnd && x.EmployeeId == employeeId && x.WorkshopId == workshopId).Select(x => new SalaryAidViewModel()
{
Amount = x.Amount.ToMoney(),
AmountDouble = x.Amount,
SalaryAidDateTimeFa = x.SalaryAidDateTime.ToFarsi(),
SalaryAidDateTimeGe = x.SalaryAidDateTime,
}).ToList();
return salaryAidViewModel;
}
private void CreateRewardForBirthDay(long employeeId, long workshopId, double amount, int month, int year,
DateTime contractStart)
{