fix bugs and add tomam for salaryAid calculation date

This commit is contained in:
MahanCh
2025-05-10 19:50:01 +03:30
parent 802f9a39c5
commit cebb525968
3 changed files with 28 additions and 4 deletions

View File

@@ -352,6 +352,15 @@ public class CustomizeWorkshopSettingsApplication(ICustomizeWorkshopSettingsRepo
return op.Failed("گروه انتخاب شده نا معتبر است");
}
if (_customizeWorkshopEmployeeSettingsRepository
.Exists(x => x.WorkshopId == command.WorkshopId && command.EmployeeIds.Contains(x.EmployeeId)))
{
foreach (var employeeId in command.EmployeeIds)
{
_customizeWorkshopEmployeeSettingsRepository.RemoveByWorkshopIdAndEmployeeId(command.WorkshopId, employeeId);
}
}
if (customizeWorkshopGroupSettings.MainGroup)
{
var createDefaultEmployee = CreateEmployeeSettings(command);

View File

@@ -165,6 +165,7 @@ public class LoanApplication : ILoanApplication
}
_loanRepository.SaveChanges();
transaction.Complete();
return op.Succcedded();
}

View File

@@ -220,14 +220,28 @@ namespace ServiceHost.Areas.AdminNew.Pages.Company.AndroidApk
//Console.WriteLine("endStep 1 ============");
//SetRollCall(r1);
await RefactorEmployeeDocumentItem();
await ChangeIsConfirmed();
await RemoveEmployeeClientTemps();
await SetCalculationDateInSalaryAid();
ViewData["message"] = "تومام دو";
return Page();
}
private async System.Threading.Tasks.Task SetCalculationDateInSalaryAid()
{
var salaryAids = await _context.SalaryAids.ToListAsync();
foreach (var salaryAid in salaryAids)
{
var calculationDate = salaryAid.SalaryAidDateTime;
var calculationMonth = Convert.ToInt32(calculationDate.ToFarsiMonth());
var calculationYear = Convert.ToInt32(calculationDate.ToFarsiYear());
salaryAid.Edit(salaryAid.Amount,salaryAid.SalaryAidDateTime,0,UserType.Anonymous,calculationMonth, calculationYear);
}
await _context.SaveChangesAsync();
}
private async System.Threading.Tasks.Task RemoveEmployeeClientTemps()
{
var employeeDocuments = _context.EmployeeDocuments