yuangb/jinko.yikatong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 优化档案查询

Browse Source
This commit is contained in:
liguoyang
2025-01-08 16:15:08 +08:00
parent f8a5e9a6c3
commit d4a5362dab
10 changed files with 43 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.Basic/Organization/Services/Implements/GainfoFaceService.cs
View File

@@ -106,11 +106,7 @@ public class GainfoFaceService : IGainfoFaceService
//ignore
}
var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.External)
.Where(x => x.IdNo == request.UserNo)
.SingleAsync();
gainfo ??= await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working)
.Where(x => x.IdNo == request.UserNo)
.SingleAsync();
@@ -272,8 +268,6 @@ public class GainfoFaceService : IGainfoFaceService
foreach (var request in requests)
{
var gainfo = await _gainfoStore.Queryable(GainfoStatusEnumType.Working).Where(x => x.Code == request.UserNo).FirstAsync();
gainfo ??= await _gainfoStore.Queryable(GainfoStatusEnumType.External).Where(x => x.Code == request.UserNo).FirstAsync();
gainfo.ThrowIfNull("人员档案信息不存在");
var face = await _faceDbContext.Queryable<GainfoFaceEntity>().Where(x => x.UserCode == gainfo.Code).SingleAsync();

2
Src/Dlhis.Basic/Organization/Services/Implements/GainfoOutsourceService.cs
View File

@@ -103,7 +103,7 @@ public class GainfoOutsourceService : IGainfoOutsourceService
Supplier = a.Supplier,
SapCode = a.SapCode,
SapPhone = a.SapPhone,
Name = c.Name,
SapName = c.Name,
EntryDate = b.EntryDate,
ResignationDate = b.ResignationDate,
Factory = b.Factory

33
Src/Dlhis.Basic/Organization/Services/Implements/GainfoService.cs
View File

@@ -70,10 +70,6 @@ public class GainfoService : IGainfoService
var where = LinqExpressionExtensions.False<GainfoEntity>();
var factories = _currentUser.GetUserClaim("tenants").Split(",").ToList();
var role = _currentUser.GetRole();
var jinkoCode = _currentUser.GetUserClaim("jinko-code") ?? string.Empty;
var isAll = role is "admin" or "tenant-admin";
if (request.DepartmentSelections.Any())
{
foreach (var item in request.DepartmentSelections)
@@ -91,6 +87,20 @@ public class GainfoService : IGainfoService
where = where.Or(gainfo => factories.Contains(gainfo.Factory));
}
if (request.SearchType.HasValue)
{
GainfoUserTypeEnumType userTypeEnumType = request.SearchType switch
{
GainfoSearchEnumType.Internal => GainfoUserTypeEnumType.Normal,
GainfoSearchEnumType.Outsource => GainfoUserTypeEnumType.Outsource,
GainfoSearchEnumType.BusinessTrip => throw new ArgumentNullException(request.SearchType?.ToString()),
GainfoSearchEnumType.External => GainfoUserTypeEnumType.External,
null => throw new ArgumentOutOfRangeException(request.SearchType?.ToString()),
_ => throw new ArgumentOutOfRangeException(request.SearchType?.ToString())
};
where = where.And(x => x.Type == userTypeEnumType);
}
if (request.IsSearchAll)
{
@@ -122,19 +132,12 @@ public class GainfoService : IGainfoService
CardTypeName = type.Display
}, true)
: _gainfoStore.Queryable(request.Status)
.WhereIF(request.SearchType != GainfoSearchEnumType.BusinessTrip && request.DepartmentSelections?.Any() == true, where)
.LeftJoin<DepartmentEntity>((gainfo, department) => gainfo.DepartmentNo == department.No)
.LeftJoin<BasicTypeEntity>((gainfo, department, type) => type.Code == SqlFunc.ToString(gainfo.CardType) && type.Type == "timeperiod")
.WhereIF(request.SearchType != GainfoSearchEnumType.BusinessTrip && request.DepartmentSelections?.Any() == false, gainfo => factories.Contains(gainfo.Factory))
.WhereIF(request.SearchType == GainfoSearchEnumType.Internal, gainfo => SqlFunc.Subqueryable<OutsourceEntity>().Where(p => p.Code == gainfo.Code).NotAny())
.WhereIF(request.SearchType == GainfoSearchEnumType.Outsource, gainfo =>
SqlFunc.Subqueryable<OutsourceEntity>()
.Where(p => p.Code == gainfo.Code)
.WhereIF(!isAll, p => p.SapCode == jinkoCode)
.Any()
)
.WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo =>
SqlFunc.Subqueryable<BusinessTripEntity>().Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)).Any())
.WhereIF(request.SearchType.HasValue == false, gainfo => SqlFunc.Subqueryable<BusinessTripEntity>()
.Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today))
.Any())
.WhereIF(request.SearchType.HasValue, where)
.WhereIF(request.Search.IsPresent(), gainfo =>
gainfo.Name.Contains(request.Search)
|| gainfo.Code == request.Search

5
Src/Dlhis.Basic/Organization/Services/Implements/GainfoStore.cs
View File

@@ -30,11 +30,6 @@ public class GainfoStore : IGainfoStore
return _dbContext.Queryable<GainfoEntity>();
}
if (gainfoStatus == GainfoStatusEnumType.External)
{
return _dbContext.Queryable<GainfoEntity>().Where(x => x.Type == GainfoUserTypeEnumType.External);
}
var tableName = typeof(GainfoEntity).GetCustomAttribute<SugarTable>()!.TableName;
return _dbContext.Queryable<GainfoEntity>().AS(tableName + gainfoStatus);
}

2
Src/Dlhis.Basic/Organization/Services/Implements/GainfoUpdateService.cs
View File

@@ -364,7 +364,7 @@ public class GainfoUpdateService : IGainfoUpdateService
return sapList;
}
var needRemove = sapList.Intersect(last, new SapPersonComparer()).ToList();
var needRemove = sapList.Intersect(last, new SapPersonComparer());
return sapList.Except(needRemove, new SapPersonComparer()).ToList();
}