feat: add GetEmployeeClientList API to retrieve employee client data

Company.Domain/EmployeeAgg/IEmployeeRepository.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Threading.Tasks;
+using _0_Framework.Application;
 using _0_Framework.Domain;
 using Company.Domain.EmployeeInsuranceRecordAgg;
 using CompanyManagment.App.Contracts.Employee;
@@ -77,6 +78,7 @@ public interface IEmployeeRepository : IRepository<long, Employee>
 	Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id);
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
 	#endregion
-
-
+	
+	Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,
+		long workshopId);
 }

CompanyManagment.App.Contracts/Employee/IEmployeeApplication.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using _0_Framework.Application;
 using CompanyManagment.App.Contracts.Employee.DTO;
@@ -95,6 +96,41 @@ public interface IEmployeeApplication
 	/// <returns></returns>
 	Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel);
 
+	Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,
+		long workshopId);
 	#endregion
 
+}
+
+public class GetEmployeeClientListSearchModel
+{
+	public string NationalCode { get; set; }
+	public string FullName { get; set; }
+	
+}
+
+public class GetEmployeeClientListViewModel
+{
+	public long WorkshopId { get; set; }
+	public long EmployeeId { get; set; }
+	public string FullName { get; set; }
+	public long PersonnelCode { get; set; }
+	public bool HasInsurance { get; set; }
+	public bool HasContract { get; set; }
+	public bool InsuranceLeft { get; set; }
+	public bool ContractLeft { get; set; }
+	public DateTime StartWork { get; set; }
+	public DateTime LeftWork { get; set; }
+	public string LastStartInsuranceWork { get; set; }
+	public string LastLeftInsuranceWork { get; set; }
+	public string LastStartContractWork { get; set; }
+	public string LastLeftContractWork { get; set; }
+	public string NationalCode { get; set; }
+	public string IdNumber { get; set; }
+	public string MaritalStatus { get; set; }
+	public string DateOfBirthFa { get; set; }
+	public string FatherName { get; set; }
+	public bool PendingCreate { get; set; }
+	public bool PendingLefWork { get; set; }
+	public int ChildrenCount { get; set; }
 }

CompanyManagment.Application/EmployeeAplication.cs

@@ -64,33 +64,49 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     private readonly ILeftWorkInsuranceRepository _leftWorkInsuranceRepository;
     private readonly IFaceEmbeddingService _faceEmbeddingService;
 
-	public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context, IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment, IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication, IRollCallEmployeeRepository rollCallEmployeeRepository, ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication, IEmployeeDocumentsApplication employeeDocumentsApplication, IEmployeeDocumentsRepository employeeDocumentsRepository, IEmployeeBankInformationApplication employeeBankInformationApplication, ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService, ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository, IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository, ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository, ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository, ILeftWorkInsuranceRepository leftWorkInsuranceRepository, IFaceEmbeddingService faceEmbeddingService) : base(context)
-	{
-		_context = context;
-		_WorkShopRepository = workShopRepository;
-		_webHostEnvironment = webHostEnvironment;
-		_rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
-		_rollCallEmployeeRepository = rollCallEmployeeRepository;
-		_customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
-		_employeeDocumentsApplication = employeeDocumentsApplication;
-		_employeeBankInformationApplication = employeeBankInformationApplication;
-		_leftWorkTempRepository = leftWorkTempRepository;
-		_uidService = uidService;
-		_customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
-		_personnelCodeRepository = personnelCodeRepository;
-		_employeeClientTempRepository = employeeClientTempRepository;
-		_leftWorkRepository = leftWorkRepository;
-		_employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
-		_leftWorkInsuranceRepository = leftWorkInsuranceRepository;
-		_EmployeeRepository = employeeRepository;
-		_faceEmbeddingService = faceEmbeddingService;
-	}
+    public EmployeeAplication(IEmployeeRepository employeeRepository, CompanyContext context,
+        IWorkshopRepository workShopRepository, IWebHostEnvironment webHostEnvironment,
+        IRollCallEmployeeStatusApplication rollCallEmployeeStatusApplication,
+        IRollCallEmployeeRepository rollCallEmployeeRepository,
+        ICustomizeWorkshopSettingsApplication customizeWorkshopSettingsApplication,
+        IEmployeeDocumentsApplication employeeDocumentsApplication,
+        IEmployeeDocumentsRepository employeeDocumentsRepository,
+        IEmployeeBankInformationApplication employeeBankInformationApplication,
+        ILeftWorkTempRepository leftWorkTempRepository, IUidService uidService,
+        ICustomizeWorkshopEmployeeSettingsRepository customizeWorkshopEmployeeSettingsRepository,
+        IPersonnelCodeRepository personnelCodeRepository, IEmployeeClientTempRepository employeeClientTempRepository,
+        ICustomizeWorkshopGroupSettingsRepository customizeWorkshopGroupSettingsRepository,
+        ILeftWorkRepository leftWorkRepository, IEmployeeAuthorizeTempRepository employeeAuthorizeTempRepository,
+        ILeftWorkInsuranceRepository leftWorkInsuranceRepository,
+        IFaceEmbeddingService faceEmbeddingService) : base(context)
+    {
+        _context = context;
+        _WorkShopRepository = workShopRepository;
+        _webHostEnvironment = webHostEnvironment;
+        _rollCallEmployeeStatusApplication = rollCallEmployeeStatusApplication;
+        _rollCallEmployeeRepository = rollCallEmployeeRepository;
+        _customizeWorkshopSettingsApplication = customizeWorkshopSettingsApplication;
+        _employeeDocumentsApplication = employeeDocumentsApplication;
+        _employeeBankInformationApplication = employeeBankInformationApplication;
+        _leftWorkTempRepository = leftWorkTempRepository;
+        _uidService = uidService;
+        _customizeWorkshopEmployeeSettingsRepository = customizeWorkshopEmployeeSettingsRepository;
+        _personnelCodeRepository = personnelCodeRepository;
+        _employeeClientTempRepository = employeeClientTempRepository;
+        _leftWorkRepository = leftWorkRepository;
+        _employeeAuthorizeTempRepository = employeeAuthorizeTempRepository;
+        _leftWorkInsuranceRepository = leftWorkInsuranceRepository;
+        _EmployeeRepository = employeeRepository;
+        _faceEmbeddingService = faceEmbeddingService;
+    }
 
-	public OperationResult Create(CreateEmployee command)
+    public OperationResult Create(CreateEmployee command)
     {
         var opration = new OperationResult();
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode &&
+                !string.IsNullOrWhiteSpace(command.NationalCode) && x.NationalCode != null &&
+                x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
 
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber !=null))
@@ -182,13 +198,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 else
                 {
 
-                   
-                   
-                        nationalCodValid = false;
-                        return opration.Failed("کد ملی وارد شده نا معتبر است");
-                    
-                    
-                   
+
+
+                    nationalCodValid = false;
+                    return opration.Failed("کد ملی وارد شده نا معتبر است");
+
+
+
                 }
             }
             catch (Exception)
@@ -198,6 +214,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("لطفا کد ملی 10 رقمی وارد کنید");
 
             }
+
             if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode))
             {
                 nationalcodeIsOk = false;
@@ -210,24 +227,31 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
 
 
         var employeeData = new Employee(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
-            command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality, command.IdNumberSerial, command.IdNumberSeri,
+            command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
+            command.IdNumberSerial, command.IdNumberSeri,
             command.Phone, command.Address,
             command.State, command.City, command.MaritalStatus, command.MilitaryService, command.LevelOfEducation,
             command.FieldOfStudy, command.BankCardNumber,
             command.BankBranch, command.InsuranceCode, command.InsuranceHistoryByYear,
-            command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone, command.MclsUserName, command.MclsPassword, command.EserviceUserName, command.EservicePassword,
+            command.InsuranceHistoryByMonth, command.NumberOfChildren, command.OfficePhone, command.MclsUserName,
+            command.MclsPassword, command.EserviceUserName, command.EservicePassword,
             command.TaxOfficeUserName, command.TaxOfficepassword, command.SanaUserName, command.SanaPassword);
 
         if (command.IsAuthorized)
         {
             employeeData.Authorized();
         }
+
         _EmployeeRepository.Create(employeeData);
         _EmployeeRepository.SaveChanges();
 
@@ -244,7 +268,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("رکورد مورد نظر یافت نشد");
 
         if (_EmployeeRepository.Exists(x =>
-                x.LName == command.LName && x.NationalCode == command.NationalCode && !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
+                x.LName == command.LName && x.NationalCode == command.NationalCode &&
+                !string.IsNullOrWhiteSpace(command.NationalCode) && x.id != command.Id && x.IsActiveString == "true"))
             return opration.Failed("امکان ثبت رکورد تکراری وجود ندارد");
         //if (_EmployeeRepository.Exists(x => x.IdNumber == command.IdNumber && x.IdNumber != null && x.id != command.Id))
         //    return opration.Failed("شماره شناسنامه وارد شده تکراری است");
@@ -339,6 +364,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 return opration.Failed("لطفا کد ملی 10 رقمی وارد کنید");
 
             }
+
             if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode && x.id != command.Id))
             {
                 nationalcodeIsOk = false;
@@ -349,8 +375,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
         employee.Edit(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
@@ -435,7 +465,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         var opration = new OperationResult();
 
-        var employeeData = new EmployeeInsuranceRecord(command.EmployeeId, command.WorkShopId, command.DateOfStart, command.DateOfEnd);
+        var employeeData = new EmployeeInsuranceRecord(command.EmployeeId, command.WorkShopId, command.DateOfStart,
+            command.DateOfEnd);
 
         _EmployeeRepository.CreateEmployeeInsuranceRecord(employeeData);
         _EmployeeRepository.SaveChanges();
@@ -444,6 +475,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public OperationResult EditEmployeeInsuranceRecord(EditEmployeeInsuranceRecord command)
     {
         var opration = new OperationResult();
@@ -455,6 +487,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public void RemoveEmployeeInsuranceRecord(long Id)
     {
         _EmployeeRepository.RemoveEmployeeInsuranceRecord(Id);
@@ -468,12 +501,14 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             return opration.Failed("خطا در انتخاب کارگاه");
 
         }
+
         var ws = _WorkShopRepository.GetDetails(eir.WorkShopId);
         if (string.IsNullOrWhiteSpace(eir.DateOfStart))
         {
             return opration.Failed("تاریخ شروع نمی تواند خالی باشد - " + ws.WorkshopFullName);
 
         }
+
         if (!string.IsNullOrWhiteSpace(eir.DateOfEnd))
         {
             if (eir.DateOfEnd.ToGeorgianDateTime() < eir.DateOfStart.ToGeorgianDateTime())
@@ -490,6 +525,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return opration.Succcedded();
     }
+
     public OperationResult ValidationEmployeeInsuranceRecord(List<CreateEmployeeInsuranceRecord> eir_lst)
     {
         var opration = new OperationResult();
@@ -509,16 +545,19 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     {
                         return opration.Failed("خطا در تداخل تاریخ - " + wshop.WorkshopFullName);
                     }
+
                 if (string.IsNullOrEmpty(q[i].DateOfEnd.ToString()))
                 {
                     count++;
                 }
             }
+
             if (count > 1)
             {
                 return opration.Failed("تاریخ ترک کار را وارد نمایید ");
             }
         }
+
         return opration.Succcedded();
 
 
@@ -532,11 +571,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             return opration.Failed("خطا در انتخاب پرسنل");
         }
+
         var employee = _EmployeeRepository.GetDetails(employeeId);
         if (string.IsNullOrWhiteSpace(employee.FName))
         {
             error += "(نام)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.LName))
         {
             error += "(نام خانوادگی)" + Environment.NewLine;
@@ -546,22 +587,27 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
             error += "(کد ملی)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.PlaceOfIssue))
         {
             error += "(شهر محل تولد)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.DateOfBirth))
         {
             error += "(تاریخ تولد)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.IdNumber))
         {
             error += "(شماره شناسنامه)" + Environment.NewLine;
         }
+
         if (string.IsNullOrWhiteSpace(employee.InsuranceCode))
         {
             error += "(شماره بیمه)" + Environment.NewLine;
         }
+
         if (!string.IsNullOrWhiteSpace(error))
         {
             var note = "آیتم های زیر برای ثبت سابقه الزامی می باشد" + Environment.NewLine + error;
@@ -610,7 +656,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 InsuranceCode = x.InsuranceCode,
                 IsActiveString = x.IsActiveString,
                 IsActive = x.IsActive,
-                PersonnelCode = _context.PersonnelCodeSet.FirstOrDefault(p => p.EmployeeId == x.Id && p.WorkshopId == searchModel.WorkshopId)?.PersonnelCode
+                PersonnelCode = _context.PersonnelCodeSet
+                    .FirstOrDefault(p => p.EmployeeId == x.Id && p.WorkshopId == searchModel.WorkshopId)?.PersonnelCode
             }).ToList();
             //w2.Stop();
             //Console.WriteLine("efore :" + w2.ElapsedMilliseconds);
@@ -619,6 +666,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         {
 
         }
+
         return res;
     }
 
@@ -663,6 +711,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCode(command.NationalCode, command.WorkshopId))
                 return opration.Failed("کد ملی وارد شده تکراری است");
         }
+
         if (_EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.InsuranceCode != null))
         {
             if (_EmployeeRepository.ExistsEmployeeWorkshoppInsuranceCode(command.InsuranceCode, command.WorkshopId))
@@ -789,13 +838,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         if (_EmployeeRepository.Exists(x => x.NationalCode == command.NationalCode && x.id != command.Id))
         {
             nationalcodeIsOk = false;
-            if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCodeEmployeeId(command.NationalCode, command.WorkshopId, command.Id))
+            if (_EmployeeRepository.ExistsEmployeeWorkshopNationalCodeEmployeeId(command.NationalCode,
+                    command.WorkshopId, command.Id))
                 return opration.Failed("کد ملی وارد شده تکراری است");
         }
-        if (!string.IsNullOrEmpty(command.InsuranceCode) && _EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.id != command.Id))
+
+        if (!string.IsNullOrEmpty(command.InsuranceCode) &&
+            _EmployeeRepository.Exists(x => x.InsuranceCode == command.InsuranceCode && x.id != command.Id))
         {
             nationalcodeIsOk = false;
-            if (_EmployeeRepository.ExistsEmployeeWorkshopInsuranceCodeEmployeeId(command.InsuranceCode, command.WorkshopId, command.Id))
+            if (_EmployeeRepository.ExistsEmployeeWorkshopInsuranceCodeEmployeeId(command.InsuranceCode,
+                    command.WorkshopId, command.Id))
                 return opration.Failed("کد بیمه وارد شده تکراری است");
         }
 
@@ -877,8 +930,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
         string initial = "1300/10/11";
-        var dateOfBirth = command.DateOfBirth != null ? command.DateOfBirth.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
-        var dateOfIssue = command.DateOfIssue != null ? command.DateOfIssue.ToGeorgianDateTime() : initial.ToGeorgianDateTime();
+        var dateOfBirth = command.DateOfBirth != null
+            ? command.DateOfBirth.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
+        var dateOfIssue = command.DateOfIssue != null
+            ? command.DateOfIssue.ToGeorgianDateTime()
+            : initial.ToGeorgianDateTime();
         employee.Edit(command.FName, command.LName, command.FatherName, dateOfBirth,
             dateOfIssue,
             command.PlaceOfIssue, command.NationalCode, command.IdNumber, command.Gender, command.Nationality,
@@ -898,14 +955,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
 
     }
+
     public EditEmployee GetDetailsForClient(long id, long workshopId)
     {
         var employee = _EmployeeRepository.GetDetails(id);
-        employee.PersonelCode = _context.PersonnelCodeSet.FirstOrDefault(p => p.EmployeeId == id && p.WorkshopId == workshopId)?.PersonnelCode;
+        employee.PersonelCode = _context.PersonnelCodeSet
+            .FirstOrDefault(p => p.EmployeeId == id && p.WorkshopId == workshopId)?.PersonnelCode;
         return employee;
     }
 
     #region NewByHeydari
+
     public List<EmployeeViewModel> SearchForMain(EmployeeSearchModel searchModel)
     {
         var res = _EmployeeRepository.SearchForMain(searchModel);
@@ -917,6 +977,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         return res;
     }
+
     #endregion
 
 
@@ -926,7 +987,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         if (nationalCode.NationalCodeValid() != "valid")
             return new();
-        var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
+        var workshopEmployeesWithLeftWork =
+            _EmployeeRepository.GetWorkingEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode,
+                DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
 
@@ -934,9 +997,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     {
         if (nationalCode.NationalCodeValid() != "valid")
             return new();
-        var workshopEmployeesWithLeftWork = _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode, DateTime.Now.Date);
+        var workshopEmployeesWithLeftWork =
+            _EmployeeRepository.GetWorkedEmployeesByWorkshopIdsAndNationalCodeAndDate(workshopIds, nationalCode,
+                DateTime.Now.Date);
         return workshopEmployeesWithLeftWork.FirstOrDefault();
     }
+
     public List<EmployeeViewModel> GetWorkingEmployeesByWorkshopId(long workshopId)
     {
         return _EmployeeRepository.GetWorkingEmployeesByWorkshopId(workshopId);
@@ -980,6 +1046,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
     #endregion
 
     #region Mahan
+
     public OperationResult CreateEmployeeByClient(CreateEmployeeByClient command)
     {
         OperationResult op = new();
@@ -1028,20 +1095,23 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             _EmployeeRepository.SaveChanges();
 
         }
+
         if (employee == null)
         {
             return op.Failed("خطای سیستمی. لطفا دوباره تلاش کنید . درصورت تکرار این مشکل با تیم پشتیبان تماس بگیرید");
         }
 
         if (_leftWorkTempRepository.Exists(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
+                x.EmployeeId == employee.id && x.WorkshopId == command.WorkshopId &&
+                x.LeftWorkType == LeftWorkTempType.StartWork))
         {
             return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
         }
 
         var startLeftWork = command.StartLeftWork.ToGeorgianDateTime();
 
-        var leftWorkViewModel = _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
+        var leftWorkViewModel =
+            _leftWorkRepository.GetLastLeftWorkByEmployeeIdAndWorkshopId(command.WorkshopId, employee.id);
 
 
         PersonnelCodeDomain personnelCode = null;
@@ -1125,8 +1195,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 rollCallEmployee.HasImage();
                 _rollCallEmployeeRepository.Create(rollCallEmployee);
                 _rollCallEmployeeRepository.SaveChanges();
-				string employeeFullName = employee.FName + " " + employee.LName;
-				var res = _faceEmbeddingService.GenerateEmbeddingsAsync(employee.id,command.WorkshopId,employeeFullName, filePath1,filePath2).GetAwaiter().GetResult();
+                string employeeFullName = employee.FName + " " + employee.LName;
+                var res = _faceEmbeddingService
+                    .GenerateEmbeddingsAsync(employee.id, command.WorkshopId, employeeFullName, filePath1, filePath2)
+                    .GetAwaiter().GetResult();
                 if (!res.IsSuccedded)
                 {
                     return op.Failed(res.Message);
@@ -1212,7 +1284,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
         command.EmployeeDocumentItems = command.EmployeeDocumentItems ?? [];
 
-        var employeeDocumentResult = _employeeDocumentsApplication.AddRangeEmployeeDocumentItemsByClient(command.WorkshopId,
+        var employeeDocumentResult = _employeeDocumentsApplication.AddRangeEmployeeDocumentItemsByClient(
+            command.WorkshopId,
             employee.id, command.EmployeeDocumentItems);
 
         if (employeeDocumentResult.IsSuccedded == false)
@@ -1262,6 +1335,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         byte[] bytes = Convert.FromBase64String(subBase64);
         System.IO.File.WriteAllBytes(filePath, bytes);
     }
+
     public async Task<OperationResult<EmployeeByNationalCodeInWorkshopViewModel>>
         ValidateCreateEmployeeClientByNationalCodeAndWorkshopId(string nationalCode, string birthDate, long workshopId)
     {
@@ -1285,8 +1359,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
             if (personalInfo.ResponseContext.Status.Code == 14)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeByNationalCodeInWorkshopViewModel() { AuthorizedCanceled = true });
             }
+
             if (personalInfo.ResponseContext.Status.Code != 0)
             {
                 return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
@@ -1305,10 +1381,13 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 _ => throw new AggregateException()
             };
 
-            var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+            var idNumber = identityInfo.ShenasnamehNumber == "0"
+                ? identityInfo.NationalId
+                : identityInfo.ShenasnamehNumber;
 
             var newEmployee = new Employee(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
-                dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial, identityInfo.ShenasnameSeri);
+                dateOfIssue, null, identityInfo.NationalId, idNumber, gender, "ایرانی", identityInfo.ShenasnameSerial,
+                identityInfo.ShenasnameSeri);
             newEmployee.Authorized();
             await _EmployeeRepository.CreateAsync(newEmployee);
             await _EmployeeRepository.SaveChangesAsync();
@@ -1324,7 +1403,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         }
 
         if (_leftWorkTempRepository.ExistsIgnoreQueryFilter(x =>
-                x.EmployeeId == employee.id && x.WorkshopId == workshopId && x.LeftWorkType == LeftWorkTempType.StartWork))
+                x.EmployeeId == employee.id && x.WorkshopId == workshopId &&
+                x.LeftWorkType == LeftWorkTempType.StartWork))
         {
             return op.Failed("این پرسنل در کارگاه شما قبلا افزوده شده است و در انتظار تایید میباشد");
         }
@@ -1346,14 +1426,17 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     _ => throw new AggregateException()
                 };
 
-                var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+                var idNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber;
 
 
                 employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, apiBirthDate,
                     employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
                     gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
                     employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
+                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
+                    employee.InsuranceHistoryByYear,
                     employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
                     employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                     employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
@@ -1384,7 +1467,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 Gender = employee.Gender,
                 Nationality = employee.Nationality,
                 EmployeeLName = employee.LName
-            }); ;
+            });
+            ;
         }
 
         if (leftWorkViewModel.LeftWorkDate >= DateTime.Now || !leftWorkViewModel.HasLeft)
@@ -1436,17 +1520,18 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             Picture1 = picture1,
             Picture2 = picture2,
             PersonnelCode = personnelCode,
-            EmployeeBankInfos = bankInformationViewModel.BankInformation.Select(x => new EmployeeByNationalCodeEmployeeBankInfoViewModel
-            {
-                ShebaNumber = x.ShebaNumber,
-                IsDefault = x.IsDefault,
-                CardNumber = x.CardNumber,
-                BankAccountNumber = x.BankAccountNumber,
-                BankId = x.BankId,
-                BankLogoMediaId = x.BankLogoMediaId,
-                BankLogoPath = x.BankLogoPath,
-                BankName = x.BankName
-            }).ToList(),
+            EmployeeBankInfos = bankInformationViewModel.BankInformation.Select(x =>
+                new EmployeeByNationalCodeEmployeeBankInfoViewModel
+                {
+                    ShebaNumber = x.ShebaNumber,
+                    IsDefault = x.IsDefault,
+                    CardNumber = x.CardNumber,
+                    BankAccountNumber = x.BankAccountNumber,
+                    BankId = x.BankId,
+                    BankLogoMediaId = x.BankLogoMediaId,
+                    BankLogoPath = x.BankLogoPath,
+                    BankName = x.BankName
+                }).ToList(),
             EmployeeDocument = new EmployeeByNationalCodeEmployeeDocumentViewModel
             {
                 EducationalDegree = employeeDocumentsViewModel.EducationalDegree,
@@ -1500,6 +1585,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 return op.Failed("جنسیت وارد شده نامعتبر است");
             }
+
             if (command.BirthDate.TryToGeorgianDateTime(out var birthDateGr) == false)
             {
                 return op.Failed("تاریخ تولد وارد شده نامعتبر است");
@@ -1536,7 +1622,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             }
         }
 
-        var employeeClientTemp = _employeeClientTempRepository.GetByEmployeeIdAndWorkshopId(command.EmployeeId, command.WorkshopId);
+        var employeeClientTemp =
+            _employeeClientTempRepository.GetByEmployeeIdAndWorkshopId(command.EmployeeId, command.WorkshopId);
 
         employeeClientTemp?.Edit(command.MaritalStatus);
 
@@ -1563,6 +1650,7 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
                 employee.TaxOfficepassword, employee.SanaUserName, employee.SanaPassword);
         }
+
         await _EmployeeRepository.SaveChangesAsync();
 
         return op.Succcedded();
@@ -1573,7 +1661,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return await _EmployeeRepository.WorkedEmployeesInWorkshopSelectList(workshopId);
     }
 
-    public async Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode, string birthDate)
+    public async Task<OperationResult<EmployeeDataFromApiViewModel>> GetEmployeeDataFromApi(string nationalCode,
+        string birthDate)
     {
         var op = new OperationResult<EmployeeDataFromApiViewModel>();
         var birthDateGr = birthDate.ToGeorgianDateTime();
@@ -1585,20 +1674,23 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             if (employee.IsAuthorized == false)
             {
                 var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
-                
+
                 if (apiResult == null)
                 {
                     return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
                 }
+
                 if (apiResult.ResponseContext.Status.Code is 14 or 3)
                 {
                     return op.Failed("این پرسنل در بانک اطلاعات موجود میباشد");
 
                 }
+
                 if (apiResult.ResponseContext.Status.Code != 0)
                 {
                     return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
                 }
+
                 var basicInfo = apiResult.BasicInformation;
                 var identityInfo = apiResult.IdentificationInformation;
 
@@ -1609,12 +1701,15 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                     _ => throw new AggregateException()
                 };
 
-                var idNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber;
+                var idNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber;
                 employee.Edit(basicInfo.FirstName, basicInfo.LastName, basicInfo.FatherName, birthDateGr,
                     employee.DateOfIssue, employee.PlaceOfIssue, identityInfo.NationalId, idNumber,
                     gender, "ایرانی", employee.Phone, employee.Address, employee.State, employee.City,
                     employee.MaritalStatus, employee.MilitaryService, employee.LevelOfEducation,
-                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode, employee.InsuranceHistoryByYear,
+                    employee.FieldOfStudy, employee.BankCardNumber, employee.BankBranch, employee.InsuranceCode,
+                    employee.InsuranceHistoryByYear,
                     employee.InsuranceHistoryByMonth, employee.NumberOfChildren,
                     employee.OfficePhone, employee.MclsUserName, employee.MclsPassword,
                     employee.EserviceUserName, employee.EservicePassword, employee.TaxOfficeUserName,
@@ -1649,15 +1744,18 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 };
                 return op.Succcedded(data);
             }
-            
+
             var apiResult = await _uidService.GetPersonalInfo(nationalCode, birthDate);
             if (apiResult == null)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
             }
+
             if (apiResult.ResponseContext.Status.Code is 14 or 3)
             {
-                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید", new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
+                return op.Failed("سامانه احراز هویت در دسترس نمیباشد لطفا اطلاعات پرسنل را به صورت دستی وارد کنید",
+                    new EmployeeDataFromApiViewModel() { AuthorizedCanceled = true });
 
             }
 
@@ -1665,10 +1763,12 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 return op.Failed("کد ملی و تاریخ تولد با هم همخانی ندارند");
             }
+
             if (apiResult.ResponseContext.Status.Code != 0)
             {
                 return op.Failed("اطلاعات وارد شده نامعتبر میباشد");
             }
+
             var basicInfo = apiResult.BasicInformation;
             var identityInfo = apiResult.IdentificationInformation;
 
@@ -1676,7 +1776,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
             {
                 BirthDate = identityInfo.BirthDate,
                 NationalCode = identityInfo.NationalId,
-                IdNumber = identityInfo.ShenasnamehNumber == "0" ? identityInfo.NationalId : identityInfo.ShenasnamehNumber,
+                IdNumber = identityInfo.ShenasnamehNumber == "0"
+                    ? identityInfo.NationalId
+                    : identityInfo.ShenasnamehNumber,
                 FatherName = basicInfo.FatherName,
                 FName = basicInfo.FirstName,
                 Gender = basicInfo.GenderEnum,
@@ -1685,7 +1787,8 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
                 IdNumberSerial = identityInfo.ShenasnameSerial
             };
 
-            var newAuthorizeTemp = new EmployeeAuthorizeTemp(data.Gender, data.FName, data.LName, data.FatherName, birthDateGr, data.NationalCode, data.IdNumber, data.IdNumberSerial, data.IdNumberSeri);
+            var newAuthorizeTemp = new EmployeeAuthorizeTemp(data.Gender, data.FName, data.LName, data.FatherName,
+                birthDateGr, data.NationalCode, data.IdNumber, data.IdNumberSerial, data.IdNumberSeri);
             await _employeeAuthorizeTempRepository.CreateAsync(newAuthorizeTemp);
             await _employeeAuthorizeTempRepository.SaveChangesAsync();
 
@@ -1700,9 +1803,9 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
 
     #region Api
 
-    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText,long id)
+    public async Task<List<EmployeeSelectListViewModel>> GetSelectList(string searchText, long id)
     {
-        return await _EmployeeRepository.GetSelectList(searchText,id );
+        return await _EmployeeRepository.GetSelectList(searchText, id);
     }
 
     public async Task<List<GetEmployeeListViewModel>> GetList(GetEmployeeListSearchModel searchModel)
@@ -1710,5 +1813,10 @@ public class EmployeeAplication : RepositoryBase<long, Employee>, IEmployeeAppli
         return await _EmployeeRepository.GetList(searchModel);
     }
 
-    #endregion
+    public Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,long workshopId)
+    {
+        return _EmployeeRepository.GetEmployeeClientList(searchModel, workshopId);
+    }
+
+#endregion
 }

CompanyManagment.EFCore/Repository/EmployeeRepository .cs

@@ -18,6 +18,8 @@ using CompanyManagment.App.Contracts.Employee.DTO;
 using CompanyManagment.App.Contracts.LeftWorkTemp;
 using _0_Framework.Application.Enums;
 using _0_Framework.Exceptions;
+using CompanyManagment.App.Contracts.EmployeeChildren;
+using CompanyManagment.App.Contracts.Workshop;
 
 namespace CompanyManagment.EFCore.Repository;
 
@@ -1062,5 +1064,158 @@ public class EmployeeRepository : RepositoryBase<long, Employee>, IEmployeeRepos
 
 	}
 
-	#endregion
-}
+    public async Task<List<GetEmployeeClientListViewModel>> GetEmployeeClientList(GetEmployeeClientListSearchModel searchModel,long workshopId)
+    {
+          var leftDate = Tools.GetUndefinedDateTime();
+
+        var personnelCodes =await _context.PersonnelCodeSet.Include(x => x.Employee)
+            .ThenInclude(x => x.EmployeeChildrenList)
+            .IgnoreQueryFilters()
+            .Where(x => x.WorkshopId == workshopId).ToListAsync();
+
+        var contractLeftWork =
+           await _context.LeftWorkList.Where(x => x.WorkshopId == workshopId)
+                .Select(x => new PersonnelInfoViewModel()
+                {
+                    WorkshopId = x.WorkshopId,
+                    EmployeeId = x.EmployeeId,
+                    FullName = x.EmployeeFullName,
+                    PersonnelCode = 0,
+                    ContractPerson = true,
+                    ContractLeft = x.LeftWorkDate != leftDate,
+                    StartWork = x.StartWorkDate,
+                    LeftWork = x.LeftWorkDate,
+                    LastStartContractWork = x.StartWorkDate.ToFarsi(),
+                    LastLeftContractWork = x.LeftWorkDate != leftDate ? x.LeftWorkDate.ToFarsi() : "-",
+                    LastStartInsuranceWork = "-",
+                    LastLeftInsuranceWork = "-",
+                }).GroupBy(x => x.EmployeeId)
+                .Select(x => x.OrderByDescending(y => y.LeftWork)
+                    .First()).ToListAsync();
+
+
+
+
+        var insuranceLeftWork =await _context.LeftWorkInsuranceList
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            FullName = x.EmployeeFullName,
+            PersonnelCode = 0,
+            InsurancePerson = true,
+            InsuranceLeft = x.LeftWorkDate != null,
+            StartWork = x.StartWorkDate,
+            LeftWork = x.LeftWorkDate ?? leftDate,
+            LastStartInsuranceWork = x.StartWorkDate.ToFarsi(),
+            LastLeftInsuranceWork = x.LeftWorkDate != null ? x.LeftWorkDate.ToFarsi() : "-",
+            LastStartContractWork = "-",
+            LastLeftContractWork = "-"
+        }).GroupBy(x => x.EmployeeId)
+            .Select(x => x.OrderByDescending(y => y.LeftWork)
+                .First()).ToListAsync();
+
+        var leftWorkTemp =await _context.LeftWorkTemps
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            PersonnelCode = 0,
+            ContractPerson = true,
+            ContractLeft = x.LeftWork != leftDate,
+            StartWork = x.StartWork,
+            LeftWork = x.LeftWork,
+            LastStartContractWork = x.StartWork.ToFarsi(),
+            LastLeftContractWork = x.LeftWork != leftDate ? x.LeftWork.ToFarsi() : "-",
+            LastStartInsuranceWork = "-",
+            LastLeftInsuranceWork = "-",
+            LefWorkTemp = x.LeftWorkType == LeftWorkTempType.LeftWork,
+            CreatedByClient = x.LeftWorkType == LeftWorkTempType.StartWork
+        }).ToListAsync();
+
+
+        var employeeClientTemp =await _context.EmployeeClientTemps
+            .Where(x => x.WorkshopId == workshopId)
+            .Select(x => new PersonnelInfoViewModel()
+        {
+            WorkshopId = x.WorkshopId,
+            EmployeeId = x.EmployeeId,
+            PersonnelCode = 0,
+            CreatedByClient = true,
+            ContractPerson = true
+        }).ToListAsync();
+
+        var resultTemp = employeeClientTemp.Concat(leftWorkTemp).ToList().GroupBy(x => x.EmployeeId);
+
+
+        var groupRes = contractLeftWork.Concat(insuranceLeftWork).GroupBy(x => x.EmployeeId).ToList();
+
+
+        groupRes = groupRes.Concat(resultTemp).GroupBy(x => x.First().EmployeeId).Select(x => x.First()).ToList();
+
+        var employeeClientTempList = employeeClientTemp.ToList();
+        var startWorkTempsForWorkshop = leftWorkTemp.Where(x => x.CreatedByClient).ToList();
+        var leftWorkTempsForWorkshop = leftWorkTemp.Where(x => x.LefWorkTemp).ToList();
+        
+   
+        var res= groupRes.Select(x =>
+        {
+            var insurance = x.FirstOrDefault(y => y.InsurancePerson);
+            var contract = x.FirstOrDefault(y => y.ContractPerson);
+            var personnelCode = personnelCodes.FirstOrDefault(y => y.EmployeeId == x.Key);
+            var employee = personnelCode.Employee;
+            var employeeClient = employeeClientTempList.FirstOrDefault(t => t.EmployeeId == x.First().EmployeeId);
+            var startWorkTemp = startWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
+            var leftWorkTemp = leftWorkTempsForWorkshop.FirstOrDefault(s => s.EmployeeId == x.First().EmployeeId);
+
+
+            return new GetEmployeeClientListViewModel()
+            {
+                WorkshopId = workshopId,
+                EmployeeId = x.Key,
+                FullName = employee.FullName,
+                PersonnelCode = personnelCode?.PersonnelCode ?? 0,
+
+                HasInsurance = insurance != null,
+                HasContract = contract != null,
+
+                InsuranceLeft = insurance?.InsuranceLeft ?? false,
+                ContractLeft = contract?.ContractLeft ?? false,
+
+                StartWork = contract?.StartWork ?? insurance.StartWork,
+                LeftWork = contract?.LeftWork ?? insurance.LeftWork,
+
+                LastStartInsuranceWork = insurance != null ? insurance.LastStartInsuranceWork : "-",
+                LastLeftInsuranceWork = insurance != null ? insurance.LastLeftInsuranceWork : "-",
+                LastStartContractWork = contract != null ? contract.LastStartContractWork : "-",
+                LastLeftContractWork = contract != null ? contract.LastLeftContractWork : "-",
+                
+                NationalCode = employee.NationalCode,
+                IdNumber = employee.IdNumber,
+                MaritalStatus = employee.MaritalStatus,
+                DateOfBirthFa = employee.DateOfBirth.ToFarsi(),
+                FatherName = employee.FatherName,
+
+                PendingCreate = employeeClient != null || startWorkTemp != null,
+
+                PendingLefWork= leftWorkTemp != null,
+
+                ChildrenCount = employee.EmployeeChildrenList.Count,
+
+            };
+        }).ToList();
+        
+        if (!string.IsNullOrWhiteSpace(searchModel.FullName))
+            res = res.Where(x => x.FullName.Contains(searchModel.FullName)).ToList();
+
+        if (!string.IsNullOrWhiteSpace(searchModel.NationalCode))
+            res = res.Where(x => x.NationalCode.Contains(searchModel.NationalCode)).ToList();
+        return res;
+    }
+
+    #endregion
+}
+
+

CompanyManagment.EFCore/Repository/WorkshopRepository.cs

@@ -588,7 +588,8 @@ public class WorkshopRepository : RepositoryBase<long, Company.Domain.WorkshopAg
             LeftWork = x.LeftWorkDate,
             LastStartInsuranceWork = "-",
             LastLeftInsuranceWork = "-",
-        }).Where(x => x.WorkshopId == workshopId).OrderByDescending(x => x.StartWork).ToList();
+        }).Where(x => x.WorkshopId == workshopId)
+            .OrderByDescending(x => x.StartWork).ToList();
 
         contractLeftWork = contractLeftWork.Select(x => new PersonnelInfoViewModel()
         {

ServiceHost/Areas/Client/Controllers/EmployeeController.cs

@@ -0,0 +1,32 @@
+using _0_Framework.Application;
+using CompanyManagment.App.Contracts.Workshop;
+using Microsoft.AspNetCore.Mvc;
+using ServiceHost.BaseControllers;
+
+namespace ServiceHost.Areas.Client.Controllers;
+
+public class EmployeeController:ClientBaseController
+{
+    private readonly IWorkshopApplication _workshopApplication;
+    private readonly long _workshopId = 0;
+
+    public EmployeeController(IWorkshopApplication workshopApplication,IAuthHelper authHelper)
+    {
+        _workshopApplication = workshopApplication;
+        _workshopId = authHelper.GetWorkshopId();
+    }
+
+    [HttpGet]
+    public ActionResult<List<PersonnelInfoViewModel>> GetEmployeeList(string fullName, string nationalCode)
+    {
+        var searchModel = new PersonnelInfoSearchModel()
+        {
+            FullName = fullName,
+            NationalCode = nationalCode,
+            WorkshopId = _workshopId
+        };
+
+        var result = _workshopApplication.GetPersonnelInfoRemastered(searchModel);
+        return result;
+    }
+}