diff --git a/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs b/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs index 023fadff..3c652efa 100644 --- a/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs +++ b/Company.Domain/ContarctingPartyAgg/PersonalContractingParty.cs @@ -42,8 +42,24 @@ public class PersonalContractingParty : EntityBase public string IsActiveString { get; private set; } public string IsBlock { get; private set; } + public int BlockTimes {get; private set; } + ///// + ///// نام پدر + ///// + //public string FatherName { get; private set; } + + ///// + ///// تاریخ تولد + ///// + //public DateTime DateOfBirth { get; private set; } + + ///// + ///// آیا از طریق ای پی ای احراز هویت شده است + ///// + //public bool IsAuthenticated { get; private set; } + public List Employers { get; private set; } public Representative Representative { get; set; } @@ -159,5 +175,8 @@ public class PersonalContractingParty : EntityBase this.IsActiveString = "false"; } - + //public void Authenticated() + //{ + // IsAuthenticated = true; + //} } \ No newline at end of file diff --git a/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs b/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs new file mode 100644 index 00000000..0b642d33 --- /dev/null +++ b/Company.Domain/TemporaryClientRegistrationAgg/ContractingPartyTemp.cs @@ -0,0 +1,90 @@ +using System; +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, string 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 string 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/IContractingPartyTemp.cs b/Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTemp.cs new file mode 100644 index 00000000..ac0b036a --- /dev/null +++ b/Company.Domain/TemporaryClientRegistrationAgg/IContractingPartyTemp.cs @@ -0,0 +1,8 @@ +using _0_Framework.Domain; + +namespace Company.Domain.TemporaryClientRegistrationAgg; + +public interface IContractingPartyTemp :IRepository +{ + +} \ No newline at end of file diff --git a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs index c77e8133..3d1ed12e 100644 --- a/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs +++ b/CompanyManagment.Application/RollCallEmployeeStatusApplication.cs @@ -8,6 +8,9 @@ using System.Collections.Generic; using System.Linq; using Company.Domain.RollCallServiceAgg; using System.Globalization; +using CompanyManagment.EFCore.Migrations; +using RollCallEmployee = Company.Domain.RollCallEmployeeAgg.RollCallEmployee; +using RollCallEmployeeStatus = Company.Domain.RollCallEmployeeStatusAgg.RollCallEmployeeStatus; namespace CompanyManagment.Application @@ -84,12 +87,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;