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

fix 查询where问题

Browse Source
This commit is contained in:
liguoyang
2024-08-05 10:25:37 +08:00
parent 417593850d
commit 786e77b50e
2 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -78,26 +78,26 @@ public class GainfoService : IGainfoService
var today = DateTime.Today;
var page = await _gainfoStore.Queryable(request.Status)
var query = _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(x => x.Code == gainfo.Code).NotAny())
.WhereIF(request.SearchType == GainfoSearchEnumType.Outsource, gainfo => SqlFunc.Subqueryable<OutsourceEntity>().Where(x => x.Code == gainfo.Code).Any())
.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).Any())
.WhereIF(request.SearchType == GainfoSearchEnumType.BusinessTrip, gainfo =>
SqlFunc.Subqueryable<BusinessTripEntity>().Where(x => x.Code == gainfo.Code && factories.Contains(x.Destination) && SqlFunc.DateIsSame(x.BeginDate, today)).Any())
SqlFunc.Subqueryable<BusinessTripEntity>().Where(p => p.Code == gainfo.Code && factories.Contains(p.Destination) && SqlFunc.DateIsSame(p.BeginDate, today)).Any())
.WhereIF(request.Search.IsPresent(), gainfo =>
gainfo.Name.Contains(request.Search)
|| gainfo.Code == request.Search
|| gainfo.IdNo == request.Search)
.LeftJoin<DepartmentEntity>((x, department) => x.DepartmentNo == department.No)
.LeftJoin<BasicTypeEntity>((x, department, type) => type.Code == x.CardType.ToString() && type.Type == "timeperiod")
.Select((x, department, type) => new GainfoPageResponse
.Select((gainfo, department, type) => new GainfoPageResponse
{
DepartmentName = department.Name,
CardType = x.CardType,
CardType = gainfo.CardType,
CardTypeName = type.Display
}, true)
.ToPageListAsync(request);
}, true);
var page = await query.ToPageListAsync(request);
//外包人员部门号处理
if (request.SearchType == GainfoSearchEnumType.Outsource)

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

@@ -84,5 +84,4 @@ public class GainfoStore : IGainfoStore
return tableName;
}
}