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

fix 恢复ToDateJsonConverter,增加获取设备的人员列表,数据权限移除

Browse Source
This commit is contained in:
liguoyang
2024-06-03 15:06:32 +08:00
parent dd6db605a1
commit a052e77e53
20 changed files with 138 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Src/Dlhis.Basic/Places/Controllers/BusinessPlacesController.cs
View File

@@ -127,4 +127,4 @@ public class BusinessPlacesController : ControllerBase
{
await _businessPlaceShiftService.DispositionDeviceAsync(request);
}
}
}

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

@@ -1,8 +1,11 @@
using Dlhis.Basic.Places.Request;
using Dlhis.Basic.Places.Response;
using Dlhis.Entity.Basic.Entity;
using Dlhis.Entity.Canteen.Entities;
using Dlhis.Entity.Canteen.Enums;
using Kurisu.AspNetCore.CustomClass;
using Kurisu.AspNetCore.DataAccess.Dto;
using Kurisu.AspNetCore.DataAccess.Entity;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions;
using Kurisu.AspNetCore.DataAccess.SqlSugar.Services;
using Kurisu.AspNetCore.Utils.Extensions;
@@ -112,6 +115,11 @@ public class BusinessPlaceService : IBusinessPlaceService
else
{
var entity = await _dbContext.Queryable<BusinessPlaceEntity>().FirstAsync(x => x.Id == request.Id);
if (await _dbContext.Queryable<BalanceRecordEntity>().AnyAsync(x => x.BusinessPlaceCode == entity.Code) && request.CustomCode != entity.CustomCode)
{
throw new UserFriendlyException("设备已产生消费记录,不可编辑编码");
}
request.Adapt(entity);
await _dbContext.UpdateAsync(entity);
@@ -149,12 +157,15 @@ public class BusinessPlaceService : IBusinessPlaceService
/// <returns></returns>
private async Task CheckExistsCustomCodeAsync(BusinessPlaceSaveRequest request)
{
var existsSameCustomCode = await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.WhereIF(request.Id.HasValue, x => x.Id != request.Id)
.AnyAsync();
await _dbContext.IgnoreAsync<ITenantId>(async () =>
{
var existsSameCustomCode = await _dbContext.Queryable<BusinessPlaceEntity>()
.Where(x => x.CustomCode == request.CustomCode)
.WhereIF(request.Id.HasValue, x => x.Id != request.Id)
.AnyAsync();
existsSameCustomCode.ThrowIfTrue($"自定义手工号[{request.CustomCode}]存在重复,请检查.");
existsSameCustomCode.ThrowIfTrue($"自定义手工号[{request.CustomCode}]存在重复,请检查.");
});
}
/// <summary>