diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 81025bc2..18c06757 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -32155,7 +32155,7 @@ LABL 0 Arial Unicode MS,8,N Ghrh_ResumeInfoColumn 1728540766 Administrator -1728541283 +1729070075 Administrator 简历信息栏位 @@ -32593,6 +32593,30 @@ Ghra_staff_InsureBase int +F951FC54-7855-41D3-B1B1-B8104D2A3C83 +关联表名 +MapTableName +1729070074 +Administrator +1729070246 +Administrator +关联表名 +nvarchar(100) +100 + + +84E8D2E5-F271-4D0E-A9D8-9FAC68EDCCFB +关联栏位 +MapColumnName +1729070066 +Administrator +1729070249 +Administrator +关联栏位 +nvarchar(100) +100 + + DA455CC0-1A90-47AF-BB9A-55A1FFA8AF67 排序号 SortNo @@ -32604,7 +32628,7 @@ Ghra_staff_InsureBase 0 int - + 48B0B283-AB94-4D15-A552-C67A92E8006D 备注 RemarkSz @@ -32619,7 +32643,7 @@ Ghra_staff_InsureBase - + EBAA2097-78FD-42D6-B99A-FF230C776266 默认标志 IsDefault @@ -32634,7 +32658,7 @@ Ghra_staff_InsureBase - + D2F68549-9494-4258-A171-43C0226DED33 删除标志 IsEnable @@ -32649,7 +32673,7 @@ Ghra_staff_InsureBase - + D12D9003-CB6D-435F-BF30-C3A78CEF1BE9 预留字段1 Reverse1 @@ -32661,7 +32685,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + E1363769-9F0F-403F-81AC-F0EC714E9095 预留字段2 Reverse2 @@ -32673,7 +32697,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 5C28ED53-9193-443F-AED1-C98ADB79690D 预留字段3 Reverse3 @@ -32685,7 +32709,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 013F480E-7E75-41CF-8294-A2FC95337662 预留字段4 Reverse4 @@ -32697,7 +32721,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 26BD5315-21A4-49E6-BF6C-69584B3A3D84 预留字段5 Reverse5 @@ -32709,7 +32733,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + CB08D874-7819-4535-A91F-B7DE7985B89B 预留字段6 Reverse6 @@ -32721,7 +32745,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + FEF3132C-8318-4AB1-A1A4-E40202DB764A 预留字段7 Reverse7 @@ -32733,7 +32757,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + EC2FB03C-0723-490C-A790-85E781E33559 预留字段8 Reverse8 @@ -32745,7 +32769,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 122CEDD3-4489-460A-BCB9-519CA3171E22 预留字段9 Reverse9 @@ -32757,7 +32781,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + FB22EBB6-6940-428E-96BE-BF6D78A8A2AD 预留字段10 Reverse10 @@ -32769,7 +32793,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 0ADFCABF-B653-4AD3-BD8B-236052B00FCE 预留字段I1 ReverseI1 @@ -32781,7 +32805,7 @@ Ghra_staff_InsureBase 0 int - + B9A55369-D7E5-4BEA-AD0D-83B11D5267C2 预留字段I2 ReverseI2 @@ -32795,7 +32819,7 @@ Ghra_staff_InsureBase - + 3F34432E-2CAA-45F6-B211-254A53D81B21 Key_1 Key_1 @@ -32809,13 +32833,13 @@ Ghra_staff_InsureBase - + - + - + FF355889-10E1-442C-9112-74B03CFDF75A 简历模板组栏位2 Ghrh_ResumeTemplateInfoGroupColumn2 @@ -32825,7 +32849,7 @@ Ghra_staff_InsureBase Administrator 简历模板组栏位 - + 74EEA468-7C6F-442D-B9D1-A0431FB55B4E Id Id @@ -32840,7 +32864,7 @@ Ghra_staff_InsureBase - + 0BB75A86-7BDA-455A-AD49-597F43D1128E 创建人 CreateBy @@ -32854,7 +32878,7 @@ Ghra_staff_InsureBase - + E39F646B-7DDB-4A55-8F7B-A51DFE3BC57F 创建时间 CreateTime @@ -32868,7 +32892,7 @@ Ghra_staff_InsureBase - + AE41E6DC-E243-48D3-97C8-35752CA74455 创建程序 CreateProg @@ -32880,7 +32904,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + 8417BEF7-852B-4937-A4C3-712FAD9D358D 创建人IP CreateIP @@ -32892,7 +32916,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + 6075FF03-55E1-4422-B63B-3F567B255A10 修改人 UpdateBy @@ -32906,7 +32930,7 @@ Ghra_staff_InsureBase - + D7CDAC9C-CD5F-43CF-9C03-F902D69BBF71 修改时间 UpdateTime @@ -32920,7 +32944,7 @@ Ghra_staff_InsureBase - + E925A137-905B-4C8A-A40B-C36B349C54A8 修改程序 UpdateProg @@ -32932,7 +32956,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + 747AE1FA-E763-4DE6-BF67-083C4C0E1A1A 修改人IP UpdateIP @@ -32944,7 +32968,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + 9E5DBC91-3173-41E8-AF21-681D129BC493 操作日志ID OperateLogID @@ -32959,7 +32983,7 @@ Ghra_staff_InsureBase - + 20335FB3-59A5-431E-BF73-1847F943EED4 模板ID ResumeTemplateId @@ -32970,7 +32994,7 @@ Ghra_staff_InsureBase 模板ID bigint - + E3A50308-8BBB-4599-A983-F5722EACE85E 模板组ID ResumeTemplateInfoGroupId @@ -32981,7 +33005,7 @@ Ghra_staff_InsureBase 模板组ID bigint - + 0290DD0A-55C0-4FDA-B97B-A1E0B5D1E38F 模板类型 TemplateType @@ -32993,7 +33017,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + CCC786DE-C943-42F8-A499-E21A907A02A3 组别类型 GroupType @@ -33005,7 +33029,7 @@ Ghra_staff_InsureBase nvarchar(100) 100 - + 4CED787F-2CCE-4F7F-A5CB-72F953FBEB76 简历信息栏位ID ResumeInfoColumnId @@ -33016,7 +33040,7 @@ Ghra_staff_InsureBase 简历信息栏位ID bigint - + 1286AC2A-9A83-4B96-A1AA-4AA38C837B36 是否必填 IsRequired @@ -33028,7 +33052,7 @@ Ghra_staff_InsureBase 0 int - + A57F4014-C64F-440B-BBF7-5B7824E44D5A 是否可编辑 Editable @@ -33040,7 +33064,7 @@ Ghra_staff_InsureBase 0 int - + 190B1948-F072-439C-A41D-CB9F8ADB2F34 初始值 InitValue @@ -33052,7 +33076,7 @@ Ghra_staff_InsureBase nvarchar(2000) 2000 - + 9DC79025-6E61-417D-BBF1-7C4162341422 是否显示 IsDisplay @@ -33064,7 +33088,7 @@ Ghra_staff_InsureBase 0 int - + 15C4633A-FDF6-451B-B4B4-D48783EFBF6B 排序号 SortNo @@ -33076,7 +33100,7 @@ Ghra_staff_InsureBase 0 int - + E059EF51-A864-46C0-96E3-1ED4DEC35341 RowNum RowNum @@ -33087,7 +33111,7 @@ Ghra_staff_InsureBase RowNum int - + 1E1FAE2C-DAF9-4106-9A70-CCB74DBD9EE0 ColNum ColNum @@ -33098,7 +33122,7 @@ Ghra_staff_InsureBase ColNum int - + 9EFA4658-BE63-49A1-B77D-09E9A07B6D00 备注 RemarkSz @@ -33113,7 +33137,7 @@ Ghra_staff_InsureBase - + 9A0D70B9-E6F4-485A-AA1D-BDA9BFE7927B 默认标志 IsDefault @@ -33128,7 +33152,7 @@ Ghra_staff_InsureBase - + 4A1DDF0F-B49D-4111-A8C8-84E6AB1501B0 删除标志 IsEnable @@ -33143,7 +33167,7 @@ Ghra_staff_InsureBase - + 6E387A04-ADAA-4B90-AC76-8F88279E9C54 预留字段1 Reverse1 @@ -33155,7 +33179,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D2076C47-1976-47AA-8D38-8F6BD0B1AE14 预留字段2 Reverse2 @@ -33167,7 +33191,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 6C27F98A-3B4F-41F1-8F52-660F52E88C6E 预留字段3 Reverse3 @@ -33179,7 +33203,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 4CDF5E1E-6D8F-4581-BBD3-1A6F6D360BA5 预留字段4 Reverse4 @@ -33191,7 +33215,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 19BD438F-D6DA-4315-820A-BDAF2E0C6CE6 预留字段5 Reverse5 @@ -33203,7 +33227,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + F504CC1A-4807-459C-973E-E0970B50BF8B 预留字段6 Reverse6 @@ -33215,7 +33239,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + C7294116-D915-49FF-86D0-DC4394ADD323 预留字段7 Reverse7 @@ -33227,7 +33251,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + F99B5E07-8B48-4E3B-9DD9-1E72C7E41EE4 预留字段8 Reverse8 @@ -33239,7 +33263,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 78AEF3CD-A2C4-49D5-8CA3-7EF7F870AE9F 预留字段9 Reverse9 @@ -33251,7 +33275,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D2C9C04A-BA45-4EB9-8269-4E72162BFAD0 预留字段10 Reverse10 @@ -33263,7 +33287,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 2D08F3CC-D331-4DA3-8135-342324816FBF 预留字段I1 ReverseI1 @@ -33275,7 +33299,7 @@ Ghra_staff_InsureBase 0 int - + E0B6D06E-9844-433A-9228-89E061A16D7A 预留字段I2 ReverseI2 @@ -33289,7 +33313,7 @@ Ghra_staff_InsureBase - + 2DD0D279-EF02-4E46-8EAE-66B403884443 Key_1 Key_1 @@ -33298,15 +33322,15 @@ Ghra_staff_InsureBase 1728626329 Administrator - + - + - + @@ -33330,7 +33354,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -33364,7 +33388,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -33379,7 +33403,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -33398,7 +33422,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -33432,7 +33456,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -33466,7 +33490,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -33500,7 +33524,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -33534,7 +33558,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -33568,7 +33592,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -33602,7 +33626,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -33636,7 +33660,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -33670,7 +33694,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -33704,7 +33728,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -33738,7 +33762,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -33772,7 +33796,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -33806,7 +33830,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -33840,7 +33864,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -33855,7 +33879,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -33874,7 +33898,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -33908,7 +33932,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -33942,7 +33966,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -33976,7 +34000,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -34010,7 +34034,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -34044,7 +34068,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -34078,7 +34102,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -34093,7 +34117,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -34112,7 +34136,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -34146,7 +34170,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -34180,7 +34204,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -34195,7 +34219,7 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 @@ -34214,7 +34238,7 @@ Ghra_staff_InsureBase - + E2D02611-09C9-42E2-AA43-22E820AF219C 1728626387 Administrator @@ -34248,7 +34272,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -34282,7 +34306,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -34304,7 +34328,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -34317,7 +34341,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -34325,12 +34349,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -34342,7 +34366,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -34352,7 +34376,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -34362,7 +34386,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -34373,7 +34397,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -34385,7 +34409,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -34396,7 +34420,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -34407,7 +34431,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -34419,7 +34443,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -34430,7 +34454,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -34441,7 +34465,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -34463,7 +34487,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -34477,7 +34501,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -34498,7 +34522,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -34530,7 +34554,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -34541,7 +34565,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -34551,7 +34575,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -34564,7 +34588,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -34573,13 +34597,13 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 02EF92C9-49BF-45C7-934A-23BA290D5595 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Tiobon.Core.Api/Tiobon.Core.Model.xml b/Tiobon.Core.Api/Tiobon.Core.Model.xml index 013413eb..475a1246 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6090,6 +6090,16 @@ 数据来源ID + + + 关联表名 + + + + + 关联栏位 + + 排序号 @@ -14416,6 +14426,16 @@ 数据来源ID + + + 关联表名 + + + + + 关联栏位 + + 排序号 diff --git a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoColumn.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoColumn.Dto.Base.cs index ed9f7646..bb8fdd53 100644 --- a/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoColumn.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghrh/Ghrh_ResumeInfoColumn.Dto.Base.cs @@ -163,6 +163,18 @@ namespace Tiobon.Core.Model.Models /// public int? DataSourceID { get; set; } + /// + /// 关联表名 + /// + [Display(Name = "MapTableName"), Description("关联表名"), MaxLength(100, ErrorMessage = "关联表名 不能超过 100 个字符")] + public string MapTableName { get; set; } + + /// + /// 关联栏位 + /// + [Display(Name = "MapColumnName"), Description("关联栏位"), MaxLength(100, ErrorMessage = "关联栏位 不能超过 100 个字符")] + public string MapColumnName { get; set; } + /// /// 排序号 /// diff --git a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs index a3ef741e..8f836665 100644 --- a/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs +++ b/Tiobon.Core.Model/Models/Ghrh/Ghrh_ResumeInfoColumn.cs @@ -165,6 +165,18 @@ namespace Tiobon.Core.Model.Models /// public int? DataSourceID { get; set; } + /// + /// 关联表名 + /// + [Display(Name = "MapTableName"), Description("关联表名"), MaxLength(100, ErrorMessage = "关联表名 不能超过 100 个字符")] + public string MapTableName { get; set; } + + /// + /// 关联栏位 + /// + [Display(Name = "MapColumnName"), Description("关联栏位"), MaxLength(100, ErrorMessage = "关联栏位 不能超过 100 个字符")] + public string MapColumnName { get; set; } + /// /// 排序号 /// diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs index 7182a0ff..42b57707 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeInfoGroupServices.cs @@ -4,7 +4,6 @@ using Tiobon.Core.Model.Models; using Tiobon.Core.Services.BASE; using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; -using Tiobon.Core.Common.Helper; namespace Tiobon.Core.Services { @@ -26,6 +25,8 @@ namespace Tiobon.Core.Services entity.GroupType = entity.GroupType ?? "Other"; var SortNo = await Db.Queryable().MaxAsync(it => it.SortNo); entity.SortNo = SortNo + 1; + + return await base.Add(entity); } } diff --git a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs index 0350fb18..ab313512 100644 --- a/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs +++ b/Tiobon.Core.Services/Ghrh/Ghrh_ResumeTemplateServices.cs @@ -9,8 +9,10 @@ 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; +using OfficeOpenXml.FormulaParsing.Utilities; +using Tiobon.Core.Common.DB; +using Tiobon.Core.Common.LogHelper; +using Tiobon.Core.Model.Systems.DataBase; namespace Tiobon.Core.Services; @@ -775,7 +777,11 @@ END"; #region 执行模板栏位变更 public async Task ExceteTemplateColumnChange(QueryForm filter) { - var sql = @$"DECLARE + var sql = string.Empty; + + + + sql = @$"DECLARE @jsonParam NVARCHAR (MAX) = '{filter.jsonParam}', -- 查询条件通过Json格式回传 数据库 @doType NVARCHAR (100) = '{filter.doType}', -- Insert:新增 Update:修改 Delete:删除 Unpublish:取消发布 BatchDelete:批次删除 BatchUpdaate:多行数据更新 -- SortData: 修改序号和是否默认 @@ -802,6 +808,8 @@ END"; @MKey NVARCHAR (1000), @TableName NVARCHAR (1000), @ColumnName NVARCHAR (1000), + @MapTableName NVARCHAR (1000), + @MapColumnName NVARCHAR (1000), @IsSingleColumn NVARCHAR (1000), @ColumnType NVARCHAR (1000), @DataType NVARCHAR (1000), @@ -894,6 +902,8 @@ END"; @MKey = MKey, @TableName = TableName, @ColumnName = ColumnName, + @MapTableName = MapTableName, + @MapColumnName = MapColumnName, @IsSingleColumn = IsSingleColumn, @ColumnType = ColumnType, @DataType = DataType, @@ -918,6 +928,8 @@ END"; MKey NVARCHAR (1000), TableName NVARCHAR (1000), ColumnName NVARCHAR (1000), + MapTableName NVARCHAR (1000), + MapColumnName NVARCHAR (1000), IsSingleColumn NVARCHAR (1000), ColumnType NVARCHAR (1000), DataType NVARCHAR (1000), @@ -971,29 +983,21 @@ END"; SET @ErrorMsg = @ErrorMsg + '此栏位名称已经被使用,不能重复使用' + IF @MapTableName = '' + SET @ErrorMsg = @ErrorMsg + '关联表名不能为空' -- [dbo].[FLangKeyToValue]('F_ResumeInfoColumn_0001',@langId,'集团数据归属名称不能为空') - -- 如果为异动栏位, 则该栏位 需要在异动表中存在 - IF @IsChangeColumn = 1 - BEGIN - IF @ColumnName = 'RemarkSZ' - SET @ErrorMsg = - @ErrorMsg - + '此栏位不能作为异动栏位' - - IF (SELECT count (1) - FROM sys.columns a - INNER JOIN sysobjects d - ON a.object_id = d.id - AND d.xtype = 'U' - AND d.name <> 'dtproperties' - WHERE d.name IN ('Ghrh_ResumeChange') - AND a.name = @ColumnName) = - 0 - SET @ErrorMsg = - @ErrorMsg - + '异动栏位必须要在异动表中有' - END - + -- 栏位名称不能重复被使用 + IF (SELECT count (1) + FROM Ghrh_ResumeInfoColumn + WHERE IsEnable = 1 + AND Id ! = @id + AND MapTableName = @MapTableName + AND MapColumnName = @MapColumnName) > + 0 + SET @ErrorMsg = + @ErrorMsg + + '此栏位名称已经被使用,不能重复使用' + -- 下拉必须选择 数据源 IF @ColumnType = 'ApiSelect' BEGIN @@ -1211,6 +1215,8 @@ END"; MKey = @MKey, TableName = @TableName, ColumnName = @ColumnName, + MapTableName = @MapTableName, + MapColumnName = @MapColumnName, IsSingleColumn = @IsSingleColumn, ColumnType = @ColumnType, DataType = @DataType, @@ -1248,6 +1254,8 @@ END"; MKey, TableName, ColumnName, + MapTableName, + MapColumnName, IsSingleColumn, ColumnType, DataType, @@ -1275,13 +1283,15 @@ END"; [UpdateTime], [UpdateProg], [UpdateIP]) - SELECT 1846057738145239040, + SELECT {SnowFlakeSingle.Instance.NextId()}, @ResumeInfoGroupId, @ResumeInfoColumnNo, @ResumeInfoColumnName, @MKey, @TableName, @ColumnName, + @MapTableName, + @MapColumnName, @IsSingleColumn, @ColumnType, @DataType, @@ -1330,13 +1340,13 @@ END"; APIDataSourceID = iif (ISNUMERIC (@DataSource) = 1, @DataSource, NULL), dataSource = '' - FROM Ghrh_PageSettingQuery a + FROM Ghrs_PageSettingQuery a WHERE a.pageno LIKE 'F_ResumeChange%' AND a.field = @ColumnName AND a.IsEnable = 1 -- 2. 新增栏位 - INSERT INTO Ghrh_PageSettingQuery (PageNo, + INSERT INTO Ghrs_PageSettingQuery (PageNo, ColumnGroup, elementType, field, @@ -1404,12 +1414,12 @@ END"; searchCanOperator, @menuName, @menuName - FROM Ghrh_PageSettingquery a + FROM Ghrs_PageSettingquery a WHERE pageno LIKE 'F_ResumeChange%' AND field = 'ChangeDate' -- 写入可选择栏位 AND NOT EXISTS (SELECT 1 - FROM Ghrh_PageSettingQuery kk + FROM Ghrs_PageSettingQuery kk WHERE kk.IsEnable = 1 AND kk.PageNo = a.PageNo AND kk.field = @ColumnName) @@ -1424,12 +1434,12 @@ END"; APIDataSourceID = iif (ISNUMERIC (@DataSource) = 1, @DataSource, NULL), dataSource = '' - FROM Ghrh_PageSettingEdit a + FROM Ghrs_PageSettingEdit a WHERE a.pageno LIKE 'F_ResumeChange%' AND a.field = @ColumnName AND a.IsEnable = 1 - INSERT INTO dbo.Ghrh_PageSettingEdit (pageNo, + INSERT INTO dbo.Ghrs_PageSettingEdit (pageNo, columnGroup, elementType, field, @@ -1476,12 +1486,12 @@ END"; rowNum, colNum, IsSingleColumn - FROM Ghrh_PageSettingEdit a + FROM Ghrs_PageSettingEdit a WHERE pageno LIKE 'F_ResumeChange%' AND field = 'ChangeDate' -- 写入可选择栏位 AND NOT EXISTS (SELECT 1 - FROM Ghrh_PageSettingEdit kk + FROM Ghrs_PageSettingEdit kk WHERE kk.IsEnable = 1 AND kk.PageNo = a.PageNo AND kk.field = @ColumnName) @@ -1540,9 +1550,12 @@ END"; @WarningMsg WarnMsg, @SuccessMsg 'Message' -- IsOK 0:代表正确, 1:代表错误 END"; + //DataTable dt = await DbAccess.GetDataTableAsync(sql); + //var dt = await Db.Ado.GetDataTableAsync(sql); - var dt = await Db.Ado.GetDataTableAsync(sql); + //var dt = await Db.Ado.GetDataTableAsync(" SELECT 'true' Success, 1 ErrorMsg, 1 WarnMsg, 1 'Message' "); + var dt = await Db.Ado.GetDataTableAsync(sql); if (dt.Rows.Count > 0) { if (dt.Rows[0]["Success"].ToString() == "true") @@ -1699,25 +1712,25 @@ END"; #region 执行模板栏位变更 public async Task PT_GHR30_StaffTemplate_IUD(QueryForm1 filter) { - var sql = @$"DECLARE - @jsonParam NVARCHAR (MAX) - = '{filter.jsonParam}', -- 查询条件通过Json格式回传 数据库 - @doType NVARCHAR (100) = '{filter.doType}', -- Insert:新增 Update:修改 Delete:删除 BatchDelete:批次删除 BatchUpdaate:多行数据更新 - -- ColumnMove:模板-分组-栏位移动 GroupMove:模板-分组 移动 - -- GroupInsert:新增 GroupUpdate:修改 GroupDelete:删除 - -- SortData: 修改序号和是否默认 - @id BIGINT = '{filter.id}', -- 表的唯一值。自增长的值 Delete /Update 用到 - @langId INT = '{filter.langId}', -- 语言 - @userId INT = '{filter.userId}', -- 使用者 - @menuName NVARCHAR (1000) = '{filter.menuName}' + var paramSql = @$"DECLARE + @jsonParam NVARCHAR (MAX) + = '{filter.jsonParam}', -- 查询条件通过Json格式回传 数据库 + @doType NVARCHAR (100) = '{filter.doType}', -- Insert:新增 Update:修改 Delete:删除 BatchDelete:批次删除 BatchUpdaate:多行数据更新 + -- ColumnMove:模板-分组-栏位移动 GroupMove:模板-分组 移动 + -- GroupInsert:新增 GroupUpdate:修改 GroupDelete:删除 + -- SortData: 修改序号和是否默认 + @id BIGINT = '{filter.id}', -- 表的唯一值。自增长的值 Delete /Update 用到 + @langId INT = '{filter.langId}', -- 语言 + @userId INT = '{filter.userId}', -- 使用者 + @menuName NVARCHAR (1000) = '{filter.menuName}' "; + string sql = string.Empty; -BEGIN + switch (filter.doType) + { + case "GroupInsert": + sql = @$"BEGIN SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED - DECLARE - @NeedOPLog INT = 1, - @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 - - -- SELECT 'DT_ProcedureResult' Table3 + DECLARE @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 @@ -1734,49 +1747,15 @@ BEGIN BEGIN TRY -- 开始错误处理 BEGIN TRAN tranResumeTemplate -- 开始事物处理 - -- 写入日志 - -- EXEC [dbo].[PS_OperateLog]@userId, @doType, @menuName, 'Ghrh_ResumeTemplate', @ID, @jsonParam, @OperateLogID OUTPUT - - IF @doType = 'Delete' -- 资料删除 - BEGIN - UPDATE Ghrh_ResumeTemplate - SET OperateLogID = @OperateLogID, - IsEnable = 0, - UpdateBy = @userId, - UpdateTime = GETDATE (), - UpdateProg = @menuName - WHERE Id = @ID - - SET @SuccessMsg = '删除成功' - - SELECT 0 IsOK, - @ErrorMsg ErrorMsg, - @WarningMsg WarnMsg, - @SuccessMsg SuccessMsg -- IsOK 0:代表正确, 1:代表错误 - - COMMIT TRAN tranResumeTemplate - RETURN - END - - -- PhotoType: 1: 方形 2:圆形 - IF @doType = 'PhotoSwitch' - BEGIN - UPDATE Ghrh_ResumeTemplate - SET PhotoType = - (SELECT value - FROM OPENJSON (@jsonParam) - WHERE [key] = 'PhotoType') - WHERE Id = @id - END - -- GroupInsert:新增 GroupUpdate:修改 GroupDelete:删除 IF @doType = 'GroupInsert' BEGIN -- if @id>0 BEGIN - DECLARE @ResumeInfoGroupID INT = 0 + DECLARE @ResumeInfoGroupID BIGINT = {SnowFlakeSingle.Instance.NextId()} - INSERT INTO Ghrh_ResumeInfoGroup (GroupNo, + INSERT INTO Ghrh_ResumeInfoGroup (Id, + GroupNo, GroupName, MKey, GroupType, @@ -1786,7 +1765,8 @@ BEGIN TablePKIDName, CanModifyBySelf, CanEssDisplay) - SELECT ResumeInfoGroupNo, + SELECT @ResumeInfoGroupID, + ResumeInfoGroupNo, ResumeInfoGroupName, MKey, 'Other', @@ -1807,18 +1787,18 @@ BEGIN CanModifyBySelf NVARCHAR (1000), CanEssDisplay NVARCHAR (1000)) - SET @ResumeInfoGroupID = SCOPE_IDENTITY () - -- 如果之前没有则需要新增 IF @ResumeInfoGroupID > 0 INSERT INTO Ghrh_ResumeTemplateInfoGroup ( + Id, ResumeTemplateId, TemplateType, ResumeInfoGroupId, IsDisplay, GroupType, SortNo) - SELECT a.Id ResumeTemplateId, + SELECT '{SnowFlakeSingle.Instance.NextId()}', + a.Id ResumeTemplateId, a.TemplateType, c.Id ResumeInfoGroupId, 1, @@ -1831,6 +1811,59 @@ BEGIN END END + + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "GroupUpdate": + sql = @$"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + IF @doType = 'GroupUpdate' BEGIN IF @id > 0 @@ -1873,6 +1906,58 @@ BEGIN END END + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "GroupDelete": + sql = @$"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + IF @doType = 'GroupDelete' BEGIN -- if @id=0 @@ -1887,6 +1972,58 @@ BEGIN END END + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "GroupSwitch": + sql = @$"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + IF @doType = 'GroupSwitch' -- 分组隐藏和分组显示 BEGIN UPDATE a @@ -1903,13 +2040,13 @@ BEGIN AND a.IsEnable = 1 -- 如果之前没有则需要新增 - INSERT INTO Ghrh_ResumeTemplateInfoGroup (ResumeTemplateId, + INSERT INTO Ghrh_ResumeTemplateInfoGroup (Id,ResumeTemplateId, TemplateType, ResumeInfoGroupId, IsDisplay, GroupType, SortNo) - SELECT a.Id ResumeTemplateId, + SELECT ABS(CHECKSUM(NewId())),a.Id ResumeTemplateId, a.TemplateType, b.ResumeInfoGroupId, b.DisplayType, @@ -1928,6 +2065,59 @@ BEGIN FROM Ghrh_ResumeTemplateInfoGroup WHERE ResumeTemplateId = @id AND IsEnable = 1) END + + + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "GroupMove": + sql = @$"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 IF @doType = 'GroupMove' -- :模板-分组 移动 BEGIN @@ -1943,13 +2133,15 @@ BEGIN AND a.ResumeInfoGroupId = b.ResumeInfoGroupId -- 如果没有的需要新增 - INSERT INTO Ghrh_ResumeTemplateInfoGroup (ResumeTemplateId, + INSERT INTO Ghrh_ResumeTemplateInfoGroup (Id, + ResumeTemplateId, TemplateType, ResumeInfoGroupId, IsDisplay, GroupType, SortNo) - SELECT a.Id ResumeTemplateId, + SELECT ABS (CHECKSUM (NewId ())), + a.Id ResumeTemplateId, a.TemplateType, b.ResumeInfoGroupId, b.DisplayType, @@ -1957,7 +2149,7 @@ BEGIN b.SortNo FROM Ghrh_ResumeTemplate a, (SELECT ResumeInfoGroupId, DisplayType, SortNo - FROM OPENJSON (@jsonParam) WITH (ResumeInfoGroupId INT, + FROM OPENJSON (@jsonParam) WITH (ResumeInfoGroupId BIGINT, DisplayType INT, SortNo INT)) b, Ghrh_ResumeInfoGroup c @@ -1969,6 +2161,58 @@ BEGIN WHERE ResumeTemplateId = @id AND IsEnable = 1) END + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "ColumnMove": + sql = @$"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + IF @doType = 'ColumnMove' -- 模板栏位异动 模板里面的栏位增加减少 移动 批次操作 BEGIN UPDATE a -- 移动栏位 @@ -2009,6 +2253,7 @@ BEGIN -- 新增栏位 INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn ( + Id, ResumeTemplateInfoGroupId, ResumeTemplateId, TemplateType, @@ -2022,7 +2267,8 @@ BEGIN SortNo, RowNum, ColNum) - SELECT a.Id ResumeTemplateInfoGroupId, + SELECT ABS (CHECKSUM (NewId ())), + a.Id ResumeTemplateInfoGroupId, ResumeTemplateId, a.TemplateType, a.ResumeInfoGroupId, @@ -2037,9 +2283,10 @@ BEGIN 1 FROM Ghrh_ResumeTemplateInfoGroup a, (SELECT ResumeInfoColumnID, DisplayType, SortNo - FROM OPENJSON (@jsonParam) WITH (ResumeInfoColumnID BIGINT, - DisplayType INT, - SortNo INT)) b, + FROM OPENJSON (@jsonParam) WITH ( + ResumeInfoColumnID BIGINT, + DisplayType INT, + SortNo INT)) b, Ghrh_ResumeInfoColumn c WHERE a.Id = @id AND b.ResumeInfoColumnID = c.ID @@ -2459,6 +2706,133 @@ BEGIN END END + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "Delete": + sql = $@"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + + IF @doType = 'Delete' -- 资料删除 + BEGIN + UPDATE Ghrh_ResumeTemplate + SET OperateLogID = @OperateLogID, + IsEnable = 0, + UpdateBy = @userId, + UpdateTime = GETDATE (), + UpdateProg = @menuName + WHERE Id = @ID + + SET @SuccessMsg = '删除成功' + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg -- IsOK 0:代表正确, 1:代表错误 + + COMMIT TRAN tranResumeTemplate + RETURN + END + + COMMIT TRAN tranResumeTemplate -- 提交事物处理 + END TRY + BEGIN CATCH -- 错误捕捉 + SET @ErrorMsg = error_message () -- 错误信息 + ROLLBACK TRAN tranResumeTemplate -- 退回数据库的操作记录 + + SELECT 1 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 + + RETURN + END CATCH + + SET @SuccessMsg = + [dbo].[FLangKeyToValue] + ('GHR_Common_000014', + @langId, + '保存成功.您可以继续新增或关闭窗口.') + + SELECT 0 IsOK, + @ErrorMsg ErrorMsg, + @WarningMsg WarnMsg, + @SuccessMsg SuccessMsg, + @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 +END"; + break; + case "Update": + case "Insert": + case "Copy": + sql = $@"BEGIN + SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED + DECLARE + @NeedOPLog INT = 1, + @OperateLogID BIGINT = 0 -- 是否需要写入操作日志表 + + -- SELECT 'DT_ProcedureResult' Table3 + + DECLARE @ErrorMsg NVARCHAR (MAX) = '' -- 错误信息置空 + DECLARE @WarningMsg NVARCHAR (MAX) = '' -- 提醒信息置空 + DECLARE @SuccessMsg NVARCHAR (MAX) = '' + DECLARE @NewResumeTemplateId BIGINT = 0 + DECLARE + @title NVARCHAR (1000), + @description NVARCHAR (1000), + @titleAllowEdit NVARCHAR (1000), + @isMaster NVARCHAR (1000), + @isPublish NVARCHAR (1000), + @SortNo NVARCHAR (100) + + BEGIN TRY -- 开始错误处理 + BEGIN TRAN tranResumeTemplate -- 开始事物处理 + IF @doType IN ('Update', 'Insert', 'Copy') BEGIN IF @jsonParam ! = '' -- 传入的参数处理 @@ -2521,9 +2895,10 @@ BEGIN IF @doType = 'Copy' BEGIN - SET @NewResumeTemplateId = '{SnowFlakeSingle.Instance.NextId()}' + SET @NewResumeTemplateId = '1846788600784621570' - INSERT INTO [dbo].[Ghrh_ResumeTemplate] (Id, + INSERT INTO [dbo].[Ghrh_ResumeTemplate] ( + Id, TemplateNo, TemplateName, SortNo, @@ -2539,7 +2914,8 @@ BEGIN [UpdateTime], [UpdateProg], [UpdateIP]) - SELECT @NewResumeTemplateId,@title, + SELECT @NewResumeTemplateId, + @title, @title, CASE WHEN isnull (@SortNo, '') = '' THEN '1' @@ -2559,18 +2935,20 @@ BEGIN '' FROM Ghrh_ResumeTemplate WHERE Id = @ID - + -- 复制 模板的Detail --1. 复制分组 - INSERT INTO Ghrh_ResumeTemplateInfoGroup (Id, + INSERT INTO Ghrh_ResumeTemplateInfoGroup ( + Id, ResumeTemplateId, TemplateType, ResumeInfoGroupId, IsDisplay, GroupType, SortNo) - SELECT ABS(CHECKSUM(NewId())),@NewResumeTemplateId, + SELECT ABS (CHECKSUM (NewId ())), + @NewResumeTemplateId, 2, a.ResumeInfoGroupId, a.IsDisplay, @@ -2580,7 +2958,8 @@ BEGIN WHERE a.ResumeTemplateId = @id -- 复制分组栏位 - INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn (Id, + INSERT INTO Ghrh_ResumeTemplateInfoGroupColumn ( + Id, ResumeTemplateInfoGroupId, ResumeTemplateId, TemplateType, @@ -2594,7 +2973,8 @@ BEGIN SortNo, RowNum, ColNum) - SELECT ABS(CHECKSUM(NewId())),c.Id ResumeTemplateInfoGroupId, + SELECT ABS (CHECKSUM (NewId ())), + c.Id ResumeTemplateInfoGroupId, c.ResumeTemplateId, 2, a.ResumeInfoGroupId, @@ -2621,7 +3001,7 @@ BEGIN DECLARE @CopyMenuName NVARCHAR (100) = 'F_Resume~' + CONVERT - (NVARCHAR (max), @NewResumeTemplateId) + (NVARCHAR (MAX), @NewResumeTemplateId) INSERT INTO Ghrs_PageSettingQuery (PageNo, ColumnGroup, @@ -2695,7 +3075,9 @@ BEGIN SET @doType = 'Insert' -- exec [dbo].[PS_OperateLog] 1,'Insert','/ResumeTemplate','Ghrh_ResumeTemplate',1, @OperateLogID output - INSERT INTO [dbo].[Ghrh_ResumeTemplate] (TemplateNo, + + SET @NewResumeTemplateId = {SnowFlakeSingle.Instance.NextId()} + INSERT INTO [dbo].[Ghrh_ResumeTemplate] (Id,TemplateNo, TemplateName, SortNo, IsPublish, @@ -2710,7 +3092,7 @@ BEGIN [UpdateTime], [UpdateProg], [UpdateIP]) - SELECT @title, + SELECT @NewResumeTemplateId,@title, @title, isnull (@SortNo, '1'), @IsPublish, @@ -2725,8 +3107,6 @@ BEGIN GETDATE (), @menuName, '0' - - SET @ID = SCOPE_IDENTITY () END END @@ -2757,7 +3137,13 @@ BEGIN @SuccessMsg SuccessMsg, @NewResumeTemplateId NewResumeTemplateId -- IsOK 0:代表正确, 1:代表错误 END"; + break; + default: + + break; + } + sql = paramSql + sql; var dt = await Db.Ado.GetDataTableAsync(sql); if (dt.Rows.Count > 0) diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 013413eb..475a1246 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -6090,6 +6090,16 @@ 数据来源ID + + + 关联表名 + + + + + 关联栏位 + + 排序号 @@ -14416,6 +14426,16 @@ 数据来源ID + + + 关联表名 + + + + + 关联栏位 + + 排序号