diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index c22b761d..81025bc2 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -7542,7 +7542,7 @@ Shadow=0 SystemManager7 1248331945 Administrator -1728541044 +1728626303 Administrator 系统管理 [FolderOptions] @@ -11249,7 +11249,7 @@ LABL 0 Arial Unicode MS,8,N SystemManager12 1728522772 Administrator -1728541044 +1728626365 Administrator [DisplayPreferences] @@ -31185,7 +31185,7 @@ LABL 0 Arial Unicode MS,8,N Ghrh_ResumeInfoGroup 1728532662 Administrator -1728538841 +1728625707 Administrator 简历组别 @@ -31377,10 +31377,11 @@ LABL 0 Arial Unicode MS,8,N TableName 1728532662 Administrator -1728538741 +1728625838 Administrator 表名 -bigint +nvarchar(100) +100 4FA40771-EB0D-4C07-BB13-E0FE1922B581 @@ -31388,11 +31389,12 @@ LABL 0 Arial Unicode MS,8,N TablePKIDName 1728532662 Administrator -1728538772 +1728625867 Administrator 主键名 0 -int +nvarchar(100) +100 AA4A61DB-13D2-4B67-9768-F202C6FD1A40 @@ -31419,24 +31421,24 @@ LABL 0 Arial Unicode MS,8,N int -D47041E0-EDE1-4FEA-9973-3FC0B9510164 +DFADCC31-220C-487D-A453-9D2BD403A048 员工可修改 -员工可修改 -1728538840 +CanModifyBySelf +1728625694 Administrator -1728541628 +1728625710 Administrator 员工可修改 0 int -008D8253-892A-4D11-A15D-5FC1EEA742F3 +E53D3221-9E14-48D9-AEA0-AD95C187D571 ESS 显示 -ESS 显示 -1728538808 +CanEssDisplay +1728625694 Administrator -1728541632 +1728625720 Administrator ESS 显示 0 @@ -31659,7 +31661,7 @@ LABL 0 Arial Unicode MS,8,N Ghrh_ResumeTemplateInfoGroupColumn 1728539889 Administrator -1728540495 +1728626396 Administrator 简历模板组栏位 @@ -32128,12 +32130,12 @@ LABL 0 Arial Unicode MS,8,N -BB206C63-35B4-4620-9B64-1A1E9F228703 -Key_1 -Key_1 -1728539889 +6FA16D47-CFB1-40F9-837D-9795F9B38C26 +Key_12 +Key_12 +1728626387 Administrator -1728539889 +1728626410 Administrator @@ -32813,6 +32815,500 @@ Ghra_staff_InsureBase + +FF355889-10E1-442C-9112-74B03CFDF75A +简历模板组栏位2 +Ghrh_ResumeTemplateInfoGroupColumn2 +1728626303 +Administrator +1728626303 +Administrator +简历模板组栏位 + + +74EEA468-7C6F-442D-B9D1-A0431FB55B4E +Id +Id +1728626303 +Administrator +1728626303 +Administrator +ID +bigint +1 + + + + + +0BB75A86-7BDA-455A-AD49-597F43D1128E +创建人 +CreateBy +1728626303 +Administrator +1728626303 +Administrator +创建人 +int + + + + + +E39F646B-7DDB-4A55-8F7B-A51DFE3BC57F +创建时间 +CreateTime +1728626303 +Administrator +1728626303 +Administrator +创建时间 +datetime + + + + + +AE41E6DC-E243-48D3-97C8-35752CA74455 +创建程序 +CreateProg +1728626303 +Administrator +1728626303 +Administrator +创建程序 +nvarchar(100) +100 + + +8417BEF7-852B-4937-A4C3-712FAD9D358D +创建人IP +CreateIP +1728626303 +Administrator +1728626303 +Administrator +创建人IP +nvarchar(100) +100 + + +6075FF03-55E1-4422-B63B-3F567B255A10 +修改人 +UpdateBy +1728626303 +Administrator +1728626303 +Administrator +修改人 +int + + + + + +D7CDAC9C-CD5F-43CF-9C03-F902D69BBF71 +修改时间 +UpdateTime +1728626303 +Administrator +1728626303 +Administrator +修改时间 +datetime + + + + + +E925A137-905B-4C8A-A40B-C36B349C54A8 +修改程序 +UpdateProg +1728626303 +Administrator +1728626303 +Administrator +修改程序 +nvarchar(100) +100 + + +747AE1FA-E763-4DE6-BF67-083C4C0E1A1A +修改人IP +UpdateIP +1728626303 +Administrator +1728626303 +Administrator +修改人IP +nvarchar(100) +100 + + +9E5DBC91-3173-41E8-AF21-681D129BC493 +操作日志ID +OperateLogID +1728626303 +Administrator +1728626303 +Administrator +操作日志ID +0 +bigint + + + + + +20335FB3-59A5-431E-BF73-1847F943EED4 +模板ID +ResumeTemplateId +1728626303 +Administrator +1728626303 +Administrator +模板ID +bigint + + +E3A50308-8BBB-4599-A983-F5722EACE85E +模板组ID +ResumeTemplateInfoGroupId +1728626303 +Administrator +1728626303 +Administrator +模板组ID +bigint + + +0290DD0A-55C0-4FDA-B97B-A1E0B5D1E38F +模板类型 +TemplateType +1728626303 +Administrator +1728626303 +Administrator +模板类型 +nvarchar(100) +100 + + +CCC786DE-C943-42F8-A499-E21A907A02A3 +组别类型 +GroupType +1728626303 +Administrator +1728626303 +Administrator +组别类型 +nvarchar(100) +100 + + +4CED787F-2CCE-4F7F-A5CB-72F953FBEB76 +简历信息栏位ID +ResumeInfoColumnId +1728626303 +Administrator +1728626303 +Administrator +简历信息栏位ID +bigint + + +1286AC2A-9A83-4B96-A1AA-4AA38C837B36 +是否必填 +IsRequired +1728626303 +Administrator +1728626303 +Administrator +是否必填 +0 +int + + +A57F4014-C64F-440B-BBF7-5B7824E44D5A +是否可编辑 +Editable +1728626303 +Administrator +1728626303 +Administrator +是否可编辑 +0 +int + + +190B1948-F072-439C-A41D-CB9F8ADB2F34 +初始值 +InitValue +1728626303 +Administrator +1728626303 +Administrator +初始值 +nvarchar(2000) +2000 + + +9DC79025-6E61-417D-BBF1-7C4162341422 +是否显示 +IsDisplay +1728626303 +Administrator +1728626303 +Administrator +是否显示 +0 +int + + +15C4633A-FDF6-451B-B4B4-D48783EFBF6B +排序号 +SortNo +1728626303 +Administrator +1728626303 +Administrator +排序号 +0 +int + + +E059EF51-A864-46C0-96E3-1ED4DEC35341 +RowNum +RowNum +1728626303 +Administrator +1728626303 +Administrator +RowNum +int + + +1E1FAE2C-DAF9-4106-9A70-CCB74DBD9EE0 +ColNum +ColNum +1728626303 +Administrator +1728626303 +Administrator +ColNum +int + + +9EFA4658-BE63-49A1-B77D-09E9A07B6D00 +备注 +RemarkSz +1728626303 +Administrator +1728626303 +Administrator +备注 +nvarchar(2000) +2000 + + + + + +9A0D70B9-E6F4-485A-AA1D-BDA9BFE7927B +默认标志 +IsDefault +1728626303 +Administrator +1728626303 +Administrator +默认标志 +0 +int + + + + + +4A1DDF0F-B49D-4111-A8C8-84E6AB1501B0 +删除标志 +IsEnable +1728626303 +Administrator +1728626303 +Administrator +删除标志 +1 +int + + + + + +6E387A04-ADAA-4B90-AC76-8F88279E9C54 +预留字段1 +Reverse1 +1728626303 +Administrator +1728626303 +Administrator +预留字段1 +nvarchar(1000) +1000 + + +D2076C47-1976-47AA-8D38-8F6BD0B1AE14 +预留字段2 +Reverse2 +1728626303 +Administrator +1728626303 +Administrator +预留字段2 +nvarchar(1000) +1000 + + +6C27F98A-3B4F-41F1-8F52-660F52E88C6E +预留字段3 +Reverse3 +1728626303 +Administrator +1728626303 +Administrator +预留字段3 +nvarchar(1000) +1000 + + +4CDF5E1E-6D8F-4581-BBD3-1A6F6D360BA5 +预留字段4 +Reverse4 +1728626303 +Administrator +1728626303 +Administrator +预留字段4 +nvarchar(1000) +1000 + + +19BD438F-D6DA-4315-820A-BDAF2E0C6CE6 +预留字段5 +Reverse5 +1728626303 +Administrator +1728626303 +Administrator +预留字段5 +nvarchar(1000) +1000 + + +F504CC1A-4807-459C-973E-E0970B50BF8B +预留字段6 +Reverse6 +1728626303 +Administrator +1728626303 +Administrator +预留字段6 +nvarchar(1000) +1000 + + +C7294116-D915-49FF-86D0-DC4394ADD323 +预留字段7 +Reverse7 +1728626303 +Administrator +1728626303 +Administrator +预留字段7 +nvarchar(1000) +1000 + + +F99B5E07-8B48-4E3B-9DD9-1E72C7E41EE4 +预留字段8 +Reverse8 +1728626303 +Administrator +1728626303 +Administrator +预留字段8 +nvarchar(1000) +1000 + + +78AEF3CD-A2C4-49D5-8CA3-7EF7F870AE9F +预留字段9 +Reverse9 +1728626303 +Administrator +1728626303 +Administrator +预留字段9 +nvarchar(1000) +1000 + + +D2C9C04A-BA45-4EB9-8269-4E72162BFAD0 +预留字段10 +Reverse10 +1728626303 +Administrator +1728626303 +Administrator +预留字段10 +nvarchar(1000) +1000 + + +2D08F3CC-D331-4DA3-8135-342324816FBF +预留字段I1 +ReverseI1 +1728626303 +Administrator +1728626303 +Administrator +预留字段11 +0 +int + + +E0B6D06E-9844-433A-9228-89E061A16D7A +预留字段I2 +ReverseI2 +1728626303 +Administrator +1728626303 +Administrator +预留字段12 +0 +int + + + + +2DD0D279-EF02-4E46-8EAE-66B403884443 +Key_1 +Key_1 +1728626303 +Administrator +1728626329 +Administrator + + + + + + + + + + + + @@ -32834,7 +33330,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -32868,7 +33364,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -32883,7 +33379,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -32902,7 +33398,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -32936,7 +33432,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -32970,7 +33466,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -33004,7 +33500,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -33038,7 +33534,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -33072,7 +33568,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -33106,7 +33602,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -33140,7 +33636,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -33174,7 +33670,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -33208,7 +33704,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -33242,7 +33738,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -33276,7 +33772,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -33310,7 +33806,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -33344,7 +33840,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -33359,7 +33855,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -33378,7 +33874,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -33412,7 +33908,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -33446,7 +33942,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -33480,7 +33976,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -33514,7 +34010,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -33548,7 +34044,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -33582,7 +34078,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -33597,7 +34093,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -33616,7 +34112,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -33650,7 +34146,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -33684,7 +34180,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -33699,13 +34195,13 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 1728539997 Administrator -1728539997 +1728626396 Administrator 0..* @@ -33718,11 +34214,11 @@ Ghra_staff_InsureBase - -9A8016D9-94F6-4239-99FC-FD0931643BC6 -1728539997 + +E2D02611-09C9-42E2-AA43-22E820AF219C +1728626387 Administrator -1728539997 +1728626396 Administrator @@ -33752,7 +34248,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -33786,7 +34282,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -33808,7 +34304,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -33821,7 +34317,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -33829,12 +34325,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -33846,7 +34342,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -33856,7 +34352,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -33866,7 +34362,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -33877,7 +34373,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -33889,7 +34385,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -33900,7 +34396,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -33911,7 +34407,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -33923,7 +34419,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -33934,7 +34430,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -33945,7 +34441,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -33967,7 +34463,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -33981,7 +34477,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -34002,7 +34498,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -34034,7 +34530,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -34045,7 +34541,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -34055,7 +34551,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -34068,7 +34564,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -34077,13 +34573,13 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - - + + - + 02EF92C9-49BF-45C7-934A-23BA290D5595 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeInfoGroupController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeInfoGroupController.cs new file mode 100644 index 00000000..61ca0f03 --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeInfoGroupController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// 简历组别(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghrh)] +public class Ghrh_ResumeInfoGroupController : BaseController +{ + public Ghrh_ResumeInfoGroupController(IGhrh_ResumeInfoGroupServices service) : base(service) + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplateController.cs b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplateController.cs index 62425a48..5dbc120e 100644 --- a/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplateController.cs +++ b/Tiobon.Core.Api/Controllers/Ghrh/Ghrh_ResumeTemplateController.cs @@ -20,6 +20,17 @@ public class Ghrh_ResumeTemplateController : BaseController /// [HttpPost("SwitchPublish/{id}/{isPublish}")] - public async Task RecordDuration(long id, int? isPublish) => await _service.SwitchPublish(id, isPublish); + public async Task SwitchPublish(long id, int? isPublish) => await _service.SwitchPublish(id, isPublish); + #endregion + + #region 获取分组数据 + /// + /// 获取分组数据 + /// + /// + /// + [HttpPost("QueryGroup")] + public async Task>> QueryGroup([FromBody] QueryForm filter) => await _service.QueryGroup(filter); + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 6da5a6d5..f17d2c00 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -5960,6 +5960,131 @@ 预留字段12 + + + 简历组别 (Dto.Base) + + + + + 组别编号 + + + + + 组别名 + + + + + 多语Key + + + + + 组别类型 + + + + + 表名 + + + + + 主键名 + + + + + 多表名 + + + + + 排序号 + + + + + 员工可修改 + + + + + ESS 显示 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 简历模板 (Dto.Base) @@ -7362,6 +7487,11 @@ 培训讲师异动附件 (Dto.EditInput) + + + 简历组别 (Dto.EditInput) + + 简历模板 (Dto.EditInput) @@ -7627,6 +7757,11 @@ 培训讲师异动附件 (Dto.InsertInput) + + + 简历组别 (Dto.InsertInput) + + 简历模板 (Dto.InsertInput) @@ -13936,6 +14071,131 @@ 任务内存中的状态 + + + 简历组别 (Model) + + + + + 组别编号 + + + + + 组别名 + + + + + 多语Key + + + + + 组别类型 + + + + + 表名 + + + + + 主键名 + + + + + 多表名 + + + + + 排序号 + + + + + 员工可修改 + + + + + ESS 显示 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 简历模板 (Model) @@ -16662,6 +16922,21 @@ 修改信息 + + + 简历组别(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 简历模板(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index ef35e55a..7b5e5f00 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1136,12 +1136,17 @@ status + + + 简历组别(Controller) + + 简历模板(Controller) - + 是否开启 @@ -1149,6 +1154,13 @@ + + + 获取分组数据 + + + + Ghro_Dept(Controller) diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs new file mode 100644 index 00000000..16556531 --- /dev/null +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeInfoGroupServices.cs @@ -0,0 +1,12 @@ +using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Model.Models; + +namespace Tiobon.Core.IServices +{ + /// + /// 简历组别(自定义服务接口) + /// + public interface IGhrh_ResumeInfoGroupServices :IBaseServices + { + } +} \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs index 4c553b31..14afea87 100644 --- a/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.IServices/Ghrh/IGhrh_ResumeTemplateServices.cs @@ -1,4 +1,5 @@ -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Common; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; @@ -10,5 +11,7 @@ namespace Tiobon.Core.IServices public interface IGhrh_ResumeTemplateServices :IBaseServices { Task SwitchPublish(long id, int? isPublish); + + Task>> QueryGroup(QueryForm filter); } } \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs new file mode 100644 index 00000000..37da4b3c --- /dev/null +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoGroup.Dto.Base.cs @@ -0,0 +1,167 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrh_ResumeInfoGroup.cs +* +*功 能： N / A +* 类 名： Ghrh_ResumeInfoGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/10/11 15:09:37 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; + +namespace Tiobon.Core.Model.Models +{ + + /// + /// 简历组别 (Dto.Base) + /// + public class Ghrh_ResumeInfoGroupBase + { + + /// + /// 组别编号 + /// + [Display(Name = "GroupNo"), Description("组别编号"), MaxLength(100, ErrorMessage = "组别编号 不能超过 100 个字符")] + public string GroupNo { get; set; } + + /// + /// 组别名 + /// + [Display(Name = "GroupName"), Description("组别名"), MaxLength(100, ErrorMessage = "组别名 不能超过 100 个字符")] + public string GroupName { get; set; } + + /// + /// 多语Key + /// + [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] + public string MKey { get; set; } + + /// + /// 组别类型 + /// + [Display(Name = "GroupType"), Description("组别类型"), MaxLength(100, ErrorMessage = "组别类型 不能超过 100 个字符")] + public string GroupType { get; set; } + + /// + /// 表名 + /// + [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] + public string TableName { get; set; } + + /// + /// 主键名 + /// + [Display(Name = "TablePKIDName"), Description("主键名"), MaxLength(100, ErrorMessage = "主键名 不能超过 100 个字符")] + public string TablePKIDName { get; set; } + + /// + /// 多表名 + /// + [Display(Name = "TableNames"), Description("多表名"), MaxLength(1000, ErrorMessage = "多表名 不能超过 1000 个字符")] + public string TableNames { get; set; } + + /// + /// 排序号 + /// + public int? SortNo { get; set; } + + /// + /// 员工可修改 + /// + public int? CanModifyBySelf { get; set; } + + /// + /// ESS 显示 + /// + public int? CanEssDisplay { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + } +} diff --git a/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs new file mode 100644 index 00000000..c0026183 --- /dev/null +++ b/Tiobon.Core.Model/Edit/Ghrh/Ghrh_ResumeInfoGroup.Dto.EditInput.cs @@ -0,0 +1,27 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrh_ResumeInfoGroup.cs +* +*功 能： N / A +* 类 名： Ghrh_ResumeInfoGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/10/11 15:09:37 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models +{ + + /// + /// 简历组别 (Dto.EditInput) + /// + public class EditGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase + { + } +} diff --git a/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs new file mode 100644 index 00000000..d8655c78 --- /dev/null +++ b/Tiobon.Core.Model/Insert/Ghrh/Ghrh_ResumeInfoGroup.Dto.InsertInput.cs @@ -0,0 +1,27 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrh_ResumeInfoGroup.cs +* +*功 能： N / A +* 类 名： Ghrh_ResumeInfoGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/10/11 15:09:37 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models +{ + + /// + /// 简历组别 (Dto.InsertInput) + /// + public class InsertGhrh_ResumeInfoGroupInput : Ghrh_ResumeInfoGroupBase + { + } +} diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs new file mode 100644 index 00000000..9cfc4840 --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoGroup.cs @@ -0,0 +1,169 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrh_ResumeInfoGroup.cs +* +*功 能： N / A +* 类 名： Ghrh_ResumeInfoGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/10/11 15:09:37 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +using System.ComponentModel; +using System.ComponentModel.DataAnnotations; +using SqlSugar; + +namespace Tiobon.Core.Model.Models +{ + + /// + /// 简历组别 (Model) + /// + [SugarTable("Ghrh_ResumeInfoGroup", "Ghrh_ResumeInfoGroup"), Entity(TableCnName = "简历组别", TableName = "Ghrh_ResumeInfoGroup")] + public class Ghrh_ResumeInfoGroup : BasePoco + { + + /// + /// 组别编号 + /// + [Display(Name = "GroupNo"), Description("组别编号"), MaxLength(100, ErrorMessage = "组别编号 不能超过 100 个字符")] + public string GroupNo { get; set; } + + /// + /// 组别名 + /// + [Display(Name = "GroupName"), Description("组别名"), MaxLength(100, ErrorMessage = "组别名 不能超过 100 个字符")] + public string GroupName { get; set; } + + /// + /// 多语Key + /// + [Display(Name = "MKey"), Description("多语Key"), MaxLength(100, ErrorMessage = "多语Key 不能超过 100 个字符")] + public string MKey { get; set; } + + /// + /// 组别类型 + /// + [Display(Name = "GroupType"), Description("组别类型"), MaxLength(100, ErrorMessage = "组别类型 不能超过 100 个字符")] + public string GroupType { get; set; } + + /// + /// 表名 + /// + [Display(Name = "TableName"), Description("表名"), MaxLength(100, ErrorMessage = "表名 不能超过 100 个字符")] + public string TableName { get; set; } + + /// + /// 主键名 + /// + [Display(Name = "TablePKIDName"), Description("主键名"), MaxLength(100, ErrorMessage = "主键名 不能超过 100 个字符")] + public string TablePKIDName { get; set; } + + /// + /// 多表名 + /// + [Display(Name = "TableNames"), Description("多表名"), MaxLength(1000, ErrorMessage = "多表名 不能超过 1000 个字符")] + public string TableNames { get; set; } + + /// + /// 排序号 + /// + public int? SortNo { get; set; } + + /// + /// 员工可修改 + /// + public int? CanModifyBySelf { get; set; } + + /// + /// ESS 显示 + /// + public int? CanEssDisplay { get; set; } + + /// + /// 备注 + /// + [Display(Name = "RemarkSz"), Description("备注"), MaxLength(2000, ErrorMessage = "备注 不能超过 2000 个字符")] + public string RemarkSz { get; set; } + + /// + /// 默认标志 + /// + public int? IsDefault { get; set; } + + /// + /// 预留字段1 + /// + [Display(Name = "Reverse1"), Description("预留字段1"), MaxLength(1000, ErrorMessage = "预留字段1 不能超过 1000 个字符")] + public string Reverse1 { get; set; } + + /// + /// 预留字段2 + /// + [Display(Name = "Reverse2"), Description("预留字段2"), MaxLength(1000, ErrorMessage = "预留字段2 不能超过 1000 个字符")] + public string Reverse2 { get; set; } + + /// + /// 预留字段3 + /// + [Display(Name = "Reverse3"), Description("预留字段3"), MaxLength(1000, ErrorMessage = "预留字段3 不能超过 1000 个字符")] + public string Reverse3 { get; set; } + + /// + /// 预留字段4 + /// + [Display(Name = "Reverse4"), Description("预留字段4"), MaxLength(1000, ErrorMessage = "预留字段4 不能超过 1000 个字符")] + public string Reverse4 { get; set; } + + /// + /// 预留字段5 + /// + [Display(Name = "Reverse5"), Description("预留字段5"), MaxLength(1000, ErrorMessage = "预留字段5 不能超过 1000 个字符")] + public string Reverse5 { get; set; } + + /// + /// 预留字段6 + /// + [Display(Name = "Reverse6"), Description("预留字段6"), MaxLength(1000, ErrorMessage = "预留字段6 不能超过 1000 个字符")] + public string Reverse6 { get; set; } + + /// + /// 预留字段7 + /// + [Display(Name = "Reverse7"), Description("预留字段7"), MaxLength(1000, ErrorMessage = "预留字段7 不能超过 1000 个字符")] + public string Reverse7 { get; set; } + + /// + /// 预留字段8 + /// + [Display(Name = "Reverse8"), Description("预留字段8"), MaxLength(1000, ErrorMessage = "预留字段8 不能超过 1000 个字符")] + public string Reverse8 { get; set; } + + /// + /// 预留字段9 + /// + [Display(Name = "Reverse9"), Description("预留字段9"), MaxLength(1000, ErrorMessage = "预留字段9 不能超过 1000 个字符")] + public string Reverse9 { get; set; } + + /// + /// 预留字段10 + /// + [Display(Name = "Reverse10"), Description("预留字段10"), MaxLength(1000, ErrorMessage = "预留字段10 不能超过 1000 个字符")] + public string Reverse10 { get; set; } + + /// + /// 预留字段11 + /// + public int? ReverseI1 { get; set; } + + /// + /// 预留字段12 + /// + public int? ReverseI2 { get; set; } + } +} diff --git a/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs new file mode 100644 index 00000000..ab6cc685 --- /dev/null +++ b/Tiobon.Core.Model/View/Ghrh/Ghrh_ResumeInfoGroup.Dto.View.cs @@ -0,0 +1,44 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghrh_ResumeInfoGroup.cs +* +*功 能： N / A +* 类 名： Ghrh_ResumeInfoGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2024/10/11 15:09:37 SimonHsiao 初版 +* +* Copyright(c) 2024 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + +/// +/// 简历组别(Dto.View1) +/// +public class Ghrh_ResumeInfoGroupDto : Ghrh_ResumeInfoGroup +{ + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + public long ResumeInfoGroupID { get; set; } + public string ResumeInfoGroupName { get; set; } + public int editable { get; set; } + public int removable { get; set; } + public int canDrag { get; set; } + public int canHide { get; set; } + public int configurable { get; set; } + public int isDisplay { get; set; } + public string GroupColumn1 { get; set; } + public List> GroupColumn { get; set; } +} diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs new file mode 100644 index 00000000..25cff8e5 --- /dev/null +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs @@ -0,0 +1,23 @@ + +using Tiobon.Core.IServices; +using Tiobon.Core.Model.Models; +using Tiobon.Core.Services.BASE; +using Tiobon.Core.IRepository.Base; +using Tiobon.Core.Common.Caches; + +namespace Tiobon.Core.Services +{ + /// + /// 简历组别 (服务) + /// + public class Ghrh_ResumeInfoGroupServices : BaseServices, IGhrh_ResumeInfoGroupServices + { + private readonly IBaseRepository _dal; + public Ghrh_ResumeInfoGroupServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + } +} \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs index c117508d..e04de502 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs @@ -6,36 +6,164 @@ using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; using Tiobon.Core.Model; using Tiobon.Core.Common; +using Tiobon.Core.Common.Helper; -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +/// +/// 简历模板 (服务) +/// +public class Ghrh_ResumeTemplateServices : BaseServices, IGhrh_ResumeTemplateServices { - /// - /// 简历模板 (服务) - /// - public class Ghrh_ResumeTemplateServices : BaseServices, IGhrh_ResumeTemplateServices + private readonly IBaseRepository _dal; + public Ghrh_ResumeTemplateServices(ICaching caching, IBaseRepository dal) { - private readonly IBaseRepository _dal; - public Ghrh_ResumeTemplateServices(ICaching caching, IBaseRepository dal) - { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; - } + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + + #region 是否开启 + public async Task SwitchPublish(long id, int? isPublish) + { + await Db.Updateable() + .SetColumns(it => new Ghrh_ResumeTemplate() + { + IsPublish = isPublish, + UpdateBy = App.User.ID, + UpdateTime = DateTime.Now + }) + .Where(it => it.Id == id) + .ExecuteCommandAsync(); + return ServiceResult.OprateSuccess(); + } + #endregion + + #region 获取分组数据 + public async Task>> QueryGroup(QueryForm filter) + { + + var sql = @$"DECLARE + @MasterTemplateID INT = 0, + @TemplateType INT, + @ID BIGINT -- 母版设定ID + SELECT @ID = {filter.id} + SELECT @TemplateType = TemplateType + FROM Ghrh_ResumeTemplate + WHERE ID = @ID + SELECT @MasterTemplateID = ID + FROM Ghrh_ResumeTemplate + WHERE IsEnable = 1 AND TemplateType = 1 + + SELECT a.ID, + b.ID ResumeInfoGroupID, + b.GroupName ResumeInfoGroupName, + b.GroupType, + b.TableName, + b.TablePKIDName, + b.CanModifyBySelf, + b.CanEssDisplay, + CASE WHEN @TemplateType = 1 THEN 1 ELSE 0 END editable, -- 分组标题 是否可编辑 + CASE + WHEN @TemplateType = 1 AND b.GroupType = 'Other' THEN 1 + ELSE 0 + END removable, -- 群组是否可删除 + CASE + WHEN b.GroupType = 'Base' OR b.GroupType = 'Photo' THEN 0 + ELSE 1 + END canDrag, -- 群组是否可拖拽 + CASE WHEN b.GroupType = 'Base' THEN 0 ELSE 1 END canHide, -- 群组是否可隐藏 + CASE + WHEN @TemplateType = 1 AND b.GroupType ! = 'Attachment' + OR @TemplateType ! = 1 AND b.GroupType = 'Base' + THEN + 1 + ELSE + 0 + END configurable, -- 是否可挑选栏位 + ISNULL (a.IsDisplay, 0) isDisplay, + isnull (a.SortNo, b.SortNo) SortNo, + -- case when ISNULL(a.IsDisplay,0)=0 then '' + CASE + WHEN 1 = 2 + THEN + NULL + ELSE + CASE + WHEN b.GroupType = 'Base' -- 读取各模板设定 + THEN + isnull + ( + (SELECT pp.ResumeInfoColumnName, + pp.Id ResumeInfoColumnId, + pp.IsSingleColumn, + pp.DataType, + pp.ColumnType, + kk.SortNo, + pp.Placeholder, + pp.CanModifyBySelf + FROM Ghrh_ResumeTemplateInfoGroupColumn kk, + Ghrh_ResumeInfoColumn pp + WHERE kk.ResumeTemplateInfoGroupID = a.ID + AND kk.ResumeInfoColumnID = pp.ID + AND kk.IsDisplay = 1 + AND pp.IsEnable = 1 + AND kk.IsEnable = 1 + order by kk.SortNo + FOR JSON PATH, INCLUDE_NULL_VALUES), + NULL) + WHEN b.GroupType = 'Photo' -- 读取各模板设定 + THEN + (SELECT PhotoType + FROM Ghrh_ResumeTemplate + WHERE ID = @MasterTemplateID + FOR JSON PATH, INCLUDE_NULL_VALUES) + WHEN b.GroupType NOT IN ('Base', 'Photo') -- 读取母版的设定 + THEN + isnull + ( + (SELECT pp.ResumeInfoColumnName, + pp.Id ResumeInfoColumnId, + pp.IsSingleColumn, + pp.DataType, + pp.ColumnType, + kk.SortNo, + pp.Placeholder, + pp.CanModifyBySelf + FROM Ghrh_ResumeTemplateInfoGroupColumn kk, + Ghrh_ResumeInfoColumn pp + WHERE kk.ID = @MasterTemplateID + AND kk.ResumeInfoGroupId = b.Id + AND pp.Id = kk.ResumeInfoColumnId + AND kk.IsDisplay = 1 + AND pp.IsEnable = 1 + AND kk.IsEnable = 1 + order by kk.SortNo + FOR JSON PATH, INCLUDE_NULL_VALUES), + NULL) + END + END GroupColumn1 + FROM Ghrh_ResumeInfoGroup b + LEFT JOIN Ghrh_ResumeTemplateInfoGroup a + ON a.ResumeInfoGroupId = b.ID + AND a.IsEnable = 1 -- and a.IsDisplay=1 + AND a.ResumeTemplateID = @ID + WHERE b.IsEnable = 1 + -- order by ISNULL(a.IsDisplay,0) desc,isnull(a.SortNo,b.SortNo) -- 显示的放上面, 不显示的放下面, 再按照序号排序 + ORDER BY a.SortNo asc -- 显示的放上面, 不显示的放下面, 再按照序号排序"; + + var entitys = await Db.Ado.SqlQueryAsync(sql); - #region 是否开启 - public async Task SwitchPublish(long id, int? isPublish) + entitys.ForEach(x => { - await Db.Updateable() - .SetColumns(it => new Ghrh_ResumeTemplate() - { - IsPublish = isPublish, - UpdateBy = App.User.ID, - UpdateTime = DateTime.Now - }) - .Where(it => it.Id == id) - .ExecuteCommandAsync(); - return ServiceResult.OprateSuccess(); - } - #endregion + if (x.GroupColumn1.IsNotEmptyOrNull()) + x.GroupColumn = JsonHelper.JsonToObj>>(x.GroupColumn1); + + x.GroupColumn1 = null; + }); + + return ServiceResult>.OprateSuccess("查询成功！", entitys); + } + #endregion } \ No newline at end of file