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:
cheche
2024-01-30 14:53:31 +08:00
parent 025a05a533
commit 0b02a95f66
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Organization/Controllers/GainfosController.cs
View File

@@ -152,7 +152,7 @@ public class GainfosController : ControllerBase
/// <param name="request"></param>
/// <returns></returns>
[HttpGet("gainfodetail")]
public async Task<Pagination<GainfoDetailResponse>> GetGainfoDetailTaskAsync([FromQuery] GainfoDetailRequest request)
public async Task<GainfoDetailResponse> GetGainfoDetailTaskAsync([FromQuery] GainfoDetailRequest request)
{
return await _gainfoService.GetGainfoDetailTaskAsync(request);
}

2
Src/Dlhis.Basic/Organization/Services/IGainfoService.cs
View File

@@ -29,5 +29,5 @@ public interface IGainfoService : IScopeDependency
Task<Pagination<GainfoListResponse>> GetGainfoListTaskAsync(GainfoListRequest request);
Task<Pagination<GainfoDetailResponse>> GetGainfoDetailTaskAsync(GainfoDetailRequest request);
Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request);
}

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

@@ -341,9 +341,9 @@ public class GainfoService : IGainfoService
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
public async Task<Pagination<GainfoDetailResponse>> GetGainfoDetailTaskAsync(GainfoDetailRequest request)
public async Task<GainfoDetailResponse> GetGainfoDetailTaskAsync(GainfoDetailRequest request)
{
var page = await _gainfoStore.Queryable(request.Status)
var info = await _gainfoStore.Queryable(request.Status)
.LeftJoin<DepartmentEntity>((ga, de) => ga.DepartmentNo == de.No)
.LeftJoin<BasicTypeEntity>((ga,de,type) => ga.Native == type.Code && type.Type == "native")
.LeftJoin<PositionEntity>((ga, de, type,posi) => ga.Position == posi.Name)
@@ -373,8 +373,8 @@ public class GainfoService : IGainfoService
CountryName = type2.Display,
NationName = type3.Display,
IsActive = ga.Employed == "Active" ? true : false,
}).ToPageListAsync(request);
return page;
}).FirstAsync();
return info;
}
//-------------------------------------------help methods ------------------------------------------------

4
Src/Dlhis.ScheduledTask/TaskAssignment/Services/Implements/DeviceTaskAssignmentService.cs
View File

@@ -51,8 +51,8 @@ public class DeviceTaskAssignmentService : IDeviceTaskAssignmentService
{
//获取启用的功能设备
var devices = await _dbContext.Queryable<DeviceEntity>()
//.Where(x => x.Enable && x.Funcs.Contains(request.type))
.Where(x=>x.UniqueNo == "717840555")
.Where(x => x.Enable && x.Funcs.Contains(request.type))
//.Where(x=>x.UniqueNo == "717840555")
.Select(x => x.UniqueNo)
.ToListAsync();
devices.ThrowIfNull($"{request.type.GetDescription}功能机器为空");