diff --git a/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs b/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs
index 023fadff..d8e2c3a7 100644
--- a/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs
+++ b/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs
@@ -42,8 +42,39 @@ public class PersonalContractingParty : EntityBase
public string IsActiveString { get; private set; }
public string IsBlock { get; private set; }
+
public int BlockTimes {get; private set; }
+ #region NewProps
+
+ ///
+ /// سری شناسنامه
+ ///
+ public string IdNumberSeri { get; private set; }
+
+ ///
+ /// سریال شناسنامه
+ ///
+ public string IdNumberSerial { get; private set; }
+
+ ///
+ /// نام پدر
+ ///
+ public string FatherName { get; private set; }
+
+ ///
+ /// تاریخ تولد
+ ///
+ public DateTime? DateOfBirth { get; private set; }
+
+ ///
+ /// آیا از طریق ای پی ای احراز هویت شده است
+ ///
+ public bool IsAuthenticated { get; private set; }
+
+ #endregion
+
+
public List Employers { get; private set; }
public Representative Representative { get; set; }
@@ -159,5 +190,8 @@ public class PersonalContractingParty : EntityBase
this.IsActiveString = "false";
}
-
+ public void Authenticated()
+ {
+ IsAuthenticated = true;
+ }
}
\ No newline at end of file
diff --git a/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs b/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs
index c9cc1026..4a32f49a 100644
--- a/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs
+++ b/Company.Domain/LeftWorkAgg/ILeftWorkRepository.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using System.Threading.Tasks;
using _0_Framework.Application;
using _0_Framework.Domain;
using CompanyManagment.App.Contracts.LeftWork;
@@ -41,5 +42,7 @@ public interface ILeftWorkRepository : IRepository
bool IsEmployeeWorkingInDates(long employeeId, long workshopId, List<(DateTime, DateTime)> dates);
List GetByWorkshopIdInDates(long workshopId, DateTime startDateGr, DateTime endDateGr);
LeftWorkViewModel GetByWorkshopIdEmployeeIdInDates(long workshopId, long employeeId, DateTime start, DateTime end);
- #endregion
+ #endregion
+
+ Task GetLastLeftWork(long employeeId, long workshopId);
}
\ No newline at end of file
diff --git a/Company.Domain/ReportAgg/IReportRepository.cs b/Company.Domain/ReportAgg/IReportRepository.cs
index a1c0a17f..7615bbf7 100644
--- a/Company.Domain/ReportAgg/IReportRepository.cs
+++ b/Company.Domain/ReportAgg/IReportRepository.cs
@@ -9,20 +9,24 @@ namespace Company.Domain.ReportAgg
{
public interface IReportRepository
{
- AllReport GetAllActiveWorkshopsNew(string year, string month);
+ Task GetAllActiveWorkshopsNew(string year, string month);
AllReport GetAllActiveWorkshops(string year, string month);
- WorkshopResult GetWorkshopContractDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId);
+ WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List workshopList);
List GetEmployeeContract(string year, string month, long workshopId);
List GetEmployeeContractSign(string year, string month, long workshopId);
List GetEmployeeCheckout(string year, string month, long workshopId);
List GetEmployeeCheckoutSign(string year, string month, long workshopId);
- PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId);
+ PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+ List workshopList);
}
diff --git a/Company.Domain/RollCallAgg/RollCall.cs b/Company.Domain/RollCallAgg/RollCall.cs
index 5abc3971..4865c05b 100644
--- a/Company.Domain/RollCallAgg/RollCall.cs
+++ b/Company.Domain/RollCallAgg/RollCall.cs
@@ -481,21 +481,25 @@ namespace Company.Domain.RollCallAgg
internal void SetEarlyEnter(TimeSpan earlyEntryDuration)
{
EarlyEntryDuration = earlyEntryDuration;
+ LateEntryDuration = TimeSpan.Zero;
}
internal void SetLateEnter(TimeSpan lateEntryDuration)
{
LateEntryDuration = lateEntryDuration;
+ EarlyEntryDuration = TimeSpan.Zero;
}
internal void SetEarlyExit(TimeSpan earlyExit)
{
EarlyExitDuration = earlyExit;
+ LateExitDuration = TimeSpan.Zero;
}
internal void SetLateExit(TimeSpan lateExitDuration)
{
LateExitDuration = lateExitDuration;
+ EarlyExitDuration = TimeSpan.Zero;
}
public void setStartAndEnd(DateTime start, DateTime end, IRollCallDomainService service)
diff --git a/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs b/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs
new file mode 100644
index 00000000..b72758d3
--- /dev/null
+++ b/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs
@@ -0,0 +1,96 @@
+using System;
+using _0_Framework.Application;
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public class ContractingPartyTemp : EntityBase
+{
+ public ContractingPartyTemp(string fName, string lName, string nationalCode, string idNumber, string phone, string fatherName, string state, string city, string address, string idNumberSeri, string idNumberSerial, Gender gender, DateTime dateOfBirth)
+ {
+ FName = fName;
+ LName = lName;
+ NationalCode = nationalCode;
+ IdNumber = idNumber;
+ Phone = phone;
+ FatherName = fatherName;
+ State = state;
+ City = city;
+ Address = address;
+ IdNumberSeri = idNumberSeri;
+ IdNumberSerial = idNumberSerial;
+ Gender = gender;
+ DateOfBirth = dateOfBirth;
+ }
+
+ ///
+ /// نام
+ ///
+ public string FName { get; private set; }
+ ///
+ /// نام خانوادگی
+ ///
+ public string LName { get; private set; }
+
+ ///
+ /// نام پدر
+ ///
+ public string FatherName { get; private set; }
+
+ ///
+ /// جنسیت
+ ///
+ public Gender Gender { get; private set; }
+
+ ///
+ /// کد ملی
+ ///
+ public string NationalCode { get; private set; }
+
+ ///
+ ///تاریخ تولد
+ ///
+ public DateTime DateOfBirth { get; private set; }
+
+ ///
+ /// سری شناسنامه
+ ///
+ public string IdNumberSeri { get; private set; }
+
+ ///
+ /// سریال شناسنامه
+ ///
+ public string IdNumberSerial { get; private set; }
+
+
+ ///
+ /// شماره شناسنامه
+ ///
+ public string IdNumber { get; private set; }
+
+
+
+ ///
+ /// شماره همراه
+ ///
+ public string Phone { get; private set; }
+
+
+ ///
+ /// استان
+ ///
+ public string State { get; private set; }
+
+ ///
+ /// شهر
+ ///
+ public string City { get; private set; }
+
+ ///
+ /// نشانی
+ ///
+ public string Address { get; private set; }
+
+
+
+}
\ No newline at end of file
diff --git a/Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTempRepository.cs b/Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTempRepository.cs
new file mode 100644
index 00000000..9b27b72d
--- /dev/null
+++ b/Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTempRepository.cs
@@ -0,0 +1,8 @@
+using _0_Framework.Domain;
+
+namespace Company.Domain.TemporaryClientRegistrationAgg;
+
+public interface IContractingPartyTempRepository :IRepository
+{
+ (long id, bool IsAuthenticated) CheckExistOrAuthenticated(string nationalCode);
+}
\ No newline at end of file
diff --git a/CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs b/CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs
index a3635607..c2e955b2 100644
--- a/CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs
+++ b/CompanyManagment.App.Contracts/PersonalContractingParty/PersonalContractingPartyViewModel.cs
@@ -44,6 +44,7 @@ public class PersonalContractingPartyViewModel
public string IsActiveString { get; set; }
public string IsBlock { get; set; }
public int BlockTimes { get; set; }
+ public bool IsAuthenticated { get; set; }
public List EmployerList { get; set; }
}
\ No newline at end of file
diff --git a/CompanyManagment.App.Contracts/Report/AccountResults.cs b/CompanyManagment.App.Contracts/Report/AccountResults.cs
index 7453c901..cfcdce5a 100644
--- a/CompanyManagment.App.Contracts/Report/AccountResults.cs
+++ b/CompanyManagment.App.Contracts/Report/AccountResults.cs
@@ -7,6 +7,8 @@ public class AccountResults
public long AccountId { get; set; }
public string AccountFullName { get; set; }
+ public List WorkshopList { get; set; }
+
//public int ContractToBe { get; set; }
//public int CheckoutoBe { get; set; }
diff --git a/CompanyManagment.App.Contracts/Report/IReportApplication.cs b/CompanyManagment.App.Contracts/Report/IReportApplication.cs
index fa00a026..754371fe 100644
--- a/CompanyManagment.App.Contracts/Report/IReportApplication.cs
+++ b/CompanyManagment.App.Contracts/Report/IReportApplication.cs
@@ -8,19 +8,23 @@ namespace CompanyManagment.App.Contracts.Report
{
public interface IReportApplication
{
- AllReport GetAllActiveWorkshops(string year, string month);
- AllReport GetAllReports(string year, string month);
- WorkshopResult GetWorkshopContractDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId);
- WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId);
+ Task GetAllActiveWorkshops(string year, string month);
+ Task GetAllReports(string year, string month);
+ WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List workshopList);
+ WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List workshopList);
List GetEmployeeContract(string year, string month, long workshopId);
List GetEmployeeContractSign(string year, string month, long workshopId);
List GetEmployeeCheckout(string year, string month, long workshopId);
List GetEmployeeCheckoutSign(string year, string month, long workshopId);
- PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId);
- PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId);
+ PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
+ List workshopList);
+ PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+ List workshopList);
}
}
diff --git a/CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs b/CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs
index 90ef6c02..e03f42fa 100644
--- a/CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs
+++ b/CompanyManagment.App.Contracts/RollCallEmployee/RollCallEmployeeViewModel.cs
@@ -15,8 +15,7 @@ public class RollCallEmployeeViewModel : EditRollCallEmployee
public string PersonName { get; set; }
public bool ContractPerson { get; set; }
public bool InsurancePerson { get; set; }
- public long WorkshopId { get; set; }
- public long EmployeeId { get; set; }
+
public bool ContractLeft { get; set; }
public bool InsurancetLeft { get; set; }
public bool Black { get; set; }
diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ContractingPartyTempViewModel.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ContractingPartyTempViewModel.cs
new file mode 100644
index 00000000..b5d6dd68
--- /dev/null
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ContractingPartyTempViewModel.cs
@@ -0,0 +1,6 @@
+namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+public class ContractingPartyTempViewModel : CreateContractingPartyTemp
+{
+ public long Id { get; set; }
+}
\ No newline at end of file
diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateContractingPartyTemp.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateContractingPartyTemp.cs
new file mode 100644
index 00000000..b7cf1d67
--- /dev/null
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/CreateContractingPartyTemp.cs
@@ -0,0 +1,78 @@
+using _0_Framework.Application;
+using System;
+using System.Drawing.Interop;
+
+namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+
+
+public class CreateContractingPartyTemp
+{
+ ///
+ /// نام
+ ///
+ public string FName { get; set; }
+ ///
+ /// نام خانوادگی
+ ///
+ public string LName { get; set; }
+
+ ///
+ /// نام پدر
+ ///
+ public string FatherName { get; set; }
+
+ ///
+ /// جنسیت
+ ///
+ public Gender Gender { get; set; }
+
+ ///
+ /// کد ملی
+ ///
+ public string NationalCode { get; set; }
+
+ ///
+ ///تاریخ تولد
+ ///
+ public DateTime DateOfBirth { get; set; }
+
+ ///
+ /// سری شناسنامه
+ ///
+ public string IdNumberSeri { get; set; }
+
+ ///
+ /// سریال شناسنامه
+ ///
+ public string IdNumberSerial { get; set; }
+
+
+ ///
+ /// شماره شناسنامه
+ ///
+ public string IdNumber { get; set; }
+
+
+
+ ///
+ /// شماره همراه
+ ///
+ public string Phone { get; set; }
+
+
+ ///
+ /// استان
+ ///
+ public string State { get; set; }
+
+ ///
+ /// شهر
+ ///
+ public string City { get; set; }
+
+ ///
+ /// نشانی
+ ///
+ public string Address { get; set; }
+}
\ No newline at end of file
diff --git a/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs
new file mode 100644
index 00000000..c829e5f2
--- /dev/null
+++ b/CompanyManagment.App.Contracts/TemporaryClientRegistration/ITemporaryClientRegistrationApplication.cs
@@ -0,0 +1,8 @@
+using _0_Framework.Application;
+
+namespace CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+public interface ITemporaryClientRegistrationApplication
+{
+ OperationResult CreateContractingPartyTemp(CreateContractingPartyTemp command);
+}
\ No newline at end of file
diff --git a/CompanyManagment.Application/InsuranceListApplication.cs b/CompanyManagment.Application/InsuranceListApplication.cs
index 43338b16..42191c42 100644
--- a/CompanyManagment.Application/InsuranceListApplication.cs
+++ b/CompanyManagment.Application/InsuranceListApplication.cs
@@ -439,6 +439,11 @@ public class InsuranceListApplication: IInsuranceListApplication
//محاسبه مزایای ماهانه
var monthlyBenefits = GetMonthlyBenefits(endOfMonth, yearlysaleries.ConsumableItems, yearlysaleries.HousingAllowance, marriedAllowance, workingDays.countWorkingDays, searchModel.TypeOfInsuranceSendWorkshop, employee.JobId, employee.EmployeeId,employee.IncludeStatus);
+
+ //if (employee.EmployeeId is 7999)// سید عباس خوشکلام سلیمان
+ // monthlyBenefits = 80869389;
+ //if (employee.EmployeeId is 43787)// شهرام براهیمی سیقلان
+ // monthlyBenefits = 54748472;
var marriedAllowanceCompute = MarriedAllowance(employee.MaritalStatus, employee.JobId, employee.IncludeStatus,
diff --git a/CompanyManagment.Application/ReportApplication.cs b/CompanyManagment.Application/ReportApplication.cs
index e9314166..9940deeb 100644
--- a/CompanyManagment.Application/ReportApplication.cs
+++ b/CompanyManagment.Application/ReportApplication.cs
@@ -18,35 +18,35 @@ public class ReportApplication : IReportApplication
_reportRepository = reportRepository;
}
- public AllReport GetAllActiveWorkshops(string year, string month)
+ public async Task GetAllActiveWorkshops(string year, string month)
{
- return _reportRepository.GetAllActiveWorkshops(year, month);
+ return await _reportRepository.GetAllActiveWorkshopsNew(year, month);
}
- public AllReport GetAllReports(string year, string month)
+ public async Task GetAllReports(string year, string month)
{
- return _reportRepository.GetAllActiveWorkshops(year, month);
+ return await _reportRepository.GetAllActiveWorkshopsNew(year, month);
}
- public WorkshopResult GetWorkshopContractDone(string year, string month, long accountId)
+ public WorkshopResult GetWorkshopContractDone(string year, string month, long accountId, List workshopList)
{
- return _reportRepository.GetWorkshopContractDone(year, month, accountId);
+ return _reportRepository.GetWorkshopContractDone(year, month, accountId, workshopList);
}
- public WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId)
+ public WorkshopResult GetWorkshopContractSignDone(string year, string month, long accountId, List workshopList)
{
- return _reportRepository.GetWorkshopContractSignDone(year, month, accountId);
+ return _reportRepository.GetWorkshopContractSignDone(year, month, accountId, workshopList);
}
- public WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId)
+ public WorkshopResult GetWorkshopCheckoutDone(string year, string month, long accountId, List workshopList)
{
- return _reportRepository.GetWorkshopCheckoutDone(year, month, accountId);
+ return _reportRepository.GetWorkshopCheckoutDone(year, month, accountId, workshopList);
}
- public WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId)
+ public WorkshopResult GetWorkshopCheckoutSignDone(string year, string month, long accountId, List workshopList)
{
- return _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId);
+ return _reportRepository.GetWorkshopCheckoutSignDone(year, month, accountId, workshopList);
}
public List GetEmployeeContract(string year, string month, long workshopId)
@@ -71,21 +71,25 @@ public class ReportApplication : IReportApplication
#region Print
- public PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId)
+ public PrintAllContractCheckout GetPrintAllContractDone(string year, string month, long accountId,
+ List workshopList)
{
- return _reportRepository.GetPrintAllContractDone(year, month, accountId);
+ return _reportRepository.GetPrintAllContractDone(year, month, accountId, workshopList);
}
- public PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId)
+ public PrintAllContractCheckout GetPrintAllContractSignDone(string year, string month, long accountId,
+ List workshopList)
{
- return _reportRepository.GetPrintAllContractSignDone(year, month, accountId);
+ return _reportRepository.GetPrintAllContractSignDone(year, month, accountId, workshopList);
}
- public PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId)
+ public PrintAllContractCheckout GetPrintAllCheckoutDone(string year, string month, long accountId,
+ List workshopList)
{
- return _reportRepository.GetPrintAllCheckoutDone(year, month, accountId);
+ return _reportRepository.GetPrintAllCheckoutDone(year, month, accountId, workshopList);
}
- public PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId)
+ public PrintAllContractCheckout GetPrintAllCheckoutSignDone(string year, string month, long accountId,
+ List workshopList)
{
- return _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId);
+ return _reportRepository.GetPrintAllCheckoutSignDone(year, month, accountId, workshopList);
}
#endregion
diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs
index 7dd5fdaf..65e66394 100644
--- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs
+++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs
@@ -44,10 +44,7 @@ namespace CompanyManagment.Application
if (!_leftWorkRepository.Exists(x =>
x.EmployeeId == rollCallEmployee.EmployeeId && x.WorkshopId == rollCallEmployee.WorkshopId &&
- x.StartWorkDate <= DateTime.Now && x.LeftWorkDate > DateTime.Now) &&
- !_leftWorkInsuranceRepository.Exists(x =>
- x.EmployeeId == rollCallEmployee.EmployeeId && x.WorkshopId == rollCallEmployee.WorkshopId &&
- x.StartWorkDate <= DateTime.Now && (x.LeftWorkDate > DateTime.Now || x.LeftWorkDate == null)) &&
+ x.StartWorkDate <= DateTime.Now && x.LeftWorkDate > DateTime.Now) &&
!_leftWorkTempRepository.Exists(x =>
x.EmployeeId == rollCallEmployee.EmployeeId && x.WorkshopId == rollCallEmployee.WorkshopId &&
x.LeftWorkType == LeftWorkTempType.StartWork))
@@ -67,7 +64,21 @@ namespace CompanyManagment.Application
}
else
{
- RollCallEmployeeStatus newRecord = new(rollCallEmployee.id, DateTime.Now.Date);
+ var pc = new PersianCalendar();
+ var startStatus = DateTime.Today;
+ LeftWork leftWork =
+ _leftWorkRepository.GetLastLeftWork(rollCallEmployee.EmployeeId, rollCallEmployee.WorkshopId).GetAwaiter().GetResult();
+
+ if (leftWork.StartWorkDate > DateTime.Today)
+ startStatus = leftWork.StartWorkDate;
+
+ //else if(pc.GetMonth(DateTime.Today) == pc.GetMonth(leftWork.StartWorkDate))
+ //{
+ // startStatus = new DateTime(pc.GetYear(leftWork.StartWorkDate), pc.GetMonth(leftWork.StartWorkDate),
+ // 1, pc);
+ //}
+
+ RollCallEmployeeStatus newRecord = new(rollCallEmployee.id, startStatus);
_employeeRollCallStatusRepository.Create(newRecord);
}
@@ -86,12 +97,18 @@ namespace CompanyManagment.Application
//368 پیتزا امیر آماده سازی
//367 پیتزا امیر رستوران
//286 مرکز توان بخشی رسالت
- bool skipRollCall = workshopId is 11 or 585 or 604 or 605 or 368 or 367 or 286;
+ bool skipRollCallByWorkshopId = workshopId is 11 or 585 or 604 or 605 or 368 or 367 or 286;
-#if DEBUG
- skipRollCall = workshopId is 11 or 585 or 604 or 605 or 368 or 367;
-#endif
- if (skipRollCall)
+ //#if DEBUG
+ // skipRollCallByWorkshopId = workshopId is 11 or 585 or 604 or 605 or 368 or 367;
+ //#endif
+ if (skipRollCallByWorkshopId)
+ return false;
+
+
+ // 42550 مصطفی مقدس نژاد فومنی
+ bool skipRollCallByEmployeeId = employeeId is 42550;
+ if (skipRollCallByEmployeeId)
return false;
diff --git a/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
new file mode 100644
index 00000000..5f90e96f
--- /dev/null
+++ b/CompanyManagment.Application/TemporaryClientRegistrationApplication.cs
@@ -0,0 +1,24 @@
+using _0_Framework.Application;
+using Company.Domain.ContarctingPartyAgg;
+using Company.Domain.TemporaryClientRegistrationAgg;
+using CompanyManagment.App.Contracts.TemporaryClientRegistration;
+
+namespace CompanyManagment.Application;
+
+public class TemporaryClientRegistrationApplication : ITemporaryClientRegistrationApplication
+{
+ private readonly IContractingPartyTempRepository _contractingPartyTempRepository;
+ private readonly IPersonalContractingPartyRepository _personalContractingPartyRepository;
+
+ public TemporaryClientRegistrationApplication(IContractingPartyTempRepository contractingPartyTempRepository, IPersonalContractingPartyRepository personalContractingPartyRepository)
+ {
+ _contractingPartyTempRepository = contractingPartyTempRepository;
+ _personalContractingPartyRepository = personalContractingPartyRepository;
+ }
+
+ public OperationResult CreateContractingPartyTemp(CreateContractingPartyTemp command)
+ {
+
+ throw new System.NotImplementedException();
+ }
+}
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Mapping/ContractingPartyTempMapping.cs b/CompanyManagment.EFCore/Mapping/ContractingPartyTempMapping.cs
new file mode 100644
index 00000000..7d7f6ebd
--- /dev/null
+++ b/CompanyManagment.EFCore/Mapping/ContractingPartyTempMapping.cs
@@ -0,0 +1,32 @@
+using System;
+using _0_Framework.Application;
+using Company.Domain.TemporaryClientRegistrationAgg;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace CompanyManagment.EFCore.Mapping;
+
+public class ContractingPartyTempMapping : IEntityTypeConfiguration
+{
+ public void Configure(EntityTypeBuilder builder)
+ {
+ builder.ToTable("ContractingPartyTemp");
+ builder.HasKey(x => x.id);
+
+ builder.Property(x => x.FName).HasMaxLength(25).IsRequired();
+ builder.Property(x => x.LName).HasMaxLength(25).IsRequired();
+ builder.Property(x => x.NationalCode).HasMaxLength(10).IsRequired();
+ builder.Property(x => x.IdNumber).HasMaxLength(10).IsRequired(false);
+ builder.Property(x => x.Phone).HasMaxLength(12);
+ builder.Property(x => x.FatherName).HasMaxLength(25);
+ builder.Property(x => x.State).HasMaxLength(35);
+ builder.Property(x => x.City).HasMaxLength(35);
+ builder.Property(x => x.Address).HasMaxLength(500);
+ builder.Property(x => x.IdNumberSeri).HasMaxLength(5);
+ builder.Property(x => x.IdNumberSerial).HasMaxLength(15);
+ builder.Property(x => x.Gender).HasConversion(
+ v => v.ToString(),
+ v => (Gender)Enum.Parse(typeof(Gender), v)).HasMaxLength(6);
+ builder.Property(x => x.DateOfBirth);
+ }
+}
\ No newline at end of file
diff --git a/CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs b/CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs
index 00e2ab0d..d943862b 100644
--- a/CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs
+++ b/CompanyManagment.EFCore/Mapping/PersonalContractingpartyMapping.cs
@@ -31,6 +31,16 @@ public class PersonalContractingpartyMapping : IEntityTypeConfiguration x.IsBlock).HasMaxLength(5);
builder.Property(x => x.BlockTimes);
+ #region NewProp
+
+ builder.Property(x => x.IdNumberSeri).HasMaxLength(5);
+ builder.Property(x => x.IdNumberSerial).HasMaxLength(15);
+ builder.Property(x => x.FatherName).HasMaxLength(20);
+ builder.Property(x => x.DateOfBirth).IsRequired(false);
+
+
+ #endregion
+
diff --git a/CompanyManagment.EFCore/Migrations/20250316125105_'addNewPropToContractingParty'.Designer.cs b/CompanyManagment.EFCore/Migrations/20250316125105_'addNewPropToContractingParty'.Designer.cs
new file mode 100644
index 00000000..37c62b80
--- /dev/null
+++ b/CompanyManagment.EFCore/Migrations/20250316125105_'addNewPropToContractingParty'.Designer.cs
@@ -0,0 +1,8829 @@
+//
+using System;
+using CompanyManagment.EFCore;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Infrastructure;
+using Microsoft.EntityFrameworkCore.Metadata;
+using Microsoft.EntityFrameworkCore.Migrations;
+using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
+
+#nullable disable
+
+namespace CompanyManagment.EFCore.Migrations
+{
+ [DbContext(typeof(CompanyContext))]
+ [Migration("20250316125105_'addNewPropToContractingParty'")]
+ partial class addNewPropToContractingParty
+ {
+ ///
+ protected override void BuildTargetModel(ModelBuilder modelBuilder)
+ {
+#pragma warning disable 612, 618
+ modelBuilder
+ .HasAnnotation("ProductVersion", "8.0.10")
+ .HasAnnotation("Relational:MaxIdentifierLength", 128);
+
+ SqlServerModelBuilderExtensions.UseIdentityColumns(modelBuilder);
+
+ modelBuilder.Entity("Company.Domain.AndroidApkVersionAgg.AndroidApkVersion", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("IsActive")
+ .IsRequired()
+ .HasMaxLength(5)
+ .HasColumnType("nvarchar(5)");
+
+ b.Property("Path")
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.Property("Title")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("VersionCode")
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("VersionName")
+ .HasMaxLength(35)
+ .HasColumnType("nvarchar(35)");
+
+ b.HasKey("id");
+
+ b.ToTable("AndroidApkVersions", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.BankAgg.Bank", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("BankLogoMediaId")
+ .HasColumnType("bigint");
+
+ b.Property("BankName")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("id");
+
+ b.ToTable("Banks", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.BillAgg.EntityBill", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("Appointed")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Contact")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Description")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("IsActiveString")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("ProcessingStage")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("SubjectBill")
+ .IsRequired()
+ .HasMaxLength(500)
+ .HasColumnType("nvarchar(500)");
+
+ b.HasKey("id");
+
+ b.ToTable("TextManager_Bill", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.Board.Board", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("BoardChairman")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("BoardType_Id")
+ .HasColumnType("int");
+
+ b.Property("Branch")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("DisputeResolutionPetitionDate")
+ .HasColumnType("datetime2");
+
+ b.Property("ExpertReport")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("File_Id")
+ .HasColumnType("bigint");
+
+ b.HasKey("id");
+
+ b.HasIndex("BoardType_Id");
+
+ b.HasIndex("File_Id");
+
+ b.ToTable("Boards", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.BoardType.BoardType", b =>
+ {
+ b.Property("Id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("int");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("Id"));
+
+ b.Property("Title")
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("Id");
+
+ b.ToTable("BoardTypes", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ChapterAgg.EntityChapter", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("Chapter")
+ .IsRequired()
+ .HasMaxLength(60)
+ .HasColumnType("nvarchar(60)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("IsActiveString")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Subtitle_Id")
+ .HasColumnType("bigint");
+
+ b.HasKey("id");
+
+ b.HasIndex("Subtitle_Id");
+
+ b.ToTable("TextManager_Chapter", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.CheckoutAgg.Checkout", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("AbsenceDeduction")
+ .HasColumnType("float");
+
+ b.Property("AbsencePeriod")
+ .HasColumnType("float");
+
+ b.Property("AbsenceValue")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("ArchiveCode")
+ .HasMaxLength(15)
+ .HasColumnType("nvarchar(15)");
+
+ b.Property("AverageHoursPerDay")
+ .HasColumnType("float");
+
+ b.Property("BaseYearsPay")
+ .HasColumnType("float");
+
+ b.Property("BonusesPay")
+ .HasColumnType("float");
+
+ b.Property("ConsumableItems")
+ .HasColumnType("float");
+
+ b.Property("ContractEnd")
+ .HasColumnType("datetime2");
+
+ b.Property("ContractId")
+ .HasColumnType("bigint");
+
+ b.Property("ContractNo")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ContractStart")
+ .HasColumnType("datetime2");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("CreditLeaves")
+ .HasColumnType("float");
+
+ b.Property("DateOfBirth")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("EmployeeFullName")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("EmployeeId")
+ .HasColumnType("bigint");
+
+ b.Property("FamilyAllowance")
+ .HasColumnType("float");
+
+ b.Property("FathersName")
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("FridayPay")
+ .HasColumnType("float");
+
+ b.Property("FridayWorkValue")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("HasRollCall")
+ .HasColumnType("bit");
+
+ b.Property("HousingAllowance")
+ .HasColumnType("float");
+
+ b.Property("InstallmentDeduction")
+ .HasColumnType("float");
+
+ b.Property("InsuranceDeduction")
+ .HasColumnType("float");
+
+ b.Property("IsActiveString")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("LeaveCheckout")
+ .HasColumnType("bit");
+
+ b.Property("LeavePay")
+ .HasColumnType("float");
+
+ b.Property("MarriedAllowance")
+ .HasColumnType("float");
+
+ b.Property("MissionPay")
+ .HasColumnType("float");
+
+ b.Property("Month")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("MonthlySalary")
+ .HasColumnType("float");
+
+ b.Property("NationalCode")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("NightworkPay")
+ .HasColumnType("float");
+
+ b.Property("OverNightWorkValue")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("OverTimeWorkValue")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("OvertimePay")
+ .HasColumnType("float");
+
+ b.Property("PersonnelCode")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("RewardPay")
+ .HasColumnType("float");
+
+ b.Property("RotatingShiftValue")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("SalaryAidDeduction")
+ .HasColumnType("float");
+
+ b.Property("ShiftPay")
+ .HasColumnType("float");
+
+ b.Property("Signature")
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("SumOfWorkingDays")
+ .HasMaxLength(6)
+ .HasColumnType("nvarchar(6)");
+
+ b.Property("TaxDeducation")
+ .HasColumnType("float");
+
+ b.Property("TotalClaims")
+ .HasMaxLength(25)
+ .HasColumnType("nvarchar(25)");
+
+ b.Property("TotalDayOfBunosesCompute")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("TotalDayOfLeaveCompute")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("TotalDayOfYearsCompute")
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("TotalDeductions")
+ .HasMaxLength(25)
+ .HasColumnType("nvarchar(25)");
+
+ b.Property("TotalPayment")
+ .HasColumnType("float");
+
+ b.Property("WorkingHoursId")
+ .HasColumnType("bigint");
+
+ b.Property("WorkshopId")
+ .HasColumnType("bigint");
+
+ b.Property("WorkshopName")
+ .HasMaxLength(70)
+ .HasColumnType("nvarchar(70)");
+
+ b.Property("Year")
+ .HasMaxLength(4)
+ .HasColumnType("nvarchar(4)");
+
+ b.Property("YearsPay")
+ .HasColumnType("float");
+
+ b.HasKey("id");
+
+ b.HasIndex("WorkshopId");
+
+ b.ToTable("Checkouts", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ClassifiedSalaryAgg.ClassifiedSalary", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("EndDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Group1")
+ .HasColumnType("float");
+
+ b.Property("Group10")
+ .HasColumnType("float");
+
+ b.Property("Group11")
+ .HasColumnType("float");
+
+ b.Property("Group12")
+ .HasColumnType("float");
+
+ b.Property("Group13")
+ .HasColumnType("float");
+
+ b.Property("Group14")
+ .HasColumnType("float");
+
+ b.Property("Group15")
+ .HasColumnType("float");
+
+ b.Property("Group16")
+ .HasColumnType("float");
+
+ b.Property("Group17")
+ .HasColumnType("float");
+
+ b.Property("Group18")
+ .HasColumnType("float");
+
+ b.Property("Group19")
+ .HasColumnType("float");
+
+ b.Property("Group2")
+ .HasColumnType("float");
+
+ b.Property("Group20")
+ .HasColumnType("float");
+
+ b.Property("Group3")
+ .HasColumnType("float");
+
+ b.Property("Group4")
+ .HasColumnType("float");
+
+ b.Property("Group5")
+ .HasColumnType("float");
+
+ b.Property("Group6")
+ .HasColumnType("float");
+
+ b.Property("Group7")
+ .HasColumnType("float");
+
+ b.Property("Group8")
+ .HasColumnType("float");
+
+ b.Property("Group9")
+ .HasColumnType("float");
+
+ b.Property("StartDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Year")
+ .HasColumnType("int");
+
+ b.HasKey("id");
+
+ b.ToTable("ClassifiedSalaries", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ClientEmployeeWorkshopAgg.ClientEmployeeWorkshop", b =>
+ {
+ b.Property("WorkshopId")
+ .HasColumnType("bigint");
+
+ b.Property("EmployeeId")
+ .HasColumnType("bigint");
+
+ b.HasKey("WorkshopId", "EmployeeId");
+
+ b.HasIndex("EmployeeId");
+
+ b.ToTable("ClientWorkshopEmployee", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.Contact2Agg.EntityContact", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("IsActiveString")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("NameContact")
+ .HasColumnType("nvarchar(max)");
+
+ b.Property("Signature")
+ .HasColumnType("nvarchar(max)");
+
+ b.HasKey("id");
+
+ b.ToTable("TextManager_Contact", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ContarctingPartyAgg.PersonalContractingParty", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("Address")
+ .HasMaxLength(500)
+ .HasColumnType("nvarchar(500)");
+
+ b.Property("AgentPhone")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ArchiveCode")
+ .HasColumnType("int");
+
+ b.Property("BlockTimes")
+ .HasColumnType("int");
+
+ b.Property("City")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("DateOfBirth")
+ .HasColumnType("datetime2");
+
+ b.Property("FName")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("FatherName")
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("IdNumber")
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("IdNumberSeri")
+ .HasMaxLength(5)
+ .HasColumnType("nvarchar(5)");
+
+ b.Property("IdNumberSerial")
+ .HasMaxLength(15)
+ .HasColumnType("nvarchar(15)");
+
+ b.Property("IsActiveString")
+ .HasMaxLength(5)
+ .HasColumnType("nvarchar(5)");
+
+ b.Property("IsAuthenticated")
+ .HasColumnType("bit");
+
+ b.Property("IsBlock")
+ .HasMaxLength(5)
+ .HasColumnType("nvarchar(5)");
+
+ b.Property("IsLegal")
+ .IsRequired()
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("LName")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("NationalId")
+ .IsRequired()
+ .HasMaxLength(15)
+ .HasColumnType("nvarchar(15)");
+
+ b.Property("Nationalcode")
+ .IsRequired()
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("Phone")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("RegisterId")
+ .IsRequired()
+ .HasMaxLength(15)
+ .HasColumnType("nvarchar(15)");
+
+ b.Property("RepresentativeFullName")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("RepresentativeId")
+ .HasColumnType("bigint");
+
+ b.Property("State")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("SureName")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("Zone")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.HasKey("id");
+
+ b.HasIndex("RepresentativeId");
+
+ b.ToTable("PersonalContractingParties", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ContractAgg.Contract", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("AgreementSalary")
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ArchiveCode")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.Property("ConsumableItems")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("ContarctStart")
+ .HasColumnType("datetime2");
+
+ b.Property("ContractEnd")
+ .HasColumnType("datetime2");
+
+ b.Property("ContractNo")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.Property("ContractPeriod")
+ .HasMaxLength(2)
+ .HasColumnType("nvarchar(2)");
+
+ b.Property("ContractType")
+ .IsRequired()
+ .HasMaxLength(20)
+ .HasColumnType("nvarchar(20)");
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("DayliWage")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("EmployeeId")
+ .HasColumnType("bigint");
+
+ b.Property("EmployerId")
+ .HasColumnType("bigint");
+
+ b.Property("FamilyAllowance")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("GetWorkDate")
+ .HasColumnType("datetime2");
+
+ b.Property("HousingAllowance")
+ .IsRequired()
+ .HasMaxLength(50)
+ .HasColumnType("nvarchar(50)");
+
+ b.Property("IsActiveString")
+ .IsRequired()
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("JobType")
+ .IsRequired()
+ .HasMaxLength(100)
+ .HasColumnType("nvarchar(100)");
+
+ b.Property("JobTypeId")
+ .HasColumnType("bigint");
+
+ b.Property("MandatoryHoursid")
+ .HasColumnType("bigint");
+
+ b.Property("PersonnelCode")
+ .HasColumnType("bigint");
+
+ b.Property("SetContractDate")
+ .HasColumnType("datetime2");
+
+ b.Property("Signature")
+ .HasMaxLength(1)
+ .HasColumnType("nvarchar(1)");
+
+ b.Property("WorkingHoursWeekly")
+ .IsRequired()
+ .HasMaxLength(10)
+ .HasColumnType("nvarchar(10)");
+
+ b.Property("WorkshopAddress1")
+ .HasMaxLength(500)
+ .HasColumnType("nvarchar(500)");
+
+ b.Property("WorkshopAddress2")
+ .HasMaxLength(500)
+ .HasColumnType("nvarchar(500)");
+
+ b.Property("WorkshopIds")
+ .HasColumnType("bigint");
+
+ b.Property("YearlySalaryId")
+ .HasColumnType("bigint");
+
+ b.HasKey("id");
+
+ b.HasIndex("EmployeeId");
+
+ b.HasIndex("EmployerId");
+
+ b.HasIndex("JobTypeId");
+
+ b.HasIndex("MandatoryHoursid");
+
+ b.HasIndex("WorkshopIds");
+
+ b.HasIndex("YearlySalaryId");
+
+ b.ToTable("Contracts", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.ContractingPartyAccountAgg.ContractingPartyAccount", b =>
+ {
+ b.Property("PersonalContractingPartyId")
+ .HasColumnType("bigint");
+
+ b.Property("AccountId")
+ .HasColumnType("bigint");
+
+ b.HasKey("PersonalContractingPartyId", "AccountId");
+
+ b.ToTable("ContractingPartyAccount", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.CrossJobAgg.CrossJob", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("CrossJobGuildId")
+ .HasColumnType("bigint");
+
+ b.Property("EquivalentRialOver")
+ .HasColumnType("bigint");
+
+ b.Property("EquivalentRialUnder")
+ .HasColumnType("bigint");
+
+ b.Property("SalaryRatioOver")
+ .HasColumnType("float");
+
+ b.Property("SalaryRatioUnder")
+ .HasColumnType("float");
+
+ b.HasKey("id");
+
+ b.HasIndex("CrossJobGuildId");
+
+ b.ToTable("CrossJobs", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.CrossJobGuildAgg.CrossJobGuild", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property("CreationDate")
+ .HasColumnType("datetime2");
+
+ b.Property("EconomicCode")
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.Property("Title")
+ .IsRequired()
+ .HasMaxLength(255)
+ .HasColumnType("nvarchar(255)");
+
+ b.Property("Year")
+ .HasMaxLength(4)
+ .HasColumnType("int");
+
+ b.HasKey("id");
+
+ b.ToTable("CrossJobGuilds", (string)null);
+ });
+
+ modelBuilder.Entity("Company.Domain.CrossJobItemsAgg.CrossJobItems", b =>
+ {
+ b.Property("id")
+ .ValueGeneratedOnAdd()
+ .HasColumnType("bigint");
+
+ SqlServerPropertyBuilderExtensions.UseIdentityColumn(b.Property("id"));
+
+ b.Property