diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs index 8a81bc9e..9e506b77 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_SchoolAttachment.Dto.EditInput.cs @@ -27,6 +27,6 @@ namespace Tiobon.Core.Model.Models { [NotMapped] - public List Attachments { get; set; } + public List Attachments { get; set; } } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs index 967ba00a..fc2d16cf 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_SchoolAttachment.Dto.InsertInput.cs @@ -26,6 +26,6 @@ namespace Tiobon.Core.Model.Models public class InsertGhre_SchoolAttachmentInput : Ghre_SchoolAttachmentBase { [NotMapped] - public List Attachments { get; set; } + public List Attachments { get; set; } } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_SchoolAttachment.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_SchoolAttachment.Dto.View.cs index 2d2fd17a..6f9ac5a5 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_SchoolAttachment.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_SchoolAttachment.Dto.View.cs @@ -32,6 +32,6 @@ public class Ghre_SchoolAttachmentDto : Ghre_SchoolAttachment /// public string UpdateDataInfo { get; set; } - public List Attachments { get; set; } = new List(); + public List Attachments { get; set; } = new List(); } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index afbe5cc9..f548b917 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1027,6 +1027,10 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ghr-icon-stop", position = "left" }); + toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault(); + if (toolbar != null) { toolbar.fnKey = "TBD6YN"; } + toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault(); + if (toolbar != null) { toolbar.fnKey = "TBD7YN"; } result.DT_Procedure.ExportExcel = "/api/Ghre_Course/ExportExcel/Released"; break; @@ -1041,6 +1045,10 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ghr-icon-stop", position = "left" }); + toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault(); + if (toolbar != null) { toolbar.fnKey = "TBD6YN"; } + toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault(); + if (toolbar != null) { toolbar.fnKey = "TBD7YN"; } result.DT_Procedure.ExportExcel = "/api/Ghre_Course/ExportExcel/Disabled"; break; diff --git a/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs b/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs index 9844ba4c..16fef37e 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_SchoolServices.cs @@ -18,17 +18,17 @@ namespace Tiobon.Core.Services; public class Ghre_SchoolServices : BaseServices, IGhre_SchoolServices { private readonly IBaseRepository _dal; - private IGhrs_AttachmentServices _ghrs_AttachmentServices; + private IGhre_AttachmentServices _ghre_AttachmentServices; private IGhre_SchoolAttachmentServices _ghre_SchoolAttachmentServices; public Ghre_SchoolServices(ICaching caching, - IGhrs_AttachmentServices ghrs_AttachmentServices, + IGhre_AttachmentServices ghre_AttachmentServices, IGhre_SchoolAttachmentServices ghre_SchoolAttachmentServices, IBaseRepository dal) { this._dal = dal; base.BaseDal = dal; base._caching = caching; - _ghrs_AttachmentServices = ghrs_AttachmentServices; + _ghre_AttachmentServices = ghre_AttachmentServices; _ghre_SchoolAttachmentServices = ghre_SchoolAttachmentServices; } @@ -68,7 +68,7 @@ public class Ghre_SchoolServices : BaseServices x.Id).ToList(); var schoolAttachments = await _ghre_SchoolAttachmentServices.QueryDto(x => ids.Contains(x.SchoolId.Value)); var ids1 = schoolAttachments.Select(x => x.Id.ToString()).ToList(); - var attachments = await _ghrs_AttachmentServices.QueryDto(x => ids1.Contains(x.TableName)); + var attachments = await _ghre_AttachmentServices.QueryDto(x => ids1.Contains(x.TableName)); schoolAttachments.ForEach(x => { @@ -97,8 +97,8 @@ public class Ghre_SchoolServices : BaseServices() - .SetColumns(it => new Ghrs_Attachment() { TableName = schoolAttachmentId.ToString(), UpdateTime = DateTime.Now }) + await Db.Updateable() + .SetColumns(it => new Ghre_Attachment() { TableName = schoolAttachmentId.ToString(), UpdateTime = DateTime.Now }) .Where(it => it.RelativePath == insert.Attachments[j].RelativePath) .ExecuteCommandAsync(); } @@ -122,8 +122,8 @@ public class Ghre_SchoolServices : BaseServices() - .SetColumns(it => new Ghrs_Attachment() { TableName = schoolAttachmentId.ToString(), UpdateTime = DateTime.Now }) + await Db.Updateable() + .SetColumns(it => new Ghre_Attachment() { TableName = schoolAttachmentId.ToString(), UpdateTime = DateTime.Now }) .Where(it => it.RelativePath == insert.Attachments[j].RelativePath) .ExecuteCommandAsync(); }