From 5e922489c1c903abeaafd36bc6c34c956d5085fe Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Thu, 26 Sep 2024 17:12:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E8=AE=B2=E5=B8=88=E5=BC=82?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 273 +++++++++--------- Tiobon.Core.Api/Tiobon.Core.Model.xml | 10 + .../Base/Ghre/Ghre_TeacherChange.Dto.Base.cs | 5 + .../Ghre/Ghre_TeacherChange.Dto.EditInput.cs | 8 +- .../Ghre_TeacherChange.Dto.InsertInput.cs | 11 +- ...TeacherChangeAttachment.Dto.InsertInput.cs | 7 +- .../Models/Ghre/Ghre_TeacherChange.cs | 7 +- .../View/Ghre/Ghre_TeacherChange.Dto.View.cs | 27 +- .../Ghre_TeacherChangeAttachment.Dto.View.cs | 21 +- Tiobon.Core.Services/CommonServices.cs | 198 ++++++++++++- .../Ghre/Ghre_TeacherChangeServices.cs | 201 ++++++++++++- 11 files changed, 603 insertions(+), 165 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 83d83361..3a86019b 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -124753,7 +124753,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_TeacherChange 1727334978 Administrator -1727337782 +1727341328 Administrator 培训讲师异动 @@ -124903,6 +124903,17 @@ LABL 0 Arial Unicode MS,8,N bigint +D732DD19-6693-4380-A7EF-E8240E066F31 +机构ID +SchoolId +1727341322 +Administrator +1727341328 +Administrator +机构Id +bigint + + 437E72A5-1F33-4970-AB31-B1543EAD1C4C 原调动类别 OriginChangeType @@ -124914,7 +124925,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AFA40B15-DFE7-491D-8680-3D0E4E19ADBC 调动类别 ChangeType @@ -124926,7 +124937,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 03D3770F-0932-47EF-9B22-CA4C84EC19F3 原调动日期 OriginChangeDate @@ -124938,7 +124949,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 2FD9DA9A-8BC0-4A85-BA0F-5C7FBBB65C5E 调动日期 ChangeDate @@ -124949,7 +124960,7 @@ LABL 0 Arial Unicode MS,8,N 调动日期 datetime - + 8D835F92-FD6F-4CDB-A965-DA3167FC21F5 部门ID DeptID @@ -124960,7 +124971,7 @@ LABL 0 Arial Unicode MS,8,N 部门ID int - + 11E519AC-2C1F-4E12-AA9B-999680C3F684 员工ID StaffId @@ -124971,7 +124982,7 @@ LABL 0 Arial Unicode MS,8,N 员工ID int - + 04302BAF-99DA-4A85-8332-F5D520EC3234 讲师分类 TeacherType @@ -124983,7 +124994,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AEBF0EB8-AAFC-48B2-986A-2CCBF574D6B6 讲师编号 TeacherNo @@ -124995,7 +125006,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 76E7B1EA-E578-4E16-A7DB-E17544D75D46 讲师名称 TeacherName @@ -125007,7 +125018,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + CFB3F228-B1DD-44B6-8C10-765D0F5B5956 员工照片 PhotoUrl @@ -125019,7 +125030,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + E4CBCECF-F487-416A-AE00-C49112C111FB 性别 Gender @@ -125031,7 +125042,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 8A2D3AE4-2CFE-4C86-8E1F-80D45DCDD7CB 邮箱 Email @@ -125043,7 +125054,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(64) 64 - + 24AF8CEF-5DC5-4797-8BD5-A7A2036945C9 手机号码 Mobile @@ -125055,7 +125066,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 5374082B-9768-4861-9664-820F8425DD3F 原讲师等级 OriginTeacherLevel @@ -125067,7 +125078,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 347F7593-A44E-406F-B6A7-088E0F3997DA 讲师等级 TeacherLevel @@ -125079,7 +125090,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + EC409821-DB35-40D9-88E9-31292FBFD960 原课时费 OriginPrice @@ -125092,7 +125103,7 @@ LABL 0 Arial Unicode MS,8,N 20 2 - + 544A8587-6719-4AE4-A384-0272511FB30F 课时费 Price @@ -125105,7 +125116,7 @@ LABL 0 Arial Unicode MS,8,N 20 2 - + 36B80FA8-2392-4DCE-B8CB-142B10409746 原擅长领域 OriginSkillPoints @@ -125117,7 +125128,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + 0D64BFFF-41C0-4AFB-854B-CDDDD40AB6B1 擅长领域 SkillPoints @@ -125129,7 +125140,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + CC925FA2-BDDC-46DB-A689-FB25C2BDBC58 备注 RemarkSz @@ -125144,7 +125155,7 @@ LABL 0 Arial Unicode MS,8,N - + 2AA91BF1-1553-45C0-9DEE-2D129FE9033B 申请理由 ApplyReason @@ -125156,7 +125167,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 0C58FE69-CF8C-4CB1-8D89-891755FEB5A2 状态 Status @@ -125168,7 +125179,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 41E59474-EBF2-4A5D-9306-CA5B9DA7DA34 默认标志 IsDefault @@ -125183,7 +125194,7 @@ LABL 0 Arial Unicode MS,8,N - + 29DA09CA-7E6C-4A58-BD10-21BB46336837 删除标志 IsEnable @@ -125198,7 +125209,7 @@ LABL 0 Arial Unicode MS,8,N - + 3685485D-129F-47B2-8817-024406D179DE WorkID WorkID @@ -125209,7 +125220,7 @@ LABL 0 Arial Unicode MS,8,N WorkID int - + 30EB29D4-47E3-4322-8105-954CCB9EC819 WorkNo WorkNo @@ -125221,7 +125232,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 7BF2D872-D318-4CE7-9D55-F5C9092C8010 ToDoType ToDoType @@ -125233,7 +125244,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + E276449D-4DC4-4F40-B8CE-26426E1825E3 BatchSID BatchSID @@ -125245,7 +125256,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4FF6C005-3D7D-4DB5-8A08-2FDE9282034A WorkState WorkState @@ -125256,7 +125267,7 @@ LABL 0 Arial Unicode MS,8,N WorkState int - + 0AA29D76-548C-4EA7-803D-1DC24DB224E6 ShiftID ShiftID @@ -125267,7 +125278,7 @@ LABL 0 Arial Unicode MS,8,N ShiftID int - + C9206F5D-BA19-45C1-942C-34A659C226EB ConfirmUserID ConfirmUserID @@ -125278,7 +125289,7 @@ LABL 0 Arial Unicode MS,8,N ConfirmUserID int - + 609975DE-8A52-4316-B12B-41AE08959A77 ConfirmTime ConfirmTime @@ -125289,7 +125300,7 @@ LABL 0 Arial Unicode MS,8,N ConfirmTime datetime - + D9A579B5-4DD5-4372-AE29-05889F937E80 ConfirmComment ConfirmComment @@ -125301,7 +125312,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 99FACBAD-47A0-406E-832C-2058488B282B 同意人 AgreeUserId @@ -125312,7 +125323,7 @@ LABL 0 Arial Unicode MS,8,N 同意人 bigint - + C56EAC9F-42BE-43E8-AF27-6EE5CD2A06BD 同意时间 AgreeTime @@ -125323,7 +125334,7 @@ LABL 0 Arial Unicode MS,8,N 同意时间 datetime - + C4786839-1168-4191-8A49-3A28D314F2C9 同意理由 AgreeReason @@ -125335,7 +125346,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 5DF8C559-8C2F-4525-A61A-BCDCC3E0824A 拒绝人 RefuseUserId @@ -125346,7 +125357,7 @@ LABL 0 Arial Unicode MS,8,N 拒绝人 bigint - + D03B135B-19F1-4CCD-AEA2-2F1D5AA355B0 拒绝时间 RefuseTime @@ -125357,7 +125368,7 @@ LABL 0 Arial Unicode MS,8,N 拒绝时间 datetime - + 88AA3A01-2B48-4A1A-93E2-6D7ED0EABB48 拒绝理由 RefuseReason @@ -125369,7 +125380,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 5BD65252-3A50-4057-90C7-C5094254672B 预留字段1 Reverse1 @@ -125381,7 +125392,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + C1532FEE-13AB-424C-A52B-42A52BCFDBC5 预留字段2 Reverse2 @@ -125393,7 +125404,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 57F4AE5D-ED94-428C-9C4C-6D39E07A3DBD 预留字段3 Reverse3 @@ -125405,7 +125416,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 5DF6312B-E833-4B40-ACC0-A668740654CB 预留字段4 Reverse4 @@ -125417,7 +125428,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0B47B8E6-580C-40B8-9FDC-F1E835A09C61 预留字段5 Reverse5 @@ -125429,7 +125440,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + CF2AE483-3B6C-48D4-97C3-827ECB87587E 预留字段6 Reverse6 @@ -125441,7 +125452,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 14C055FB-B00B-49FD-A101-B9AC633243B1 预留字段7 Reverse7 @@ -125453,7 +125464,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 6772E4C7-CAA3-4B99-AFBF-2C3838B1CB15 预留字段8 Reverse8 @@ -125465,7 +125476,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F7A80233-4502-459C-A289-C9048D5A6D6E 预留字段9 Reverse9 @@ -125477,7 +125488,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 5046BD6B-44AB-4C79-BE0A-BE2B56120681 预留字段10 Reverse10 @@ -125489,7 +125500,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 94A249E8-7F86-4074-B198-7F78D3F3546A 预留字段I1 ReverseI1 @@ -125501,7 +125512,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 5B9DDA3D-59F6-45E0-8359-719B2E0BBE5A 预留字段I2 ReverseI2 @@ -125515,7 +125526,7 @@ LABL 0 Arial Unicode MS,8,N - + D7E4376C-F26E-420D-8C69-30D3448B701B Key_1 Key_1 @@ -125529,10 +125540,10 @@ LABL 0 Arial Unicode MS,8,N - + - + @@ -125545,7 +125556,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训讲师异动附件 - + BC6ABA99-F61A-40CD-B8D0-0671D88E6E57 Id Id @@ -125560,7 +125571,7 @@ LABL 0 Arial Unicode MS,8,N - + 4BD66C77-0CA7-46B0-86D4-1EEA4023DD09 创建人 CreateBy @@ -125574,7 +125585,7 @@ LABL 0 Arial Unicode MS,8,N - + 25EDB04E-C2FC-4463-86E2-2DDCD4A9F8EC 创建时间 CreateTime @@ -125588,7 +125599,7 @@ LABL 0 Arial Unicode MS,8,N - + 70E7647D-5DC7-441B-A60E-D8D671D6E4A6 创建程序 CreateProg @@ -125600,7 +125611,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 7D242576-70C4-4553-9966-C928C378FA4D 创建人IP CreateIP @@ -125612,7 +125623,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + EE815048-9B13-41F6-96CC-11A77671AF51 修改人 UpdateBy @@ -125626,7 +125637,7 @@ LABL 0 Arial Unicode MS,8,N - + 5F3E5E95-823A-4184-8DE4-E47DA63C7F69 修改时间 UpdateTime @@ -125640,7 +125651,7 @@ LABL 0 Arial Unicode MS,8,N - + F110AA77-B9F5-4DE0-A80E-949E9D7154CD 修改程序 UpdateProg @@ -125652,7 +125663,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 202D90AE-4E76-4303-B43B-B23A57E0AFA5 修改人IP UpdateIP @@ -125664,7 +125675,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 459907E1-BDEC-4655-83DB-79DE68690F37 操作日志ID OperateLogID @@ -125679,7 +125690,7 @@ LABL 0 Arial Unicode MS,8,N - + C607A3D0-EF17-4330-AF05-D824FA3214A2 讲师异动ID TeacherChangeId @@ -125690,7 +125701,7 @@ LABL 0 Arial Unicode MS,8,N 讲师异动ID bigint - + C27C4971-90F3-4528-9DC9-D307153ECBE0 证件编号 CertificateNo @@ -125702,7 +125713,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 8A02886B-2F05-41AE-B3B5-F1C64BA10FB5 证件名称 CertificateName @@ -125714,7 +125725,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + D7FE8274-B854-4C68-B385-E53EE9AC14F1 生效日期 EffectiveDate @@ -125725,7 +125736,7 @@ LABL 0 Arial Unicode MS,8,N 生效日期 datetime - + 9C0AE83D-0358-4E75-9C85-A0E36230EE80 失效日期 ExpirationDate @@ -125736,7 +125747,7 @@ LABL 0 Arial Unicode MS,8,N 失效日期 datetime - + 9EE49C2C-63E1-49C9-9399-AF53388D6CF2 备注 RemarkSz @@ -125751,7 +125762,7 @@ LABL 0 Arial Unicode MS,8,N - + 249DF484-91CF-4C15-B3ED-2F21D0755D48 默认标志 IsDefault @@ -125766,7 +125777,7 @@ LABL 0 Arial Unicode MS,8,N - + 28822FBD-ACB2-4262-A998-4377F79B30CD 删除标志 IsEnable @@ -125781,7 +125792,7 @@ LABL 0 Arial Unicode MS,8,N - + 77ECFBCE-20E2-4CF6-89FD-981405366D2E 预留字段1 Reverse1 @@ -125793,7 +125804,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2734E02A-09E9-40BC-91E3-577AA5590FC0 预留字段2 Reverse2 @@ -125805,7 +125816,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E9D1B5A3-4E48-4D07-918F-8728C00F63CB 预留字段3 Reverse3 @@ -125817,7 +125828,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + FDC598B3-E66D-488A-B183-D1D6316A127C 预留字段4 Reverse4 @@ -125829,7 +125840,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4ABB6625-99A4-455C-BFE1-8C7C3DA80336 预留字段5 Reverse5 @@ -125841,7 +125852,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F82B68D3-3061-45DA-8D98-4BDC7FFC7A31 预留字段6 Reverse6 @@ -125853,7 +125864,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + C0CAE246-3E3E-4059-AC34-26163DDD6258 预留字段7 Reverse7 @@ -125865,7 +125876,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + A181D047-8C17-483D-9E7E-2B559DBC432A 预留字段8 Reverse8 @@ -125877,7 +125888,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0C2AA53B-DCAB-4052-8E00-B8540238DB16 预留字段9 Reverse9 @@ -125889,7 +125900,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4517914A-BF56-40C7-869A-8C80A91DB695 预留字段10 Reverse10 @@ -125901,7 +125912,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 1A29EA35-6DCF-4EE2-9587-9604A07577DB 预留字段I1 ReverseI1 @@ -125913,7 +125924,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 69724F51-0BC0-4B90-B5F1-170E6F5E17BC 预留字段I2 ReverseI2 @@ -125927,7 +125938,7 @@ LABL 0 Arial Unicode MS,8,N - + 7453E997-7559-4228-9551-E355563FA05A Key_1 Key_1 @@ -125936,15 +125947,15 @@ LABL 0 Arial Unicode MS,8,N 1727337806 Administrator - + - + - + @@ -125968,7 +125979,7 @@ LABL 0 Arial Unicode MS,8,N - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -126002,7 +126013,7 @@ LABL 0 Arial Unicode MS,8,N - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -126017,7 +126028,7 @@ LABL 0 Arial Unicode MS,8,N - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -126036,7 +126047,7 @@ LABL 0 Arial Unicode MS,8,N - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -126070,7 +126081,7 @@ LABL 0 Arial Unicode MS,8,N - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -126104,7 +126115,7 @@ LABL 0 Arial Unicode MS,8,N - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -126138,7 +126149,7 @@ LABL 0 Arial Unicode MS,8,N - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -126172,7 +126183,7 @@ LABL 0 Arial Unicode MS,8,N - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -126206,7 +126217,7 @@ LABL 0 Arial Unicode MS,8,N - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -126240,7 +126251,7 @@ LABL 0 Arial Unicode MS,8,N - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -126274,7 +126285,7 @@ LABL 0 Arial Unicode MS,8,N - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -126308,7 +126319,7 @@ LABL 0 Arial Unicode MS,8,N - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -126342,7 +126353,7 @@ LABL 0 Arial Unicode MS,8,N - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -126376,7 +126387,7 @@ LABL 0 Arial Unicode MS,8,N - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -126410,7 +126421,7 @@ LABL 0 Arial Unicode MS,8,N - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -126444,7 +126455,7 @@ LABL 0 Arial Unicode MS,8,N - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -126478,7 +126489,7 @@ LABL 0 Arial Unicode MS,8,N - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -126493,7 +126504,7 @@ LABL 0 Arial Unicode MS,8,N - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -126512,7 +126523,7 @@ LABL 0 Arial Unicode MS,8,N - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -126546,7 +126557,7 @@ LABL 0 Arial Unicode MS,8,N - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -126580,7 +126591,7 @@ LABL 0 Arial Unicode MS,8,N - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -126614,7 +126625,7 @@ LABL 0 Arial Unicode MS,8,N - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -126648,7 +126659,7 @@ LABL 0 Arial Unicode MS,8,N - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -126682,7 +126693,7 @@ LABL 0 Arial Unicode MS,8,N - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -126713,10 +126724,10 @@ LABL 0 Arial Unicode MS,8,N - + - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -126726,7 +126737,7 @@ LABL 0 Arial Unicode MS,8,N - + @@ -126738,7 +126749,7 @@ LABL 0 Arial Unicode MS,8,N - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -126751,7 +126762,7 @@ LABL 0 Arial Unicode MS,8,N - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -126759,12 +126770,12 @@ LABL 0 Arial Unicode MS,8,N 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -126776,7 +126787,7 @@ LABL 0 Arial Unicode MS,8,N - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -126786,7 +126797,7 @@ LABL 0 Arial Unicode MS,8,N ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -126796,7 +126807,7 @@ LABL 0 Arial Unicode MS,8,N Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -126864,7 +126875,7 @@ LABL 0 Arial Unicode MS,8,N varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -126875,7 +126886,7 @@ LABL 0 Arial Unicode MS,8,N varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -126897,7 +126908,7 @@ LABL 0 Arial Unicode MS,8,N varchar(2000) 2000 - + @@ -126975,7 +126986,7 @@ LABL 0 Arial Unicode MS,8,N varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -126998,7 +127009,7 @@ LABL 0 Arial Unicode MS,8,N - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -127007,13 +127018,13 @@ LABL 0 Arial Unicode MS,8,N 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 048dead9..e4a56674 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -5595,6 +5595,11 @@ 机构ID + + + 机构Id + + 原调动类别 @@ -13296,6 +13301,11 @@ 机构ID + + + 机构Id + + 原调动类别 diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs index fcb01512..a07295d3 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_TeacherChange.Dto.Base.cs @@ -32,6 +32,11 @@ namespace Tiobon.Core.Model.Models /// public long? TeacherId { get; set; } + /// + /// 机构Id + /// + public long? SchoolId { get; set; } + /// /// 原调动类别 /// diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs index 62620bea..45374f9c 100644 --- a/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_TeacherChange.Dto.EditInput.cs @@ -13,7 +13,9 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ + +using System.ComponentModel.DataAnnotations.Schema; namespace Tiobon.Core.Model.Models { @@ -23,5 +25,9 @@ namespace Tiobon.Core.Model.Models /// public class EditGhre_TeacherChangeInput : Ghre_TeacherChangeBase { + + + [NotMapped] + public List TeacherAttachments { get; set; } } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs index 7205a0fe..97aaba59 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChange.Dto.InsertInput.cs @@ -13,7 +13,9 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ + +using System.ComponentModel.DataAnnotations.Schema; namespace Tiobon.Core.Model.Models { @@ -23,5 +25,12 @@ namespace Tiobon.Core.Model.Models /// public class InsertGhre_TeacherChangeInput : Ghre_TeacherChangeBase { + + [NotMapped] + public List TeacherAttachments { get; set; } + + public List Ids { get; set; } + + public string Reason { get; set; } } } diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs index 7d53525b..66d32687 100644 --- a/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_TeacherChangeAttachment.Dto.InsertInput.cs @@ -13,7 +13,9 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ + +using System.ComponentModel.DataAnnotations.Schema; namespace Tiobon.Core.Model.Models { @@ -23,5 +25,8 @@ namespace Tiobon.Core.Model.Models /// public class InsertGhre_TeacherChangeAttachmentInput : Ghre_TeacherChangeAttachmentBase { + + [NotMapped] + public List Attachments { get; set; } } } diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs index 3293a0f4..5c41dc64 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_TeacherChange.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ using System.ComponentModel; using System.ComponentModel.DataAnnotations; using System.ComponentModel.DataAnnotations.Schema; @@ -34,6 +34,11 @@ namespace Tiobon.Core.Model.Models /// public long? TeacherId { get; set; } + /// + /// 机构Id + /// + public long? SchoolId { get; set; } + /// /// 原调动类别 /// diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChange.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChange.Dto.View.cs index fb7c02c2..77fd67c6 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChange.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChange.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,22 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_TeacherChangeDto : Ghre_TeacherChange { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + + public string TeacherTypeLabel { get; set; } + + public string TeacherLevelLabel { get; set; } + public string DeptOrSchoolName { get; set; } + public string GenderLabel { get; set; } + + public List TeacherAttachments { get; set; } } diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChangeAttachment.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChangeAttachment.Dto.View.cs index 5478b932..f044064a 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChangeAttachment.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_TeacherChangeAttachment.Dto.View.cs @@ -13,7 +13,7 @@ *│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ *│　作者：SimonHsiao │ *└──────────────────────────────────┘ -*/ +*/ namespace Tiobon.Core.Model.Models; @@ -22,13 +22,16 @@ namespace Tiobon.Core.Model.Models; /// public class Ghre_TeacherChangeAttachmentDto : Ghre_TeacherChangeAttachment { -/// -/// 创建信息 -/// -public string CreateDataInfo { get; set; } + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } -/// -/// 修改信息 -/// -public string UpdateDataInfo { get; set; } + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } + + + public List Attachments { get; set; } = new List(); } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 7652d7e3..531a3b2c 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1064,7 +1064,7 @@ public partial class CommonServices : BaseServices>, ICommon result.JM_PageControlT1.Toolbar.RemoveAt(index); break; case "F_SchoolManage": - case "F_WorkLicenseManage": + case "F_WorkLicenseManage": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); if (toolbar != null) toolbar.fnKey = "TBD1YN"; toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "UpdateYN").FirstOrDefault(); @@ -1192,7 +1192,7 @@ public partial class CommonServices : BaseServices>, ICommon if (toolbar != null) { toolbar.fnKey = "TBD3YN"; } toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault(); if (toolbar != null) toolbar.fnKey = "TBD4YN"; - break; + break; } #endregion @@ -1940,6 +1940,200 @@ public partial class CommonServices : BaseServices>, ICommon END"; break; case "F_ESS_TrainRequestApply": + sql = @$"DECLARE + @SQL NVARCHAR (MAX) = '', + @FlowID INT = {param.jsonParam.FlowID}, + @langId INT = {param.langId}, + @DoType NVARCHAR (MAX) = '{param.doType}', + @SQL2 NVARCHAR (MAX) = '', + @JsonString NVARCHAR (MAX) = '', + @JsonString1 NVARCHAR (MAX) = '', + @JsonString2 NVARCHAR (MAX) = '', + @ID INT = '{param.id}', + @userId INT = {param.userId} + + BEGIN + IF @DoType IN ('Update', 'Copy') -- 读取修改 + BEGIN + SELECT a.Id, + a.CreateBy, + a.CreateTime, + a.CreateProg, + a.CreateIP, + a.UpdateBy, + a.UpdateTime, + a.UpdateProg, + a.UpdateIP, + a.OperateLogID, + a.CourseSource, + a.RequestNo, + a.CourseName, + a.CourseId, + a.YearMonth, + a.RequestSource, + a.DeptId, + a.ApplicantId, + a.RequestNum, + a.TrainStaffId, + a.TrainClass, + a.TrainLevel, + a.InOrOut, + a.TeacherClass, + a.Reason, + a.PerCapitaBudget, + a.TotalBudget, + a.SponsorId, + a.Status, + a.RemarkSz, + a.IsDefault, + a.IsEnable, + a.WorkID, + a.WorkNo, + a.ToDoType, + a.BatchSID, + a.WorkState, + a.ShiftID, + a.ConfirmUserID, + a.ConfirmTime, + a.ConfirmComment, + a.Reverse1, + a.Reverse2, + a.Reverse3, + a.Reverse4, + a.Reverse5, + a.Reverse6, + a.Reverse7, + a.Reverse8, + a.Reverse9, + a.Reverse10, + a.ReverseI1, + a.ReverseI2, + isnull + ( + (SELECT CASE + WHEN @langId = 1 THEN UserName + ELSE UserEname + END + FROM Ghrs_User kk + WHERE kk.UserId = a.CreateBy), + '') + + ' ' + + [dbo].[FLangKeyToValue] + ('GHR_Common_000078', @langId, '于 ') + + ' ' + + CONVERT (NVARCHAR (16), CreateTime, 121) + + ' ' + + [dbo].[FLangKeyToValue] + ('GHR_Common_000079', @langId, ' 创建') CreateDataInfo, + isnull + ( + (SELECT CASE + WHEN @langId = 1 THEN UserName + ELSE UserEname + END + FROM Ghrs_User kk + WHERE kk.UserId = a.UpdateBy), + '') + + ' ' + + [dbo].[FLangKeyToValue] + ('GHR_Common_000078', @langId, '于') + + ' ' + + CONVERT (NVARCHAR (16), UpdateTime, 121) + + ' ' + + [dbo].[FLangKeyToValue] + ('GHR_Common_000080', @langId, ' 最后修改') UpdateDataInfo + FROM Ghre_Request a + WHERE a.Id = @ID + END + + IF @DoType = 'Insert' -- 空白新增 + BEGIN + SELECT (SELECT UserStaffID + FROM dbo.Ghrs_User + WHERE UserId = @userId) ApplicantId, + NULL CourseSource, + NULL RequestNo, + NULL CourseName, + NULL CourseId, + NULL YearMonth, + 'Dept' RequestSource, + NULL DeptId, + NULL RequestNum, + NULL TrainStaffId, + NULL TrainClass, + NULL TrainLevel, + NULL InOrOut, + NULL TeacherClass, + NULL Reason, + NULL PerCapitaBudget, + NULL TotalBudget, + NULL SponsorId, + 'Wait' Status, + 0 IsDefault, + 0 Id, + '' RemarkSz + END + + IF @DoType = 'ReApply' -- ReApply:重新发起 + BEGIN + SELECT Id, + CreateBy, + CreateTime, + CreateProg, + CreateIP, + UpdateBy, + UpdateTime, + UpdateProg, + UpdateIP, + OperateLogID, + CourseSource, + RequestNo, + CourseName, + CourseId, + YearMonth, + RequestSource, + DeptId, + ApplicantId, + RequestNum, + TrainStaffId, + TrainClass, + TrainLevel, + InOrOut, + TeacherClass, + Reason, + PerCapitaBudget, + TotalBudget, + SponsorId, + Status, + RemarkSz, + IsDefault, + IsEnable, + WorkID, + WorkNo, + ToDoType, + BatchSID, + WorkState, + ShiftID, + ConfirmUserID, + ConfirmTime, + ConfirmComment, + Reverse1, + Reverse2, + Reverse3, + Reverse4, + Reverse5, + Reverse6, + Reverse7, + Reverse8, + Reverse9, + Reverse10, + ReverseI1, + ReverseI2 + FROM Ghre_Request + WHERE WorkID = @ID -- 根据流程单号读取 + END + END"; + break; case "F_ESS_TrainRequestPersonalApply": sql = @$"DECLARE @SQL NVARCHAR (MAX) = '', diff --git a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs index 352ff259..37d8c76c 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_TeacherChangeServices.cs @@ -4,20 +4,201 @@ using Tiobon.Core.Model.Models; using Tiobon.Core.Services.BASE; using Tiobon.Core.IRepository.Base; using Tiobon.Core.Common.Caches; +using Microsoft.AspNetCore.Http; +using Newtonsoft.Json.Linq; +using static Tiobon.Core.Model.Consts; +using Tiobon.Core.Common.UserManager; +using Tiobon.Core.Common; +using Tiobon.Core.Model; +using AgileObjects.AgileMapper; -namespace Tiobon.Core.Services +namespace Tiobon.Core.Services; + +/// +/// 培训讲师异动 (服务) +/// +public class Ghre_TeacherChangeServices : BaseServices, IGhre_TeacherChangeServices { - /// - /// 培训讲师异动 (服务) - /// - public class Ghre_TeacherChangeServices : BaseServices, IGhre_TeacherChangeServices + private readonly IBaseRepository _dal; + private IGhre_AttachmentServices _ghre_AttachmentServices; + private IGhre_TeacherChangeAttachmentServices _ghre_TeacherChangeAttachmentServices; + public Ghre_TeacherChangeServices(ICaching caching, + IGhre_AttachmentServices ghre_AttachmentServices, + IGhre_TeacherChangeAttachmentServices ghre_TeacherChangeAttachmentServices, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + _ghre_AttachmentServices = ghre_AttachmentServices; + _ghre_TeacherChangeAttachmentServices = ghre_TeacherChangeAttachmentServices; + } + + public override async Task> QueryFilterPage(QueryBody filter, string condition, bool? IsEnable = true) + { + var result = await base.QueryFilterPage(filter, condition, IsEnable); + return result; + } + + public override async Task> QueryForm(QueryForm body) + { + var data = await base.QueryForm(body); + var entitys = data.result.DT_TableDataT1; + var ids = entitys.Select(x => x.Id).ToList(); + var teacherAttachments = await _ghre_TeacherChangeAttachmentServices.QueryDto(x => ids.Contains(x.TeacherChangeId.Value)); + var ids1 = teacherAttachments.Select(x => x.Id.ToString()).ToList(); + var attachments = await _ghre_AttachmentServices.QueryDto(x => ids1.Contains(x.TableName)); + + teacherAttachments.ForEach(x => + { + x.Attachments = attachments.Where(o => o.TableName == x.Id.ToString()).ToList(); + }); + entitys.ForEach(x => + { + x.TeacherAttachments = teacherAttachments.Where(o => o.TeacherChangeId == x.Id).ToList(); + }); + + data.result.DT_TableDataT1 = entitys; + return data; + } + + public override async Task Add(InsertGhre_TeacherChangeInput entity) + { + + if (entity.TeacherType == "In") + { + entity.SchoolId = null; + var staff = await Db.Queryable().FirstAsync(x => x.StaffID == entity.StaffId); + if (staff != null) + { + entity.TeacherNo = staff.StaffNo; + entity.TeacherName = staff.StaffName; + } + } + else + { + entity.DeptID = null; + entity.StaffId = null; + } + + var id = await base.Add(entity); + var sql = $"SELECT MAX(id)+1 FROM Ghre_Teacher WHERE Id !='{id}'"; + var id1 = await Db.Ado.GetLongAsync(sql); + sql = $"UPDATE Ghre_Teacher SET Id={id1} WHERE Id ='{id}'"; + await Db.Ado.ExecuteCommandAsync(sql); + id = id1; + + if (entity.TeacherAttachments != null && entity.TeacherAttachments.Any()) + { + for (int i = 0; i < entity.TeacherAttachments.Count; i++) + { + var insert = entity.TeacherAttachments[i]; + insert.TeacherChangeId = id; + var teacherAttachmentId = await _ghre_TeacherChangeAttachmentServices.Add(insert); + if (insert.Attachments != null && insert.Attachments.Any()) + for (int j = 0; j < insert.Attachments.Count; j++) + { + await Db.Updateable() + .SetColumns(it => new Ghre_Attachment() { TableName = teacherAttachmentId.ToString(), UpdateTime = DateTime.Now }) + .Where(it => it.RelativePath == insert.Attachments[j].RelativePath) + .ExecuteCommandAsync(); + } + } + } + return id; + } + + public override async Task Update(long Id, EditGhre_TeacherChangeInput editModel) + { + if (editModel.TeacherType == "In") + { + editModel.SchoolId = null; + var staff = await Db.Queryable().FirstAsync(x => x.StaffID == editModel.StaffId); + if (staff != null) + { + editModel.TeacherNo = staff.StaffNo; + editModel.TeacherName = staff.StaffName; + } + } + else + { + editModel.DeptID = null; + editModel.StaffId = null; + } + var result = await base.Update(Id, editModel, null, ["Status"]); + await _ghre_TeacherChangeAttachmentServices.Delete(x => x.TeacherChangeId == Id); + if (editModel.TeacherAttachments != null && editModel.TeacherAttachments.Any()) + { + for (int i = 0; i < editModel.TeacherAttachments.Count; i++) + { + var insert = editModel.TeacherAttachments[i]; + insert.TeacherId = Id; + var TeacherAttachmentId = await _ghre_TeacherChangeAttachmentServices.Add(Mapper.Map(insert).ToANew()); + if (insert.Attachments != null && insert.Attachments.Any()) + for (int j = 0; j < insert.Attachments.Count; j++) + { + await Db.Updateable() + .SetColumns(it => new Ghre_Attachment() { TableName = TeacherAttachmentId.ToString(), UpdateTime = DateTime.Now }) + .Where(it => it.RelativePath == insert.Attachments[j].RelativePath) + .ExecuteCommandAsync(); + } + } + } + + return result; + } + public async Task> InsertByStatus(InsertGhre_TeacherChangeInput insertModel, string status) + { + var data = ServiceResult.OprateSuccess("新增成功", 0); + insertModel.Status = status; + var id = await Add(insertModel); + + data.Success = id > 0; + if (data.Success) + data.Data = id; + else + return ServiceResult.OprateFailed("发布成功！"); + + return data; + } + + public async Task UpdateStatus(InsertGhre_TeacherChangeInput input, string status) { - private readonly IBaseRepository _dal; - public Ghre_TeacherChangeServices(ICaching caching, IBaseRepository dal) + + HttpRequest request = UserContext.Context.Request; + var api = request.Path.ObjToString().TrimEnd('/').ToLower(); + var ip = GetUserIp(UserContext.Context); + + var entities = new List(); + foreach (var id in input.Ids) { - this._dal = dal; - base.BaseDal = dal; - base._caching = caching; + if (!BaseDal.Any(id)) + continue; + + var entity = await BaseDal.QueryById(id); + + + switch (status) + { + case DIC_REQUEST_STATUS.Active: + entity.AgreeReason = input.Reason; + entity.AgreeTime = DateTime.Now; + entity.AgreeUserId = App.User.ID; + break; + case DIC_REQUEST_STATUS.Temporary: + entity.RefuseReason = input.Reason; + entity.RefuseTime = DateTime.Now; + entity.RefuseUserId = App.User.ID; + break; + } + + entity.UpdateIP = ip; + entity.UpdateProg = api; + entity.Status = status; + entities.Add(entity); } + + var result = await BaseDal.Update(entities); + return ServiceResult.OprateSuccess("执行成功！"); + } } \ No newline at end of file