From 2cdba175bdc94bf53370d4c3a5204253cf3d435e Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Thu, 14 Mar 2024 18:50:59 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E4=BC=98=E5=8C=96=E5=94=AF=E4=B8=80?=
 =?UTF-8?q?=E7=BC=96=E7=A0=81=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Implements/BusinessPlaceShiftService.cs        | 14 ++++++--------
 .../Device/Services/Implements/DeviceService.cs    |  1 +
 .../Basic/Entity/BusinessShiftEntity.cs            |  2 ++
 Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs      |  2 ++
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
index 92f5f95e..de3fa555 100644
--- a/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
+++ b/Src/Dlhis.Basic/BusinessShift/Services/Implements/BusinessPlaceShiftService.cs
@@ -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)
         {
diff --git a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
index a0524c49..c0020c88 100644
--- a/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
+++ b/Src/Dlhis.Basic/Device/Services/Implements/DeviceService.cs
@@ -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);
             //同时保存注册信息
diff --git a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
index 9893a6c6..8964221f 100644
--- a/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/BusinessShiftEntity.cs
@@ -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; }
 
diff --git a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
index ddedd0ec..ed046e71 100644
--- a/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
+++ b/Src/Dlhis.Entity/Basic/Entity/DeviceEntity.cs
@@ -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; }