diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs index b32afa03..aec347c9 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs @@ -44,5 +44,5 @@ public class Ghrh_ResumeInfoGroupDto : Ghrh_ResumeInfoGroup public int configurable { get; set; } public int isDisplay { get; set; } public string GroupColumn1 { get; set; } - public List GroupColumn { get; set; } + public object GroupColumn { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs index 3ea37b20..e6482c01 100644 --- a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,14 @@ namespace Tiobon.Core.Model.Models; /// public class Ghrh_ResumeTemplateDto : Ghrh_ResumeTemplate { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + public bool? IsMaster { get; set; } } diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index 3ad4ccfb..6a2137ad 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -403,7 +403,7 @@ public class BaseServices : IBaseServ ent.UpdateIP = ip; ent.UpdateProg = api; CheckOnly(entity, Id); - return await BaseDal.Update(entity); + return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, where); } public async Task Update(Dictionary editModels) { diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs index 0d4c556f..c4578b17 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs @@ -9,6 +9,8 @@ using Tiobon.Core.Common; using Tiobon.Core.Common.Helper; using Tiobon.Core.Model.ViewModels.Extend; using SqlSugar; +using Newtonsoft.Json.Linq; +using Tiobon.Core.Common.DB.Dapper.Extensions; namespace Tiobon.Core.Services; @@ -25,6 +27,21 @@ public class Ghrh_ResumeTemplateServices : BaseServices> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + result.result.DT_TableDataT1.ForEach(t => + { + t.IsMaster = t.TemplateType == "1" ? true : false; + }); + return result; + + } + public override async Task Update(long Id, EditGhrh_ResumeTemplateInput editModel) + { + return await base.Update(Id, editModel, ["TemplateName", "RemarkSz"]); + } + #region 是否开启 public async Task SwitchPublish(long id, int? isPublish) { @@ -136,7 +153,7 @@ BEGIN AND kk.IsDisplay = 1 AND pp.IsEnable = 1 AND kk.IsEnable = 1 - -- order by kk.SortNo + order by kk.SortNo FOR JSON PATH, INCLUDE_NULL_VALUES), '') WHEN b.GroupType = 'Photo' -- 读取各模板设定 @@ -167,7 +184,7 @@ BEGIN AND kk.IsDisplay = 1 AND pp.IsEnable = 1 AND kk.IsEnable = 1 - -- order by kk.SortNo + order by kk.SortNo FOR JSON PATH, INCLUDE_NULL_VALUES), '') END @@ -189,8 +206,16 @@ END"; { if (x.GroupColumn1.IsNotEmptyOrNull()) { - x.GroupColumn = JsonHelper.JsonToObj>(x.GroupColumn1); - x.GroupColumn = x.GroupColumn.OrderBy(o => o.SortNo).ToList(); + //if (x.GroupType == "Photo") + //{ + + //} + //else + //{ + // var GroupColumn = JsonHelper.JsonToObj>(x.GroupColumn1); + // x.GroupColumn = GroupColumn.OrderBy(o => o.SortNo).ToList(); + //} + x.GroupColumn = JsonHelper.JsonToObj>>(x.GroupColumn1); } x.GroupColumn1 = null; @@ -1697,7 +1722,7 @@ BEGIN DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 DECLARE @SuccessMsg NVARCHAR (MAX) = '' - DECLARE @NewResumeTemplateId INT = 0 + DECLARE @NewResumeTemplateId BIGINT = 0 DECLARE @title NVARCHAR (1000), @description NVARCHAR (1000), @@ -1950,7 +1975,7 @@ BEGIN SET a.SortNo = b.SortNo, a.IsDisplay = b.DisplayType FROM Ghrh_ResumeTemplateInfoGroupColumn a, (SELECT ResumeInfoColumnID, DisplayType, SortNo - FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID INT, + FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID BIGINT, DisplayType INT, SortNo INT)) b WHERE a.ResumeTemplateInfoGroupID = @id @@ -1964,7 +1989,7 @@ BEGIN WHERE ID IN (SELECT ResumeInfoColumnID FROM OPENJSON (@jsonParam) WITH ( - ResumeInfoColumnID INT, + ResumeInfoColumnID BIGINT, DisplayType INT, SortNo INT) WHERE DisplayType IN (0, 1)) @@ -1977,7 +2002,7 @@ BEGIN AND ResumeInfoColumnID IN (SELECT ResumeInfoColumnID FROM OPENJSON (@jsonParam) WITH ( - ResumeInfoColumnID INT, + ResumeInfoColumnID BIGINT, DisplayType INT, SortNo INT) WHERE DisplayType = -1) @@ -2012,7 +2037,7 @@ BEGIN 1 FROM Ghrh_ResumeTemplateInfoGroup a, (SELECT ResumeInfoColumnID, DisplayType, SortNo - FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID INT, + FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID BIGINT, DisplayType INT, SortNo INT)) b, Ghrh_ResumeInfoColumn c @@ -2496,9 +2521,9 @@ BEGIN IF @doType = 'Copy' BEGIN - SET @NewResumeTemplateId = 0 + SET @NewResumeTemplateId = '{SnowFlakeSingle.Instance.NextId()}' - INSERT INTO [dbo].[Ghrh_ResumeTemplate] ( + INSERT INTO [dbo].[Ghrh_ResumeTemplate] (Id, TemplateNo, TemplateName, SortNo, @@ -2514,7 +2539,7 @@ BEGIN [UpdateTime], [UpdateProg], [UpdateIP]) - SELECT @title, + SELECT @NewResumeTemplateId,@title, @title, CASE WHEN isnull (@SortNo, '') = '' THEN '1' @@ -2534,19 +2559,18 @@ BEGIN '' FROM Ghrh_ResumeTemplate WHERE Id = @ID - - SET @NewResumeTemplateId = SCOPE_IDENTITY () + -- 复制 模板的Detail --1. 复制分组 - INSERT INTO Ghrh_ResumeTemplateInfoGroup ( + INSERT INTO Ghrh_ResumeTemplateInfoGroup (Id, ResumeTemplateId, TemplateType, ResumeInfoGroupId, IsDisplay, GroupType, SortNo) - SELECT @NewResumeTemplateId, + SELECT ABS(CHECKSUM(NewId())),@NewResumeTemplateId, 2, a.ResumeInfoGroupId, a.IsDisplay, @@ -2556,7 +2580,7 @@ BEGIN WHERE a.ResumeTemplateId = @id -- 复制分组栏位 - INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn ( + INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn (Id, ResumeTemplateInfoGroupId, ResumeTemplateId, TemplateType, @@ -2570,7 +2594,7 @@ BEGIN SortNo, RowNum, ColNum) - SELECT c.Id ResumeTemplateInfoGroupId, + SELECT ABS(CHECKSUM(NewId())),c.Id ResumeTemplateInfoGroupId, c.ResumeTemplateId, 2, a.ResumeInfoGroupId, @@ -2597,7 +2621,7 @@ BEGIN DECLARE @CopyMenuName NVARCHAR (100) = 'F_Resume~' + CONVERT - (NVARCHAR (10), @NewResumeTemplateId) + (NVARCHAR (max), @NewResumeTemplateId) INSERT INTO Ghrs_PageSettingQuery (PageNo, ColumnGroup,