diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 91779e8e..40067397 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -9190,6 +9190,11 @@ 预留字段12 + + + 开班ID + + Ghre_SurveyRecordDetail (Dto.Base) @@ -27752,6 +27757,11 @@ 预留字段12 + + + 开班ID + + Ghre_SurveyRecordDetail (Model) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index 5b627a90..90ecfb15 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1521,6 +1521,14 @@ + + + 查询 + + + 开班ID + + 提交 diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index e4156d74..40137386 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -330,7 +330,17 @@ public class BaseServices : IBaseServ ip = GetUserIp(UserContext.Context); } - var list = Mapper.Map(listEntity).ToANew>(); + + var list = new List(); + + foreach (var item in listEntity) + { + var entity = new TEntity(); + ConvertTInsertDto2TEntity(item, entity); + list.Add(entity); + } + + //var list = Mapper.Map(listEntity).ToANew>(); list.ForEach(entity => { BasePoco ent = entity as BasePoco; @@ -1154,6 +1164,25 @@ public class BaseServices : IBaseServ // dest.SetValueForField(DbConsts.ColunmName_TenantId, _currentTenantId); //} } + protected void ConvertTInsertDto2TEntity(TInsertDto source, TEntity dest) + { + foreach (System.Reflection.PropertyInfo mItem in typeof(TEditDto).GetProperties()) + { + if (dest.HasField(mItem.Name)) + dest.SetValueForField(mItem.Name, mItem.GetValue(source, null)); + } + //dest.SetValueForField(DbConsts.ColunmName_LastModificationTime, DateTimeHelper.Now()); + //if (_currentUserId != default) + //{ + // //dest.SetValueForField(DbConsts.ColunmName_LastModifierId, _currentUserId); + // dest.SetValueForField(DbConsts.ColunmName_LastModifier, _currentUserName); + //} + + //if (_currentTenantId != null) + //{ + // dest.SetValueForField(DbConsts.ColunmName_TenantId, _currentTenantId); + //} + } #region 检查表中是否已经存在相同代码的数据 @@ -1393,8 +1422,8 @@ where IsEnable=1 and ParaMasterNo = '{ParaMasterNo}' and ParaDetailNo in (select value from Openjson('{value}')) ORDER BY SortNo ASC"; - var list = DbAccess.QueryList(sql); - + var list = DbAccess.QueryList(sql); + label = string.Join(",", list.Select(o => o.ParaDetailName)); return label; }