fix 优化唯一编码更新问题
This commit is contained in:
@@ -62,7 +62,8 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
|
||||
public async Task<List<BusinessPlaceShiftResponse>> GetListAsync()
|
||||
{
|
||||
var result = await _dbContext.Queryable<BusinessShiftEntity>()
|
||||
.Select<BusinessPlaceShiftResponse>().ToListAsync();
|
||||
.Select<BusinessPlaceShiftResponse>()
|
||||
.ToListAsync();
|
||||
|
||||
return result;
|
||||
}
|
||||
@@ -71,15 +72,14 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
|
||||
{
|
||||
await CheckExistsAsync(request);
|
||||
|
||||
Guid code = Guid.Empty;
|
||||
if (!request.Id.HasValue)
|
||||
{
|
||||
var entity = request.Adapt<BusinessShiftEntity>();
|
||||
|
||||
entity.CustomCode = request.CustomCode;
|
||||
entity.Code = Guid.NewGuid();
|
||||
await _dbContext.InsertAsync(entity);
|
||||
|
||||
code = entity.Code;
|
||||
return entity.Code;
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -89,10 +89,8 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
|
||||
request.Adapt(entity);
|
||||
await _dbContext.UpdateAsync(entity);
|
||||
|
||||
code = entity.Code;
|
||||
return entity.Code;
|
||||
}
|
||||
|
||||
return code;
|
||||
}
|
||||
|
||||
public async Task SaveMealShiftsAsync(List<BusinessPlaceShiftSaveMealShiftRequest> requests)
|
||||
@@ -198,7 +196,7 @@ public class BusinessPlaceShiftService : IBusinessPlaceShiftService
|
||||
.ToListAsync();
|
||||
|
||||
var devices = await _dbContext.Queryable<DeviceEntity>().ToListAsync();
|
||||
|
||||
|
||||
var list = new List<DeviceCodeNameDetail>();
|
||||
if (regiss.Count > 0)
|
||||
{
|
||||
|
||||
@@ -82,6 +82,7 @@ public class DeviceService : IDeviceService
|
||||
if (!request.Id.HasValue)
|
||||
{
|
||||
entity = request.Adapt<DeviceEntity>();
|
||||
entity.UniqueNo = request.UniqueNo;
|
||||
entity.Code = Guid.NewGuid();
|
||||
await _dbContext.InsertAsync(entity);
|
||||
//同时保存注册信息
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
using Kurisu.Core.DataAccess.Entity;
|
||||
using Kurisu.SqlSugar;
|
||||
using Mapster;
|
||||
using SqlSugar;
|
||||
|
||||
namespace Dlhis.Entity.Basic.Entity;
|
||||
@@ -19,6 +20,7 @@ public class BusinessShiftEntity : SugarBaseEntity, ITenantId
|
||||
/// <summary>
|
||||
/// 自定义代号
|
||||
/// </summary>
|
||||
[AdaptIgnore(MemberSide.Destination)]
|
||||
[SugarColumn(ColumnDescription = "自定义手工号")]
|
||||
public string CustomCode { get; set; }
|
||||
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Dlhis.Entity.Device.Enums;
|
||||
using Kurisu.Core.DataAccess.Entity;
|
||||
using Kurisu.SqlSugar;
|
||||
using Mapster;
|
||||
using SqlSugar;
|
||||
using SqlSugar.DbConvert;
|
||||
|
||||
@@ -21,6 +22,7 @@ public class DeviceEntity : SugarBaseEntity, ITenantId
|
||||
/// <summary>
|
||||
/// 设备唯一码,IP/MAC/SNO
|
||||
/// </summary>
|
||||
[AdaptIgnore(MemberSide.Destination)]
|
||||
[SugarColumn(ColumnDescription = "设备唯一码", IsNullable = false, UniqueGroupNameList = new[] { "Idx_Device_UniqueNo" })]
|
||||
public string UniqueNo { get; set; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user