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

fix conflict after marge from master

Browse Source
This commit is contained in:
SamSys
2025-03-16 21:08:03 +03:30
parent a11532f2bd
commit 56993da86b
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CompanyManagment.Application/RollCallEmployeeStatusApplication.cs
View File

@@ -5,6 +5,7 @@ using Company.Domain.RollCallEmployeeStatusAgg;
using CompanyManagment.App.Contracts.RollCallEmployeeStatus;
using System;
using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using Company.Domain.RollCallServiceAgg;
using Company.Domain.LeftWorkTempAgg;

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

@@ -101,12 +101,10 @@ public class RollCallEmployeeRepository : RepositoryBase<long, RollCallEmployee>
((employee, temp) => new { employee, temp }))
.SelectMany(x => x.temp.DefaultIfEmpty(),
(x, temp) => new { x.employee, temp })
.Where(x => (x.employee.LeftWorks.Any(y =>
.Where(x => x.employee.LeftWorks.Any(y =>
y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow &&
y.LeftWorkDate > dateNow || (y.WorkshopId == command.WorkshopId && y.StartWorkDate > dateNow)) ||
x.employee.LeftWorkInsurances.Any(y =>
y.WorkshopId == command.WorkshopId && y.StartWorkDate <= dateNow &&
(y.LeftWorkDate > dateNow || y.LeftWorkDate == null))) || x.temp != null).OrderByDescending(x => x.employee.id)
x.temp != null).OrderByDescending(x => x.employee.id)
.Select(x => new
{
Id = x.employee.id,

4
ServiceHost/appsettings.Development.json
View File

@@ -15,11 +15,11 @@
//"MesbahDb": "Data Source=171.22.24.15;Initial Catalog=mesbah_db;Persist Security Info=False;User ID=ir_db;Password=R2rNp[170]is[3019]#@ATt;TrustServerCertificate=true;"
//local
//"MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;",
"MesbahDb": "Data Source=.;Initial Catalog=mesbah_db;Integrated Security=True;TrustServerCertificate=true;"
//dad-mehr
"MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;"
// "MesbahDb": "Data Source=.;Initial Catalog=teamWork;Integrated Security=True;TrustServerCertificate=true;"
},
"GoogleRecaptchaV3": {
"SiteKey": "6Lfhp_AnAAAAAB79WkrMoHd1k8ir4m8VvfjE7FTH",