Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增模板复制接口

Browse Source
master
xiaochanghai 8 months ago
parent 3290f3079a
commit bdc235cac1
4 changed files with 55 additions and 30 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs
  2. 17
      Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs
  3. 2
      Tiobon.Core.Services/BASE/BaseServices.cs
  4. 60
      Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs

2
Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs
Unescape View File

@ -44,5 +44,5 @@ public class Ghrh_ResumeInfoGroupDto : Ghrh_ResumeInfoGroup
public int configurable { get; set; } public int configurable { get; set; }
public int isDisplay { get; set; } public int isDisplay { get; set; }
public string GroupColumn1 { get; set; } public string GroupColumn1 { get; set; }
public List<ResumeTemplateGroupColumn1> GroupColumn { get; set; } public object GroupColumn { get; set; }
} }

17
Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeTemplate.Dto.View.cs
Unescape View File

@ -22,13 +22,14 @@ namespace Tiobon.Core.Model.Models;
/// </summary> /// </summary>
public class Ghrh_ResumeTemplateDto : Ghrh_ResumeTemplate public class Ghrh_ResumeTemplateDto : Ghrh_ResumeTemplate
{ {
/// <summary> /// <summary>
/// 创建信息 /// 创建信息
/// </summary> /// </summary>
public string CreateDataInfo { get; set; } public string CreateDataInfo { get; set; }
/// <summary> /// <summary>
/// 修改信息 /// 修改信息
/// </summary> /// </summary>
public string UpdateDataInfo { get; set; } public string UpdateDataInfo { get; set; }
public bool? IsMaster { get; set; }
} }

2
Tiobon.Core.Services/BASE/BaseServices.cs
Unescape View File

@ -403,7 +403,7 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
ent.UpdateIP = ip; ent.UpdateIP = ip;
ent.UpdateProg = api; ent.UpdateProg = api;
CheckOnly(entity, Id); CheckOnly(entity, Id);
return await BaseDal.Update(entity); return await BaseDal.Update(entity, lstColumns, lstIgnoreColumns, where);
} }
public async Task<bool> Update(Dictionary<long, TEditDto> editModels) public async Task<bool> Update(Dictionary<long, TEditDto> editModels)
{ {

60
Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs
Unescape View File

@ -9,6 +9,8 @@ using Tiobon.Core.Common;
using Tiobon.Core.Common.Helper; using Tiobon.Core.Common.Helper;
using Tiobon.Core.Model.ViewModels.Extend; using Tiobon.Core.Model.ViewModels.Extend;
using SqlSugar; using SqlSugar;
using Newtonsoft.Json.Linq;
using Tiobon.Core.Common.DB.Dapper.Extensions;
namespace Tiobon.Core.Services; namespace Tiobon.Core.Services;
@ -25,6 +27,21 @@ public class Ghrh_ResumeTemplateServices : BaseServices<Ghrh_ResumeTemplate, Ghr
base._caching = caching; base._caching = caching;
} }
public override async Task<ServicePageResult<Ghrh_ResumeTemplateDto>> 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<bool> Update(long Id, EditGhrh_ResumeTemplateInput editModel)
{
return await base.Update(Id, editModel, ["TemplateName", "RemarkSz"]);
}
#region 是否开启 #region 是否开启
public async Task<ServiceResult> SwitchPublish(long id, int? isPublish) public async Task<ServiceResult> SwitchPublish(long id, int? isPublish)
{ {
@ -136,7 +153,7 @@ BEGIN
AND kk.IsDisplay = 1 AND kk.IsDisplay = 1
AND pp.IsEnable = 1 AND pp.IsEnable = 1
AND kk.IsEnable = 1 AND kk.IsEnable = 1
-- order by kk.SortNo order by kk.SortNo
FOR JSON PATH, INCLUDE_NULL_VALUES), FOR JSON PATH, INCLUDE_NULL_VALUES),
'') '')
WHEN b.GroupType = 'Photo' -- 读取各模板设定 WHEN b.GroupType = 'Photo' -- 读取各模板设定
@ -167,7 +184,7 @@ BEGIN
AND kk.IsDisplay = 1 AND kk.IsDisplay = 1
AND pp.IsEnable = 1 AND pp.IsEnable = 1
AND kk.IsEnable = 1 AND kk.IsEnable = 1
-- order by kk.SortNo order by kk.SortNo
FOR JSON PATH, INCLUDE_NULL_VALUES), FOR JSON PATH, INCLUDE_NULL_VALUES),
'') '')
END END
@ -189,8 +206,16 @@ END";
{ {
if (x.GroupColumn1.IsNotEmptyOrNull()) if (x.GroupColumn1.IsNotEmptyOrNull())
{ {
x.GroupColumn = JsonHelper.JsonToObj<List<ResumeTemplateGroupColumn1>>(x.GroupColumn1); //if (x.GroupType == "Photo")
x.GroupColumn = x.GroupColumn.OrderBy(o => o.SortNo).ToList(); //{
//}
//else
//{
// var GroupColumn = JsonHelper.JsonToObj<List<ResumeTemplateGroupColumn1>>(x.GroupColumn1);
// x.GroupColumn = GroupColumn.OrderBy(o => o.SortNo).ToList();
//}
x.GroupColumn = JsonHelper.JsonToObj<List<Dictionary<string, object>>>(x.GroupColumn1);
} }
x.GroupColumn1 = null; x.GroupColumn1 = null;
@ -1697,7 +1722,7 @@ BEGIN
DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空
DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空
DECLARE @SuccessMsg NVARCHAR (MAX) = '' DECLARE @SuccessMsg NVARCHAR (MAX) = ''
DECLARE @NewResumeTemplateId INT = 0 DECLARE @NewResumeTemplateId BIGINT = 0
DECLARE DECLARE
@title NVARCHAR (1000), @title NVARCHAR (1000),
@description NVARCHAR (1000), @description NVARCHAR (1000),
@ -1950,7 +1975,7 @@ BEGIN
SET a.SortNo = b.SortNo, a.IsDisplay = b.DisplayType SET a.SortNo = b.SortNo, a.IsDisplay = b.DisplayType
FROM Ghrh_ResumeTemplateInfoGroupColumn a, FROM Ghrh_ResumeTemplateInfoGroupColumn a,
(SELECT ResumeInfoColumnID, DisplayType, SortNo (SELECT ResumeInfoColumnID, DisplayType, SortNo
FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID INT, FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID BIGINT,
DisplayType INT, DisplayType INT,
SortNo INT)) b SortNo INT)) b
WHERE a.ResumeTemplateInfoGroupID = @id WHERE a.ResumeTemplateInfoGroupID = @id
@ -1964,7 +1989,7 @@ BEGIN
WHERE ID IN WHERE ID IN
(SELECT ResumeInfoColumnID (SELECT ResumeInfoColumnID
FROM OPENJSON (@jsonParam) WITH ( FROM OPENJSON (@jsonParam) WITH (
ResumeInfoColumnID INT, ResumeInfoColumnID BIGINT,
DisplayType INT, DisplayType INT,
SortNo INT) SortNo INT)
WHERE DisplayType IN (0, 1)) WHERE DisplayType IN (0, 1))
@ -1977,7 +2002,7 @@ BEGIN
AND ResumeInfoColumnID IN AND ResumeInfoColumnID IN
(SELECT ResumeInfoColumnID (SELECT ResumeInfoColumnID
FROM OPENJSON (@jsonParam) WITH ( FROM OPENJSON (@jsonParam) WITH (
ResumeInfoColumnID INT, ResumeInfoColumnID BIGINT,
DisplayType INT, DisplayType INT,
SortNo INT) SortNo INT)
WHERE DisplayType = -1) WHERE DisplayType = -1)
@ -2012,7 +2037,7 @@ BEGIN
1 1
FROM Ghrh_ResumeTemplateInfoGroup a, FROM Ghrh_ResumeTemplateInfoGroup a,
(SELECT ResumeInfoColumnID, DisplayType, SortNo (SELECT ResumeInfoColumnID, DisplayType, SortNo
FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID INT, FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID BIGINT,
DisplayType INT, DisplayType INT,
SortNo INT)) b, SortNo INT)) b,
Ghrh_ResumeInfoColumn c Ghrh_ResumeInfoColumn c
@ -2496,9 +2521,9 @@ BEGIN
IF @doType = 'Copy' IF @doType = 'Copy'
BEGIN BEGIN
SET @NewResumeTemplateId = 0 SET @NewResumeTemplateId = '{SnowFlakeSingle.Instance.NextId()}'
INSERT INTO [dbo].[Ghrh_ResumeTemplate] ( INSERT INTO [dbo].[Ghrh_ResumeTemplate] (Id,
TemplateNo, TemplateNo,
TemplateName, TemplateName,
SortNo, SortNo,
@ -2514,7 +2539,7 @@ BEGIN
[UpdateTime], [UpdateTime],
[UpdateProg], [UpdateProg],
[UpdateIP]) [UpdateIP])
SELECT @title, SELECT @NewResumeTemplateId,@title,
@title, @title,
CASE CASE
WHEN isnull (@SortNo, '') = '' THEN '1' WHEN isnull (@SortNo, '') = '' THEN '1'
@ -2535,18 +2560,17 @@ BEGIN
FROM Ghrh_ResumeTemplate FROM Ghrh_ResumeTemplate
WHERE Id = @ID WHERE Id = @ID
SET @NewResumeTemplateId = SCOPE_IDENTITY ()
-- 复制 模板的Detail -- 复制 模板的Detail
--1. 复制分组 --1. 复制分组
INSERT INTO Ghrh_ResumeTemplateInfoGroup ( INSERT INTO Ghrh_ResumeTemplateInfoGroup (Id,
ResumeTemplateId, ResumeTemplateId,
TemplateType, TemplateType,
ResumeInfoGroupId, ResumeInfoGroupId,
IsDisplay, IsDisplay,
GroupType, GroupType,
SortNo) SortNo)
SELECT @NewResumeTemplateId, SELECT ABS(CHECKSUM(NewId())),@NewResumeTemplateId,
2, 2,
a.ResumeInfoGroupId, a.ResumeInfoGroupId,
a.IsDisplay, a.IsDisplay,
@ -2556,7 +2580,7 @@ BEGIN
WHERE a.ResumeTemplateId = @id WHERE a.ResumeTemplateId = @id
-- 复制分组栏位 -- 复制分组栏位
INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn ( INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn (Id,
ResumeTemplateInfoGroupId, ResumeTemplateInfoGroupId,
ResumeTemplateId, ResumeTemplateId,
TemplateType, TemplateType,
@ -2570,7 +2594,7 @@ BEGIN
SortNo, SortNo,
RowNum, RowNum,
ColNum) ColNum)
SELECT c.Id ResumeTemplateInfoGroupId, SELECT ABS(CHECKSUM(NewId())),c.Id ResumeTemplateInfoGroupId,
c.ResumeTemplateId, c.ResumeTemplateId,
2, 2,
a.ResumeInfoGroupId, a.ResumeInfoGroupId,
@ -2597,7 +2621,7 @@ BEGIN
DECLARE @CopyMenuName NVARCHAR (100) DECLARE @CopyMenuName NVARCHAR (100)
= 'F_Resume~' = 'F_Resume~'
+ CONVERT + CONVERT
(NVARCHAR (10), @NewResumeTemplateId) (NVARCHAR (max), @NewResumeTemplateId)
INSERT INTO Ghrs_PageSettingQuery (PageNo, INSERT INTO Ghrs_PageSettingQuery (PageNo,
ColumnGroup, ColumnGroup,

Write Preview
Loading…
Cancel
Save