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
2024-07-10 14:52:24 +08:00
parent dffc7feac2
commit d77e924155
5 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Src/Dlhis.Basic/Places/Controllers/BusinessPlacePermissionsController.cs
View File

@@ -28,7 +28,6 @@ public class BusinessPlacePermissionsController
/// </summary>
/// <param name="request"></param>
/// <returns></returns>
[Authorize(Roles = "admin,tenant-admin,businessplace-manager")]
[HttpGet("page")]
public async Task<Pagination<BusinessPlacePermissionPageResponse>> GetPageAsync([FromQuery] BusinessPlacePermissionPageRequest request)
{
@@ -45,7 +44,6 @@ public class BusinessPlacePermissionsController
return await _businessPlacePermissionsService.GetMyAsync();
}
/// <summary>
/// 保存营业点
/// </summary>
@@ -53,7 +51,7 @@ public class BusinessPlacePermissionsController
/// <returns></returns>
[Authorize(Roles = "admin,tenant-admin")]
[HttpPost("save")]
public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request)
public async Task Save(BusinessPlacePermissionSaveRequest request)
{
await _businessPlacePermissionsService.SaveBusinessPlacePermissionAsync(request);
}
@@ -65,9 +63,9 @@ public class BusinessPlacePermissionsController
/// <returns></returns>
[Authorize(Roles = "admin,tenant-admin")]
[HttpGet("assignments/{userId}")]
public async Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsyc(int userId)
public async Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsync(int userId)
{
return await _businessPlacePermissionsService.GetBusinessPlacePermissionByUserIdAsyc(userId);
return await _businessPlacePermissionsService.GetBusinessPlacePermissionByUserIdAsync(userId);
}
/// <summary>

2
Src/Dlhis.Basic/Places/Services/IBusinessPlacePermissionsService.cs
View File

@@ -13,7 +13,7 @@ public interface IBusinessPlacePermissionsService : IScopeDependency
Task<List<BusinessPlaceDto>> GetMyAsync();
Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsyc(int id);
Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsync(int id);
Task DeleteAssignmentAsync(int id);
}

22
Src/Dlhis.Basic/Places/Services/Implements/BusinessPlacePermissionsService.cs
View File

@@ -1,5 +1,4 @@
using System.Security.Claims;
using Dlhis.Basic.Places.Dto;
using Dlhis.Basic.Places.Dto;
using Dlhis.Basic.Places.Request;
using Dlhis.Basic.Places.Response;
using Dlhis.Entity.Basic.Entity;
@@ -47,10 +46,10 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task<List<BusinessPlaceDto>> GetMyAsync()
{
var userId = _currentUser.GetIntSubjectId();
var role = _currentUser.GetUserClaim(ClaimTypes.Role);
var isAdmin = role == "admin" || role == "tenant-admin";
var role = _currentUser.GetRole();
var isAdmin = role is "admin" or "tenant-admin";
var codes = new List<Guid>();
List<Guid> codes;
if (isAdmin)
{
codes = await _dbContext.Queryable<BusinessPlaceEntity>()
@@ -66,7 +65,6 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
.ToListAsync();
}
return await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x => codes.Contains(x.Code))
.Select<BusinessPlaceDto>()
@@ -75,7 +73,7 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task SaveBusinessPlacePermissionAsync(BusinessPlacePermissionSaveRequest request)
{
await _dbContext.Client.Deleteable<BusinessPlaceManagerRelationshipEntity>()
await _dbContext.Deleteable<BusinessPlaceManagerRelationshipEntity>()
.Where(x => x.ManagerUserId == request.UserId)
.ExecuteCommandAsync();
@@ -86,16 +84,16 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
}).ToList());
}
public async Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsyc(int id)
public async Task<List<BusinessPlacePermissionPageResponse>> GetBusinessPlacePermissionByUserIdAsync(int id)
{
var infos = await _dbContext.Queryable<BusinessPlaceManagerRelationshipEntity>()
.LeftJoin<BusinessPlaceEntity>((x, bplace) => x.BusinessPlaceCode == bplace.Code)
.LeftJoin<BusinessPlaceEntity>((x, bPlace) => x.BusinessPlaceCode == bPlace.Code)
.Where(x => x.ManagerUserId == id)
.Select((x, bplace) => new BusinessPlacePermissionPageResponse
.Select((x, bPlace) => new BusinessPlacePermissionPageResponse
{
UserId = x.ManagerUserId,
BusinessPlaceCode = x.BusinessPlaceCode,
BusinessPlaceName = bplace.Name,
BusinessPlaceName = bPlace.Name,
})
.ToListAsync();
@@ -109,6 +107,6 @@ public class BusinessPlacePermissionsService : IBusinessPlacePermissionsService
public async Task DeleteAssignmentAsync(int id)
{
await _dbContext.Client.Deleteable<BusinessPlaceManagerRelationshipEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
await _dbContext.Deleteable<BusinessPlaceManagerRelationshipEntity>().Where(x => x.Id == id).ExecuteCommandAsync();
}
}

5
Src/Dlhis.Basic/Places/Services/Implements/BusinessPlaceService.cs
View File

@@ -31,9 +31,8 @@ public class BusinessPlaceService : IBusinessPlaceService
var page = await _dbContext.Queryable<BusinessPlaceEntity>()
.LeftJoin<BusinessPlaceShiftRelationshipEntity>((x, ps) => x.Code == ps.PlaceCode)
.LeftJoin<BusinessShiftEntity>((x, ps, s) => s.Code == ps.ShiftCode)
.WhereIF(request.Search.IsPresent(), x => x.CustomCode.Contains(request.Search)
|| x.Code.ToString().Contains(request.Search)
|| x.Name.Contains(request.Search))
.WhereIF(request.Search.IsPresent(), x => x.CustomCode == request.Search
|| x.Name == request.Search)
.WhereIF(request.Catalog.HasValue, x => x.Catalog == request.Catalog)
.WhereIF(request.Status.HasValue, x => x.Status == request.Status)
.WhereIF(request.Source.HasValue, x => x.Source == request.Source)