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

change kabise 365 counter

Browse Source
This commit is contained in:
SamSys
2025-05-06 20:16:32 +03:30
parent 92d36f2966
commit fc18985334
2 changed files with 32 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
0_Framework/Application/Tools.cs
View File

@@ -598,90 +598,90 @@ public static class Tools
/// <returns></returns>
public static int YearTotalDays(this string date)
{
int y2 = 365;
int y2 = 366;
var year = Convert.ToInt32(date.Substring(0, 4));
switch (year)
{
case 1346:
y2 = 366;
y2 = 367;
break;
case 1350:
y2 = 366;
y2 = 367;
break;
case 1354:
y2 = 366;
y2 = 367;
break;
case 1358:
y2 = 366;
y2 = 367;
break;
case 1362:
y2 = 366;
y2 = 367;
break;
case 1366:
y2 = 366;
y2 = 367;
break;
case 1370:
y2 = 366;
y2 = 367;
break;
case 1375:
y2 = 366;
y2 = 367;
break;
case 1379:
y2 = 366;
y2 = 367;
break;
case 1383:
y2 = 366;
y2 = 367;
break;
case 1387:
y2 = 366;
y2 = 367;
break;
case 1391:
y2 = 366;
y2 = 367;
break;
case 1395:
y2 = 366;
y2 = 367;
break;
case 1399:
y2 = 366;
y2 = 367;
break;
case 1403:
y2 = 366;
y2 = 367;
break;
case 1408:
y2 = 366;
y2 = 367;
break;
case 1412:
y2 = 366;
y2 = 367;
break;
case 1416:
y2 = 366;
y2 = 367;
break;
case 1420:
y2 = 366;
y2 = 367;
break;
case 1424:
y2 = 366;
y2 = 367;
break;
case 1428:
y2 = 366;
y2 = 367;
break;
case 1432:
y2 = 366;
y2 = 367;
break;
case 1436:
y2 = 366;
y2 = 367;
break;
case 1441:
y2 = 366;
y2 = 367;
break;
case 1445:
y2 = 366;
y2 = 367;
break;
default:
y2 = 365;
y2 = 366;
break;
}

6
CompanyManagment.EFCore/Repository/YearlySalaryRepository.cs
View File

@@ -791,7 +791,7 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
string finalResultMoney = string.Empty;
double FinalResult = 0;
int DayCounter = 0;
int Max365 = 365;
int Max365 = 366;
double Basic = 0;
double BaseResult = 0;
DateTime periodStarter = new DateTime();
@@ -838,6 +838,8 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
//مقدار اولیه مزد روزانه
var DayliSalaryStep1Fa = DayliSalaryStep1.ToMoney();
double firstDayliSalary = DayliSalaryStep1Fa.MoneyToDouble();
DateTime baseYearDate = new DateTime();
for (DateTime LoopDate = getWork; LoopDate <= endDateW; LoopDate = LoopDate.AddDays(1))
{
@@ -867,6 +869,8 @@ public class YearlySalaryRepository : RepositoryBase<long, YearlySalary>, IYearl
}
//اگر تاریخ جاری بزرگتر یت مساوی تاریخ شروع ترک کار و کوچکتر یا مساوی تاریخ پایان ترک کار بود
if (LoopDateGr >= startPeriod && LoopDateGr <= endtPeriod)
{