From c2e16ad7bc4195651d1f7f1b7001db63cb317de2 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Mon, 17 Feb 2025 14:18:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5=E7=BE=A4=E7=BB=84=E8=A1=A8?= =?UTF-8?q?=E7=BB=93=E6=9E=84=E8=AE=BE=E8=AE=A1=20=E5=91=98=E5=B7=A5?= =?UTF-8?q?=E7=BE=A4=E7=BB=84=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 363 ++++++++++++------ .../Ghre/Ghre_StaffGroupController.cs | 14 + Tiobon.Core.Api/Tiobon.Core.Model.xml | 305 +++++++++++++++ Tiobon.Core.Api/Tiobon.Core.xml | 5 + .../Ghre/IGhre_StaffGroupServices.cs | 8 + .../Base/Ghre/Ghre_StaffGroup.Dto.Base.cs | 244 ++++++++++++ .../Ghre/Ghre_StaffGroup.Dto.EditInput.cs | 26 ++ .../Ghre/Ghre_StaffGroup.Dto.InsertInput.cs | 26 ++ .../Models/Ghre/Ghre_StaffGroup.cs | 185 +++++++++ .../View/Ghre/Ghre_StaffGroup.Dto.View.cs | 34 ++ .../Ghre/Ghre_StaffGroupServices.cs | 34 ++ 11 files changed, 1129 insertions(+), 115 deletions(-) create mode 100644 Tiobon.Core.Api/Controllers/Ghre/Ghre_StaffGroupController.cs create mode 100644 Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs create mode 100644 Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs create mode 100644 Tiobon.Core.Model/Edit/Ghre/Ghre_StaffGroup.Dto.EditInput.cs create mode 100644 Tiobon.Core.Model/Insert/Ghre/Ghre_StaffGroup.Dto.InsertInput.cs create mode 100644 Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs create mode 100644 Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs create mode 100644 Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 259e5ee5..ffeb5c83 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -51146,13 +51146,13 @@ Ghra_staff_InsureBase 63E1330B-7E3B-404E-A52A-5785883DF297 -员工组 +员工群组 Ghre_StaffGroup 1739758076 Administrator -1739758099 +1739772479 Administrator -参数配置组 +员工群组 6A8934E4-C8FA-43FE-B75B-BC7218AC2AF7 @@ -51289,29 +51289,162 @@ Ghra_staff_InsureBase -1A550309-E7F3-4030-A890-CE0A07661B35 -参数名称 -GroupName -1739758076 +32A3AF7E-0C0F-4545-B262-3ECE73D4980C +群组类别 +GroupType +1739772235 Administrator -1739758076 +1739772314 Administrator -参数名称 +群组类别 nvarchar(32) 32 -C7AA2C72-1ECE-46F6-A4B9-4A18898857AB -排序 -SortNo -1739758076 +D8713866-9F0A-49DA-A433-8B2A7E0701ED +厂区 +ZoneId +1739771142 Administrator -1739758076 +1739771613 Administrator -排序 -int +厂区 +nvarchar(2000) +2000 +1A3B042B-7DA0-4498-B94C-ED021100C1F5 +不包含厂区 +ExclZoneId +1739772056 +Administrator +1739772227 +Administrator +不包含厂区 +nvarchar(2000) +2000 + + +2F62F65F-D8CB-48CA-B1D2-FAF5F9D4740D +部门 +DeptId +1739771142 +Administrator +1739771613 +Administrator +部门 +nvarchar(2000) +2000 + + +E9EBDB03-C8AE-4300-9371-6123EEA94350 +不包含部门 +ExclDeptId +1739772136 +Administrator +1739772228 +Administrator +不包含部门 +nvarchar(2000) +2000 + + +8E166CA0-0397-4D94-8497-8557FDA2CD96 +岗位 +TitleId +1739771142 +Administrator +1739771613 +Administrator +岗位ID +nvarchar(2000) +2000 + + +F87B0D6A-4385-472F-B2CF-992C48D848D9 +不包含岗位 +ExclTitleId +1739772148 +Administrator +1739772229 +Administrator +不包含岗位 +nvarchar(2000) +2000 + + +1E2EC414-5BF9-4D34-B3CC-8760F7C3BEC0 +职等 +GradeId +1739771142 +Administrator +1739771613 +Administrator +职等 +nvarchar(2000) +2000 + + +750337E6-B69C-4623-8E6D-BE51C426EDE7 +不包含职等 +ExclGradeId +1739772151 +Administrator +1739772230 +Administrator +不包含职等 +nvarchar(2000) +2000 + + +88DA0B0E-9166-4FC4-9053-73F5113A6296 +职称 +JobId +1739771142 +Administrator +1739771613 +Administrator +职称 +nvarchar(2000) +2000 + + +3EA07096-D21C-467A-BC59-7581EF0B4C56 +不包含职称 +ExclJobId +1739772154 +Administrator +1739772231 +Administrator +不包含职称 +nvarchar(2000) +2000 + + +96C1541C-1EAF-40AE-ACBF-A342F69DE9B9 +员工 +Staff +1739771742 +Administrator +1739771770 +Administrator +员工 +nvarchar(2000) +2000 + + +E2CAC9C0-62D5-488C-9DD3-0359772098C2 +不包含员工 +ExclStaff +1739772156 +Administrator +1739772233 +Administrator +不包含员工 +nvarchar(2000) +2000 + + 9F56D603-1D80-4A83-B6AB-41A655D72806 备注 RemarkSz @@ -51326,7 +51459,7 @@ Ghra_staff_InsureBase - + 4D24D3E2-A268-4F29-8FEC-D8D20464A0BE 默认标志 IsDefault @@ -51341,7 +51474,7 @@ Ghra_staff_InsureBase - + 1E1B53FD-39AB-4213-8652-8A7BCFCDAAF5 删除标志 IsEnable @@ -51356,7 +51489,7 @@ Ghra_staff_InsureBase - + EA4EE987-8E98-45D6-9C5E-7597061AE189 预留字段1 Reverse1 @@ -51368,7 +51501,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 28954F64-4B51-4B8E-8975-C2F590030682 预留字段2 Reverse2 @@ -51380,7 +51513,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + DBB28F41-7379-4F95-83C6-B85FD3C4F1D8 预留字段3 Reverse3 @@ -51392,7 +51525,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + ADFD9356-DA41-4EB4-A05C-8B9B089165E2 预留字段4 Reverse4 @@ -51404,7 +51537,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 7CFEBF27-D293-46E8-81EF-3BC54E7E0FE4 预留字段5 Reverse5 @@ -51416,7 +51549,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D0FF6A25-D09E-4FC3-ACB2-4B11AF2D3807 预留字段6 Reverse6 @@ -51428,7 +51561,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + EE9E1191-7FFB-4122-83F5-E7BD8DC07DC5 预留字段7 Reverse7 @@ -51440,7 +51573,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + A04D1BD6-2ED0-4381-82BF-DA09BE3963E9 预留字段8 Reverse8 @@ -51452,7 +51585,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D6984224-B6FD-4ED3-B1E5-00CB8FDE1106 预留字段9 Reverse9 @@ -51464,7 +51597,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 8DB98F5E-C7AF-4B9C-B947-9799976F2EF7 预留字段10 Reverse10 @@ -51476,7 +51609,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + C5C5F15D-920E-4CD4-8BB5-F307A2381EC3 预留字段I1 ReverseI1 @@ -51488,7 +51621,7 @@ Ghra_staff_InsureBase 0 int - + 24DD1E8E-57FF-4FA4-BC05-96F22DD0BE80 预留字段I2 ReverseI2 @@ -51502,7 +51635,7 @@ Ghra_staff_InsureBase - + 6E1796D7-7545-43C3-A0F2-65DD7C951FE5 Key_1 Key_1 @@ -51516,10 +51649,10 @@ Ghra_staff_InsureBase - + - + @@ -51543,7 +51676,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -51577,7 +51710,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -51592,7 +51725,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -51611,7 +51744,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -51645,7 +51778,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -51679,7 +51812,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -51713,7 +51846,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -51747,7 +51880,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -51781,7 +51914,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -51815,7 +51948,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -51849,7 +51982,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -51883,7 +52016,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -51917,7 +52050,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -51951,7 +52084,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -51985,7 +52118,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -52019,7 +52152,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -52053,7 +52186,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -52068,7 +52201,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -52087,7 +52220,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -52121,7 +52254,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -52155,7 +52288,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -52189,7 +52322,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -52223,7 +52356,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -52257,7 +52390,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -52291,7 +52424,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -52306,7 +52439,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -52325,7 +52458,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -52359,7 +52492,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -52393,7 +52526,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -52408,7 +52541,7 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 @@ -52427,7 +52560,7 @@ Ghra_staff_InsureBase - + E2D02611-09C9-42E2-AA43-22E820AF219C 1728626387 Administrator @@ -52461,7 +52594,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -52495,7 +52628,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -52529,7 +52662,7 @@ Ghra_staff_InsureBase - + 1791558D-852F-437C-97F6-7F9D11EE26DB 1729662916 Administrator @@ -52563,7 +52696,7 @@ Ghra_staff_InsureBase - + 00049FDC-8297-463E-9347-A571E3AB9C9E 1729663415 Administrator @@ -52597,7 +52730,7 @@ Ghra_staff_InsureBase - + B7B6FBF6-DC05-4490-8656-A5DEAF831781 1730250294 Administrator @@ -52631,7 +52764,7 @@ Ghra_staff_InsureBase - + A0C97DD9-1C72-4A18-9FEE-EE6A9AEF21F8 1730336852 Administrator @@ -52665,7 +52798,7 @@ Ghra_staff_InsureBase - + 39FD6B5F-C473-44DF-969E-D851D388EBAE 1730340808 Administrator @@ -52699,7 +52832,7 @@ Ghra_staff_InsureBase - + C4EECAD7-F267-4702-A253-CA499692A254 1730346502 Administrator @@ -52733,7 +52866,7 @@ Ghra_staff_InsureBase - + 3EBD04DF-C924-4032-982C-CA9EF3B72E39 1731478017 Administrator @@ -52767,7 +52900,7 @@ Ghra_staff_InsureBase - + DE13B6DD-B49E-4F3E-8AF7-BEB535EE3CC6 1731478076 Administrator @@ -52801,7 +52934,7 @@ Ghra_staff_InsureBase - + 28C77E11-7423-4D63-9053-A5D40E7940AF 1731491451 Administrator @@ -52835,7 +52968,7 @@ Ghra_staff_InsureBase - + 76F5B648-63C3-466C-B313-B38E0519B3BA 1733211832 Administrator @@ -52869,7 +53002,7 @@ Ghra_staff_InsureBase - + D2B7DF8F-ACF7-4237-B814-FA662272F871 1733369860 Administrator @@ -52903,7 +53036,7 @@ Ghra_staff_InsureBase - + F4431A85-1466-4A29-9D1B-A82B70F2F5D5 1733909650 Administrator @@ -52937,7 +53070,7 @@ Ghra_staff_InsureBase - + 3C15C987-A6E8-4FAA-AFB6-1CCBC250460D 1734490374 Administrator @@ -52971,7 +53104,7 @@ Ghra_staff_InsureBase - + 9B53094C-D4A4-4269-A8F0-B03AC9CEA70F 1737080391 Administrator @@ -52986,7 +53119,7 @@ Ghra_staff_InsureBase - + C4514A46-AF20-4937-902F-A02C91F50231 Reference_44 Reference_44 @@ -53005,7 +53138,7 @@ Ghra_staff_InsureBase - + 22844E1B-552F-4914-8997-D9056E9D9574 1737085753 Administrator @@ -53039,7 +53172,7 @@ Ghra_staff_InsureBase - + 0457880B-22F4-48EC-84E0-13C055FDBA46 1737086327 Administrator @@ -53073,7 +53206,7 @@ Ghra_staff_InsureBase - + 5A235CB8-FEFB-41E2-B379-421F28BC171B 1738913762 Administrator @@ -53107,7 +53240,7 @@ Ghra_staff_InsureBase - + 1D7919EA-4B45-4026-8981-20ABBE3392A1 1738915647 Administrator @@ -53141,7 +53274,7 @@ Ghra_staff_InsureBase - + 33416204-3836-40D1-AEA9-BF78C4576311 1738915648 Administrator @@ -53175,7 +53308,7 @@ Ghra_staff_InsureBase - + F631F0DE-0C6E-4534-8868-FFB7A5CE94B9 1738916095 Administrator @@ -53209,7 +53342,7 @@ Ghra_staff_InsureBase - + F5085F08-E406-43D8-A1A8-81A9189C0250 1738916098 Administrator @@ -53224,7 +53357,7 @@ Ghra_staff_InsureBase - + 34714A40-5F9A-4B8C-90C8-33DA4909C40F Reference_51 Reference_51 @@ -53243,7 +53376,7 @@ Ghra_staff_InsureBase - + B20D9464-D8C0-404D-9C55-6A16F6CB04BB 1738977084 Administrator @@ -53265,7 +53398,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -53278,7 +53411,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -53286,12 +53419,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -53303,7 +53436,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -53313,7 +53446,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -53323,7 +53456,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -53334,7 +53467,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -53346,7 +53479,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -53357,7 +53490,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -53368,7 +53501,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -53380,7 +53513,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -53391,7 +53524,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -53402,7 +53535,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -53424,7 +53557,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -53438,7 +53571,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -53459,7 +53592,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -53491,7 +53624,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -53502,7 +53635,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -53512,7 +53645,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -53525,7 +53658,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -53534,13 +53667,13 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - - + + - + 02EF92C9-49BF-45C7-934A-23BA290D5595 Microsoft SQL Server 2008 MSSQLSRV2008 diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_StaffGroupController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_StaffGroupController.cs new file mode 100644 index 00000000..11d8849b --- /dev/null +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_StaffGroupController.cs @@ -0,0 +1,14 @@ +namespace Tiobon.Core.Api.Controllers; + +/// +/// 员工群组(Controller) +/// +[Route("api/[controller]")] +[ApiController, GlobalActionFilter] +[Authorize(Permissions.Name), ApiExplorerSettings(GroupName = Grouping.GroupName_Ghre)] +public class Ghre_StaffGroupController : BaseController +{ + public Ghre_StaffGroupController(IGhre_StaffGroupServices service) : base(service) + { + } +} \ 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 b071a93f..f69d43a1 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6370,6 +6370,146 @@ 预留字段12 + + + 员工群组 (Dto.Base) + + + + + 群组类别 + + + + + 厂区 + + + + + 不包含厂区 + + + + + 部门 + + + + + 不包含部门 + + + + + 岗位ID + + + + + 不包含岗位 + + + + + 职等 + + + + + 不包含职等 + + + + + 职称 + + + + + 不包含职称 + + + + + 员工 + + + + + 不包含员工 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 培训记录 (Dto.Base) @@ -13857,6 +13997,11 @@ 培训机构附件 (Dto.EditInput) + + + 员工群组 (Dto.EditInput) + + 培训记录 (Dto.EditInput) @@ -14367,6 +14512,11 @@ 培训机构附件 (Dto.InsertInput) + + + 员工群组 (Dto.InsertInput) + + 培训记录 (Dto.InsertInput) @@ -21156,6 +21306,146 @@ 预留字段12 + + + 员工群组 (Model) + + + + + 群组类别 + + + + + 厂区 + + + + + 不包含厂区 + + + + + 部门 + + + + + 不包含部门 + + + + + 岗位ID + + + + + 不包含岗位 + + + + + 职等 + + + + + 不包含职等 + + + + + 职称 + + + + + 不包含职称 + + + + + 员工 + + + + + 不包含员工 + + + + + 备注 + + + + + 默认标志 + + + + + 预留字段1 + + + + + 预留字段2 + + + + + 预留字段3 + + + + + 预留字段4 + + + + + 预留字段5 + + + + + 预留字段6 + + + + + 预留字段7 + + + + + 预留字段8 + + + + + 预留字段9 + + + + + 预留字段10 + + + + + 预留字段11 + + + + + 预留字段12 + + 培训记录 (Model) @@ -30177,6 +30467,21 @@ 修改信息 + + + 员工群组(Dto.View1) + + + + + 创建信息 + + + + + 修改信息 + + 培训记录(Dto.View) diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml index cd868e55..6742c4ea 100644 --- a/Tiobon.Core.Api/Tiobon.Core.xml +++ b/Tiobon.Core.Api/Tiobon.Core.xml @@ -1236,6 +1236,11 @@ 培训机构(Controller) + + + 员工群组(Controller) + + 培训记录(Controller) diff --git a/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs new file mode 100644 index 00000000..49a9874d --- /dev/null +++ b/Tiobon.Core.IServices/Ghre/IGhre_StaffGroupServices.cs @@ -0,0 +1,8 @@ +namespace Tiobon.Core.IServices; + +/// +/// 员工群组(自定义服务接口) +/// +public interface IGhre_StaffGroupServices : IBaseServices +{ +} \ No newline at end of file diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs new file mode 100644 index 00000000..c408a2f0 --- /dev/null +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_StaffGroup.Dto.Base.cs @@ -0,0 +1,244 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghre_StaffGroup.cs +* +*功 能： N / A +* 类 名： Ghre_StaffGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/2/17 14:08:30 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// 员工群组 (Dto.Base) +/// +public class Ghre_StaffGroupBase +{ + + /// + /// 群组类别 + /// + [Display(Name = "GroupType"), Description("群组类别"), MaxLength(32, ErrorMessage = "群组类别 不能超过 32 个字符")] + public string GroupType { get; set; } + + /// + /// 厂区 + /// + [Display(Name = "ZoneId"), Description("厂区"), MaxLength(2000, ErrorMessage = "厂区 不能超过 2000 个字符")] + public string ZoneId { get; set; } + + /// + /// 不包含厂区 + /// + [Display(Name = "ExclZoneId"), Description("不包含厂区"), MaxLength(2000, ErrorMessage = "不包含厂区 不能超过 2000 个字符")] + public string ExclZoneId { get; set; } + + /// + /// 部门 + /// + [Display(Name = "DeptId"), Description("部门"), MaxLength(2000, ErrorMessage = "部门 不能超过 2000 个字符")] + public string DeptId { get; set; } + + /// + /// 不包含部门 + /// + [Display(Name = "ExclDeptId"), Description("不包含部门"), MaxLength(2000, ErrorMessage = "不包含部门 不能超过 2000 个字符")] + public string ExclDeptId { get; set; } + + /// + /// 岗位ID + /// + [Display(Name = "TitleId"), Description("岗位ID"), MaxLength(2000, ErrorMessage = "岗位ID 不能超过 2000 个字符")] + public string TitleId { get; set; } + + /// + /// 不包含岗位 + /// + [Display(Name = "ExclTitleId"), Description("不包含岗位"), MaxLength(2000, ErrorMessage = "不包含岗位 不能超过 2000 个字符")] + public string ExclTitleId { get; set; } + + /// + /// 职等 + /// + [Display(Name = "GradeId"), Description("职等"), MaxLength(2000, ErrorMessage = "职等 不能超过 2000 个字符")] + public string GradeId { get; set; } + + /// + /// 不包含职等 + /// + [Display(Name = "ExclGradeId"), Description("不包含职等"), MaxLength(2000, ErrorMessage = "不包含职等 不能超过 2000 个字符")] + public string ExclGradeId { get; set; } + + /// + /// 职称 + /// + [Display(Name = "JobId"), Description("职称"), MaxLength(2000, ErrorMessage = "职称 不能超过 2000 个字符")] + public string JobId { get; set; } + + /// + /// 不包含职称 + /// + [Display(Name = "ExclJobId"), Description("不包含职称"), MaxLength(2000, ErrorMessage = "不包含职称 不能超过 2000 个字符")] + public string ExclJobId { get; set; } + + /// + /// 员工 + /// + [Display(Name = "StaffId"), Description("员工"), MaxLength(2000, ErrorMessage = "员工 不能超过 2000 个字符")] + public string StaffId { get; set; } + + /// + /// 不包含员工 + /// + [Display(Name = "ExclStaffId"), Description("不包含员工"), MaxLength(2000, ErrorMessage = "不包含员工 不能超过 2000 个字符")] + public string ExclStaffId { 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; } + + /// + /// 厂区 + /// + public string ZoneIds { get; set; } + + /// + /// 不包含厂区 + /// + public string ExclZoneIds { get; set; } + + /// + /// 部门 + /// + public string DeptIds { get; set; } + + /// + /// 不包含部门 + /// + public string ExclDeptIds { get; set; } + + /// + /// 岗位ID + /// + public string TitleIds { get; set; } + + /// + /// 不包含岗位 + /// + public string ExclTitleIds { get; set; } + + /// + /// 职等 + /// + public string GradeIds { get; set; } + + /// + /// 不包含职等 + /// + public string ExclGradeIds { get; set; } + + /// + /// 职称 + /// + public string JobIds { get; set; } + + /// + /// 不包含职称 + /// + public string ExclJobIds { get; set; } + + /// + /// 员工 + /// + public string StaffIds { get; set; } + + /// + /// 不包含员工 + /// + public string ExclStaffIds { get; set; } +} diff --git a/Tiobon.Core.Model/Edit/Ghre/Ghre_StaffGroup.Dto.EditInput.cs b/Tiobon.Core.Model/Edit/Ghre/Ghre_StaffGroup.Dto.EditInput.cs new file mode 100644 index 00000000..01eaa4fe --- /dev/null +++ b/Tiobon.Core.Model/Edit/Ghre/Ghre_StaffGroup.Dto.EditInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghre_StaffGroup.cs +* +*功 能： N / A +* 类 名： Ghre_StaffGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/2/17 14:08:30 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// 员工群组 (Dto.EditInput) +/// +public class EditGhre_StaffGroupInput : Ghre_StaffGroupBase +{ +} diff --git a/Tiobon.Core.Model/Insert/Ghre/Ghre_StaffGroup.Dto.InsertInput.cs b/Tiobon.Core.Model/Insert/Ghre/Ghre_StaffGroup.Dto.InsertInput.cs new file mode 100644 index 00000000..68636f4f --- /dev/null +++ b/Tiobon.Core.Model/Insert/Ghre/Ghre_StaffGroup.Dto.InsertInput.cs @@ -0,0 +1,26 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghre_StaffGroup.cs +* +*功 能： N / A +* 类 名： Ghre_StaffGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/2/17 14:08:30 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + + +/// +/// 员工群组 (Dto.InsertInput) +/// +public class InsertGhre_StaffGroupInput : Ghre_StaffGroupBase +{ +} diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs new file mode 100644 index 00000000..e76d9a15 --- /dev/null +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_StaffGroup.cs @@ -0,0 +1,185 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghre_StaffGroup.cs +* +*功 能： N / A +* 类 名： Ghre_StaffGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/2/17 14:08:30 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ +namespace Tiobon.Core.Model.Models; + + +/// +/// 员工群组 (Model) +/// +[SugarTable("Ghre_StaffGroup", "Ghre_StaffGroup"), Entity(TableCnName = "员工群组", TableName = "Ghre_StaffGroup")] +public class Ghre_StaffGroup : BasePoco +{ + + /// + /// 群组类别 + /// + [Display(Name = "GroupType"), Description("群组类别"), MaxLength(32, ErrorMessage = "群组类别 不能超过 32 个字符")] + public string GroupType { get; set; } + + /// + /// 厂区 + /// + [Display(Name = "ZoneId"), Description("厂区"), MaxLength(2000, ErrorMessage = "厂区 不能超过 2000 个字符")] + public string ZoneId { get; set; } + + /// + /// 不包含厂区 + /// + [Display(Name = "ExclZoneId"), Description("不包含厂区"), MaxLength(2000, ErrorMessage = "不包含厂区 不能超过 2000 个字符")] + public string ExclZoneId { get; set; } + + /// + /// 部门 + /// + [Display(Name = "DeptId"), Description("部门"), MaxLength(2000, ErrorMessage = "部门 不能超过 2000 个字符")] + public string DeptId { get; set; } + + /// + /// 不包含部门 + /// + [Display(Name = "ExclDeptId"), Description("不包含部门"), MaxLength(2000, ErrorMessage = "不包含部门 不能超过 2000 个字符")] + public string ExclDeptId { get; set; } + + /// + /// 岗位ID + /// + [Display(Name = "TitleId"), Description("岗位ID"), MaxLength(2000, ErrorMessage = "岗位ID 不能超过 2000 个字符")] + public string TitleId { get; set; } + + /// + /// 不包含岗位 + /// + [Display(Name = "ExclTitleId"), Description("不包含岗位"), MaxLength(2000, ErrorMessage = "不包含岗位 不能超过 2000 个字符")] + public string ExclTitleId { get; set; } + + /// + /// 职等 + /// + [Display(Name = "GradeId"), Description("职等"), MaxLength(2000, ErrorMessage = "职等 不能超过 2000 个字符")] + public string GradeId { get; set; } + + /// + /// 不包含职等 + /// + [Display(Name = "ExclGradeId"), Description("不包含职等"), MaxLength(2000, ErrorMessage = "不包含职等 不能超过 2000 个字符")] + public string ExclGradeId { get; set; } + + /// + /// 职称 + /// + [Display(Name = "JobId"), Description("职称"), MaxLength(2000, ErrorMessage = "职称 不能超过 2000 个字符")] + public string JobId { get; set; } + + /// + /// 不包含职称 + /// + [Display(Name = "ExclJobId"), Description("不包含职称"), MaxLength(2000, ErrorMessage = "不包含职称 不能超过 2000 个字符")] + public string ExclJobId { get; set; } + + /// + /// 员工 + /// + [Display(Name = "Staff"), Description("员工"), MaxLength(2000, ErrorMessage = "员工 不能超过 2000 个字符")] + public string Staff { get; set; } + + /// + /// 不包含员工 + /// + [Display(Name = "ExclStaff"), Description("不包含员工"), MaxLength(2000, ErrorMessage = "不包含员工 不能超过 2000 个字符")] + public string ExclStaff { 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/Ghre/Ghre_StaffGroup.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs new file mode 100644 index 00000000..3c7426d1 --- /dev/null +++ b/Tiobon.Core.Model/View/Ghre/Ghre_StaffGroup.Dto.View.cs @@ -0,0 +1,34 @@ +/* 代码由框架生成,任何更改都可能导致被代码生成器覆盖，可自行修改。 +* Ghre_StaffGroup.cs +* +*功 能： N / A +* 类 名： Ghre_StaffGroup +* +* Ver 变更日期 负责人 变更内容 +* ─────────────────────────────────── +*V0.01 2025/2/17 14:08:30 SimonHsiao 初版 +* +* Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. +*┌──────────────────────────────────┐ +*│　此技术信息为本公司机密信息，未经本公司书面同意禁止向第三方披露．　│ +*│　作者：SimonHsiao │ +*└──────────────────────────────────┘ +*/ + +namespace Tiobon.Core.Model.Models; + +/// +/// 员工群组(Dto.View1) +/// +public class Ghre_StaffGroupDto : Ghre_StaffGroup +{ + /// + /// 创建信息 + /// + public string CreateDataInfo { get; set; } + + /// + /// 修改信息 + /// + public string UpdateDataInfo { get; set; } +} diff --git a/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs new file mode 100644 index 00000000..342aa7d0 --- /dev/null +++ b/Tiobon.Core.Services/Ghre/Ghre_StaffGroupServices.cs @@ -0,0 +1,34 @@ +using Tiobon.Core.Common.DB.Dapper.Extensions; +using Tiobon.Core.IServices; + +namespace Tiobon.Core.Services; + +/// +/// 员工群组 (服务) +/// +public class Ghre_StaffGroupServices : BaseServices, IGhre_StaffGroupServices +{ + private readonly IBaseRepository _dal; + public Ghre_StaffGroupServices(ICaching caching, IBaseRepository dal) + { + this._dal = dal; + base.BaseDal = dal; + base._caching = caching; + } + + public override async Task Add(InsertGhre_StaffGroupInput entity) + { + + var result = await base.Add(entity); + + + return result; + } + + public override async Task Update(long Id, EditGhre_StaffGroupInput entity) + { + var result = await base.Update(Id, entity, null, ["Status"]); + + return result; + } +} \ No newline at end of file