From b82e3039b603a05bd89e8fff5a86f18709baa346 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Sat, 14 Sep 2024 11:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=B9=E8=AE=AD=E9=9C=80=E6=B1=82=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 578 +++++++++--------- .../Ghre/Ghre_RequestController.cs | 12 +- .../Ghre/IGhre_RequestServices.cs | 5 +- .../View/Ghre/Ghre_Request.Dto.View.cs | 3 + .../Ghre/Ghre_RequestServices.cs | 136 +++++ .../Ghre/Ghre_StudyRecordServices.cs | 3 +- 6 files changed, 451 insertions(+), 286 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 37637d35..66d7362f 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -120803,7 +120803,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_StudyRule 1721267637 Administrator -1724218442 +1726122724 Administrator 必选修规则 @@ -121036,6 +121036,18 @@ LABL 0 Arial Unicode MS,8,N 2000 +F36272CC-A02B-4B59-9FE7-0137165E613B +部门是否含下阶 +IsDeptLower +1726122200 +Administrator +1726122736 +Administrator +部门是否含下阶 +'fale' +bit + + 11CD542D-061E-4B85-A96B-7A0543F3C4AE 职称 TitleId @@ -121047,7 +121059,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + AE698472-4094-467D-96DC-5B3579FBFAB9 职等 GradeId @@ -121059,7 +121071,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + AF5F0E34-DA3F-4286-A4EC-88F51CDA9EF5 岗位 JobId @@ -121071,7 +121083,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 8F74C8FF-6DCB-4BE1-B049-0BDD3D5D8FC9 年度 Year @@ -121083,7 +121095,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + FA2DBC72-8C81-4DE1-B906-376DCDE8A2F9 完成期限 DeadlineMonth @@ -121094,7 +121106,7 @@ LABL 0 Arial Unicode MS,8,N 完成期限 int - + 67DC0C25-BDB7-4E86-AD1A-DBAC953CBE1D 备注 RemarkSz @@ -121109,7 +121121,7 @@ LABL 0 Arial Unicode MS,8,N - + 49D9AB19-3FB3-467A-9E98-18487BC09CE6 结果 Result @@ -121121,7 +121133,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 2D5BA3A4-EFBB-4770-AFD6-9B40D4C4F2B6 默认标志 IsDefault @@ -121136,7 +121148,7 @@ LABL 0 Arial Unicode MS,8,N - + 367902A9-EE5A-450C-8157-BE34BB2BD3B4 删除标志 IsEnable @@ -121151,7 +121163,7 @@ LABL 0 Arial Unicode MS,8,N - + CFBFA0E2-D80B-48FE-AE5A-BD7B661D21F6 预留字段1 Reverse1 @@ -121163,7 +121175,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 811A60A5-B9EA-441E-BB3D-D04B9D14154D 预留字段2 Reverse2 @@ -121175,7 +121187,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D223FC7-D860-43E9-9109-B69B141DF255 预留字段3 Reverse3 @@ -121187,7 +121199,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 841830F3-83F5-4A89-AB54-AC9C20B5A748 预留字段4 Reverse4 @@ -121199,7 +121211,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0D881F32-B7B0-4979-BB1B-F78B96F60FB5 预留字段5 Reverse5 @@ -121211,7 +121223,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AB281A43-9014-4DEC-ACFC-1694D7E08CAB 预留字段6 Reverse6 @@ -121223,7 +121235,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 43B74A75-DB24-4B7D-9653-A2B6A7ED01E1 预留字段7 Reverse7 @@ -121235,7 +121247,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B50A76AE-CE1C-40AF-9D71-25D03B3DFC85 预留字段8 Reverse8 @@ -121247,7 +121259,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 94EE4260-04D6-4A70-8FF1-113D921A921E 预留字段9 Reverse9 @@ -121259,7 +121271,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9F273A96-2C2F-44C2-BE9F-9CA706457DE0 预留字段10 Reverse10 @@ -121271,7 +121283,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 324CDD0F-14BF-40B4-8B54-0835EF2673B7 预留字段I1 ReverseI1 @@ -121283,7 +121295,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 9B85210E-4450-43BE-9F3E-89C9BAE32C7B 预留字段I2 ReverseI2 @@ -121297,7 +121309,7 @@ LABL 0 Arial Unicode MS,8,N - + 02F1F0EA-B9DC-4243-9765-FB0FB60A73B4 Key_1 Key_1 @@ -121311,10 +121323,10 @@ LABL 0 Arial Unicode MS,8,N - + - + @@ -121327,7 +121339,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训证书规则 - + 74B0AAD1-B9E2-4EDC-8F94-267A7290CFD7 Id Id @@ -121342,7 +121354,7 @@ LABL 0 Arial Unicode MS,8,N - + 101FABA8-1B4B-4152-9CC6-F9CDBB84036C 创建人 CreateBy @@ -121356,7 +121368,7 @@ LABL 0 Arial Unicode MS,8,N - + 778A7CF1-CE3C-4D0F-8C1D-4E4DCF460E79 创建时间 CreateTime @@ -121370,7 +121382,7 @@ LABL 0 Arial Unicode MS,8,N - + ABA61C97-6ECC-4EAE-A3A5-1F3CD06AF937 创建程序 CreateProg @@ -121382,7 +121394,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4B9162AD-E539-4D88-9033-1A14B95F4BC1 创建人IP CreateIP @@ -121394,7 +121406,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 832CE7C6-2F51-4792-88F8-09CA93BC9EE3 修改人 UpdateBy @@ -121408,7 +121420,7 @@ LABL 0 Arial Unicode MS,8,N - + 38F733AB-C497-4FA9-B06B-9B5C01567232 修改时间 UpdateTime @@ -121422,7 +121434,7 @@ LABL 0 Arial Unicode MS,8,N - + E517BC43-EDAB-4FD0-9AFD-27871946D7A4 修改程序 UpdateProg @@ -121434,7 +121446,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + AC751D23-BE2F-407B-B57B-43179C6A1DD2 修改人IP UpdateIP @@ -121446,7 +121458,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 91C6434C-8BB0-40EE-85F8-097E7850AA81 操作日志ID OperateLogID @@ -121461,7 +121473,7 @@ LABL 0 Arial Unicode MS,8,N - + 5FF54614-5C5C-4F71-8467-0372DD3761F0 规则类型 RuleType @@ -121473,7 +121485,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + B0C05A48-302C-4CE6-8BA1-A0C44BD0303E 规则编号 RuleNo @@ -121485,7 +121497,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 150DA0CC-7A81-4020-8C50-6C77A1CBB47C 证书名称 CertificateName @@ -121497,7 +121509,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + CB9DAAC2-2757-4594-B1CD-0443C4CA61AE 课程场景ID CourseSceneId @@ -121508,7 +121520,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + D5BFD533-C0CB-40EF-B419-C76CFA5B2472 课程ID CourseId @@ -121519,7 +121531,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 63D22867-D35B-48C8-8315-96999A56F14F 有效期类型 ValidityType @@ -121531,7 +121543,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AA8964B1-9490-4BA5-8BA4-4C1E4260BAEC 固定数 StaticNum @@ -121542,7 +121554,7 @@ LABL 0 Arial Unicode MS,8,N 固定数 int - + 70867D03-D648-4D1C-9617-7F20505B1FF0 固定类型 StaticType @@ -121554,7 +121566,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 419FB467-143A-4B5A-9DEA-1C321943D83F 有效期 ValidityTime @@ -121565,7 +121577,7 @@ LABL 0 Arial Unicode MS,8,N 有效期 datetime - + 408CA59F-CABC-49BA-B094-D1DDB66652AE 发放规则 SendRule @@ -121577,7 +121589,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 0DCFC327-8D5A-40B3-813D-42A7753DBC3D 分数 ScoreMin @@ -121588,7 +121600,7 @@ LABL 0 Arial Unicode MS,8,N 分数 int - + 343AC157-AD4F-4382-BC76-BC9EA0317D8D 分数1 ScoreMax @@ -121599,7 +121611,7 @@ LABL 0 Arial Unicode MS,8,N 分数1 int - + 8C3CC76E-55C9-4B86-9744-22EAA8105E9B 备注 RemarkSz @@ -121614,7 +121626,7 @@ LABL 0 Arial Unicode MS,8,N - + 5748058F-BCCD-49C0-9012-3D7E96B6D69A 默认标志 IsDefault @@ -121629,7 +121641,7 @@ LABL 0 Arial Unicode MS,8,N - + 2589055F-505E-441A-9696-9964A7A4A008 删除标志 IsEnable @@ -121644,7 +121656,7 @@ LABL 0 Arial Unicode MS,8,N - + D20B915C-FCA1-494B-A8A2-B2FF85468C64 预留字段1 Reverse1 @@ -121656,7 +121668,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 1B4FABC6-E541-4068-ACFB-BC9078682988 预留字段2 Reverse2 @@ -121668,7 +121680,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6310193-4CEE-4148-BE8B-3C11D8F4322D 预留字段3 Reverse3 @@ -121680,7 +121692,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9FE04BB6-928C-4531-9DDD-0FDBC30BB174 预留字段4 Reverse4 @@ -121692,7 +121704,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + D97789F8-ED46-447A-AD69-0776DE2FABCD 预留字段5 Reverse5 @@ -121704,7 +121716,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AEDD3137-4121-440A-9A7E-B6F299000B70 预留字段6 Reverse6 @@ -121716,7 +121728,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4FCFEEF7-1047-46A9-916C-FA8C1AA3F795 预留字段7 Reverse7 @@ -121728,7 +121740,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 323C988B-20C0-43EC-ADAE-0FF35D6DFA4A 预留字段8 Reverse8 @@ -121740,7 +121752,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 69763777-A397-4C79-B48F-02E75CD145FF 预留字段9 Reverse9 @@ -121752,7 +121764,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6FBA743-4C50-4218-8E94-29BFBEEB0F26 预留字段10 Reverse10 @@ -121764,7 +121776,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + FCCD8A45-2561-4DD5-A9E9-348C2FD700BC 预留字段I1 ReverseI1 @@ -121776,7 +121788,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 4EF2055B-A955-44E6-A36E-C6441D831DD6 预留字段I2 ReverseI2 @@ -121790,7 +121802,7 @@ LABL 0 Arial Unicode MS,8,N - + 9A140C59-A38D-4A71-9AAB-F1F0C0F7E66B Key_1 Key_1 @@ -121799,15 +121811,15 @@ LABL 0 Arial Unicode MS,8,N 1721280148 Administrator - + - + - + @@ -121820,7 +121832,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则人员 - + 8DBABE84-0D95-4963-B5DF-D877A206762B Id Id @@ -121835,7 +121847,7 @@ LABL 0 Arial Unicode MS,8,N - + 48A72633-A433-493B-9FCF-BD126E84A4AF 创建人 CreateBy @@ -121849,7 +121861,7 @@ LABL 0 Arial Unicode MS,8,N - + CBF754F2-F6C8-4BF8-BBFD-F479FF0BE68F 创建时间 CreateTime @@ -121863,7 +121875,7 @@ LABL 0 Arial Unicode MS,8,N - + C8F58FBE-8633-4F75-BD8E-3E04F33B8863 创建程序 CreateProg @@ -121875,7 +121887,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4D66366A-5007-40A1-962C-BF3D01F8C361 创建人IP CreateIP @@ -121887,7 +121899,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 64AFEE52-E383-4E01-B6FB-92E27CA8DFF4 修改人 UpdateBy @@ -121901,7 +121913,7 @@ LABL 0 Arial Unicode MS,8,N - + DDDCCDAF-B043-44AA-BBDF-01D692B67095 修改时间 UpdateTime @@ -121915,7 +121927,7 @@ LABL 0 Arial Unicode MS,8,N - + 974D9E72-CDB6-4CEF-8D2D-4D4B26993235 修改程序 UpdateProg @@ -121927,7 +121939,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 21CCFED9-583C-4B5A-8370-170748173C49 修改人IP UpdateIP @@ -121939,7 +121951,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + A5BF1114-3882-4699-83F8-3B0F5C2FA382 操作日志ID OperateLogID @@ -121954,7 +121966,7 @@ LABL 0 Arial Unicode MS,8,N - + EEFF42B2-E137-4D20-B315-59446F45D0CA 必选修规则ID StudyRuleId @@ -121965,7 +121977,7 @@ LABL 0 Arial Unicode MS,8,N 必选修规则ID bigint - + DE5726E5-8EF1-4BB4-AB0C-735D098B2A57 人员 StaffId @@ -121976,7 +121988,7 @@ LABL 0 Arial Unicode MS,8,N 人员 bigint - + BEF0B3E2-5C5F-4A6E-A696-23BE258E5967 员工姓名 StaffName @@ -121991,7 +122003,7 @@ LABL 0 Arial Unicode MS,8,N - + E04C7821-5C70-4181-A47A-CB6781A4EA94 备注 RemarkSz @@ -122006,7 +122018,7 @@ LABL 0 Arial Unicode MS,8,N - + E963DF7D-5FF1-46E5-BFD1-C77FBC755D50 默认标志 IsDefault @@ -122021,7 +122033,7 @@ LABL 0 Arial Unicode MS,8,N - + 8EC54578-BC99-4FA2-AA3E-49C78AD49294 删除标志 IsEnable @@ -122036,7 +122048,7 @@ LABL 0 Arial Unicode MS,8,N - + 20F23FED-B864-48D9-A5F2-62530E6B6B6D 预留字段1 Reverse1 @@ -122048,7 +122060,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D83EE02-C7B8-4454-9961-5D4317D0393D 预留字段2 Reverse2 @@ -122060,7 +122072,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 35840EFC-0D77-4B15-8DCA-C163FC95D7F0 预留字段3 Reverse3 @@ -122072,7 +122084,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 58515022-4E1B-4716-BCE9-0452E0DF1EC1 预留字段4 Reverse4 @@ -122084,7 +122096,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 23D6B0F2-E0BB-48E1-B6C7-02CD99506ECF 预留字段5 Reverse5 @@ -122096,7 +122108,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2387FA8F-20B2-4370-B3CB-D4B3DEC74BF4 预留字段6 Reverse6 @@ -122108,7 +122120,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 73BE3393-7BFC-4ED3-9421-1B079B700C59 预留字段7 Reverse7 @@ -122120,7 +122132,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3382A8F6-1F0B-45ED-9048-D60BD40A3ACA 预留字段8 Reverse8 @@ -122132,7 +122144,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2D7C8BCC-C8A9-42B2-AA94-02AC70668E77 预留字段9 Reverse9 @@ -122144,7 +122156,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E1095425-D8C3-47FD-AE78-6FC3AF87EE98 预留字段10 Reverse10 @@ -122156,7 +122168,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3D1EA6FC-A74C-45BB-9AEA-A60F4584D106 预留字段I1 ReverseI1 @@ -122168,7 +122180,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + EACF32DF-891A-4372-9E13-9A98AE126EED 预留字段I2 ReverseI2 @@ -122182,7 +122194,7 @@ LABL 0 Arial Unicode MS,8,N - + 2A211835-FB66-43E3-AA9F-BF663C744603 Key_1 Key_1 @@ -122191,15 +122203,15 @@ LABL 0 Arial Unicode MS,8,N 1721372451 Administrator - + - + - + @@ -122212,7 +122224,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则结果 - + 01A907E6-5537-47B2-ABC9-6CFA5A647507 Id Id @@ -122227,7 +122239,7 @@ LABL 0 Arial Unicode MS,8,N - + 5E71B65A-2A07-4484-AF90-87A9C052326B 创建人 CreateBy @@ -122241,7 +122253,7 @@ LABL 0 Arial Unicode MS,8,N - + 4521BD68-D481-4D53-935A-09261F02C9A2 创建时间 CreateTime @@ -122255,7 +122267,7 @@ LABL 0 Arial Unicode MS,8,N - + 9FB3C544-01C4-4652-8E4C-403EB0A1760F 创建程序 CreateProg @@ -122267,7 +122279,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + CAA25DB6-48FC-429A-903F-FA58582217A6 创建人IP CreateIP @@ -122279,7 +122291,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 16A6E494-7B80-4DA6-A7C6-E29ACE72551B 修改人 UpdateBy @@ -122293,7 +122305,7 @@ LABL 0 Arial Unicode MS,8,N - + 548FE2AC-0350-4070-A988-C902ED4FA468 修改时间 UpdateTime @@ -122307,7 +122319,7 @@ LABL 0 Arial Unicode MS,8,N - + 39495E88-C800-47D9-B935-A225C1666DE8 修改程序 UpdateProg @@ -122319,7 +122331,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 8EFD95E4-C07A-4EEB-B87C-34CB110FC739 修改人IP UpdateIP @@ -122331,7 +122343,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 8C10977C-3918-4721-B062-7D93B080EDB6 操作日志ID OperateLogID @@ -122346,7 +122358,7 @@ LABL 0 Arial Unicode MS,8,N - + 1DB2330D-A062-40AE-B906-8952214ADE0B 必选修规则ID StudyRuleId @@ -122357,7 +122369,7 @@ LABL 0 Arial Unicode MS,8,N 必选修规则ID bigint - + AE66BBDE-61E2-4632-9F6A-5A4D9CF8120B 人员ID StaffId @@ -122368,7 +122380,7 @@ LABL 0 Arial Unicode MS,8,N 人员ID INT - + C9FA34E7-332C-4E6B-A64E-E4DD2F23AFD0 工号 StaffNo @@ -122383,7 +122395,7 @@ LABL 0 Arial Unicode MS,8,N - + B15E23D0-4F7B-4C44-91C3-6B9D03F7B3A5 员工姓名 StaffName @@ -122398,7 +122410,7 @@ LABL 0 Arial Unicode MS,8,N - + E9317953-9D17-4B5E-9AB5-FCD7B0E3C2ED 状态 Status @@ -122410,7 +122422,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + DEFC1296-F202-46CB-AE27-01C603090F44 备注 RemarkSz @@ -122425,7 +122437,7 @@ LABL 0 Arial Unicode MS,8,N - + 2E05DAB7-49D3-4778-83D4-6A113DC23457 默认标志 IsDefault @@ -122440,7 +122452,7 @@ LABL 0 Arial Unicode MS,8,N - + CC1468AE-9433-418C-BFFC-39F0C1E517FE 删除标志 IsEnable @@ -122455,7 +122467,7 @@ LABL 0 Arial Unicode MS,8,N - + 2F10D326-1C57-42B1-9DFD-3C4904ACCD80 预留字段1 Reverse1 @@ -122467,7 +122479,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 37878AC3-D2D2-4E10-BFFF-30FB2BD580C4 预留字段2 Reverse2 @@ -122479,7 +122491,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8B7EB0D8-53C4-40D6-B7AA-0C3B18C6D897 预留字段3 Reverse3 @@ -122491,7 +122503,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E9A0CFAE-2187-4CBE-8D74-091DBB1DFA14 预留字段4 Reverse4 @@ -122503,7 +122515,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 76F48910-F9D0-4E4A-825C-7F36880FE07B 预留字段5 Reverse5 @@ -122515,7 +122527,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 71C75EE7-93FE-416F-968F-5CE4F9D93C4C 预留字段6 Reverse6 @@ -122527,7 +122539,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0EACD58B-2142-4212-927A-6B2B71CDD091 预留字段7 Reverse7 @@ -122539,7 +122551,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 17AC2768-F90F-45D0-8876-B831C78F1E38 预留字段8 Reverse8 @@ -122551,7 +122563,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F924F9B7-7CC3-46E9-AE59-2AE12EA72F82 预留字段9 Reverse9 @@ -122563,7 +122575,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + BD8F0293-5749-4E81-88D8-E77650FCE222 预留字段10 Reverse10 @@ -122575,7 +122587,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 67AFD063-C430-4A74-9E90-3CC97CFBBFAC 预留字段I1 ReverseI1 @@ -122587,7 +122599,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + FD09DC2C-989C-4E42-90E2-777878BC2559 预留字段I2 ReverseI2 @@ -122601,7 +122613,7 @@ LABL 0 Arial Unicode MS,8,N - + 2A634DE7-F87B-42B4-B9E9-3B6AC488C700 Key_1 Key_1 @@ -122610,18 +122622,18 @@ LABL 0 Arial Unicode MS,8,N 1722318737 Administrator - + - + - + - + 6E6E5057-1152-49F6-8B1C-C3BAD160A044 考试2 Ghre_ExamTest @@ -122631,7 +122643,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 考试 - + 24AC9A74-7480-4AE6-B98C-8324C2323F51 Id Id @@ -122646,7 +122658,7 @@ LABL 0 Arial Unicode MS,8,N - + 978E718A-0CE0-48AA-92D9-43ED7E608499 创建人 CreateBy @@ -122660,7 +122672,7 @@ LABL 0 Arial Unicode MS,8,N - + BFB35C79-5536-451E-9B7C-EE498BB587AE 创建时间 CreateTime @@ -122674,7 +122686,7 @@ LABL 0 Arial Unicode MS,8,N - + 5D2CB459-DA3E-4DB7-BCAA-59CD7B51E240 创建程序 CreateProg @@ -122686,7 +122698,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + A4F29EC9-A2DC-4F90-B5C4-1C502B533F6B 创建人IP CreateIP @@ -122698,7 +122710,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + CC5D4F45-8716-47C9-83F5-1A7BAE2F4434 修改人 UpdateBy @@ -122712,7 +122724,7 @@ LABL 0 Arial Unicode MS,8,N - + B427CCFE-FAE6-45AB-98E9-965DD9EEA623 修改时间 UpdateTime @@ -122726,7 +122738,7 @@ LABL 0 Arial Unicode MS,8,N - + F06C6B29-CF8B-4FBB-998A-8B605B210A50 修改程序 UpdateProg @@ -122738,7 +122750,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + A42756DA-F611-4641-A548-C4CFE753BFD7 修改人IP UpdateIP @@ -122750,7 +122762,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + CDC9691E-68B3-470F-A5DD-4E310497481C 操作日志ID OperateLogID @@ -122765,7 +122777,7 @@ LABL 0 Arial Unicode MS,8,N - + 63E44B68-E50C-4FC6-878C-0240FCB567E6 关联类型 LinkType @@ -122777,7 +122789,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 61D1F101-F169-49A9-9826-421644164618 课程场景ID CourseSceneId @@ -122788,7 +122800,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + 8FD0B360-5926-45BF-9543-F305CB7DE2D3 课程ID CourseId @@ -122799,7 +122811,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 71594475-6D76-4944-A403-4F7B75F01382 试卷ID ExamPaperId @@ -122810,7 +122822,7 @@ LABL 0 Arial Unicode MS,8,N 试卷ID bigint - + 19AB0DB6-EDC4-4314-9FA1-D968E2C6C655 封面图片URL CoverUrl @@ -122822,7 +122834,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + 7697C678-2E45-4C6F-B61E-3DD3E0ABAE69 考试编号 ExamNo @@ -122834,7 +122846,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 0B0A0502-EC78-4D64-A9B9-C0BBF842ECDC 考试名称 ExamName @@ -122846,7 +122858,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + C645B5A5-A151-43A4-8241-3BB463855336 日期类型 DateType @@ -122858,7 +122870,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 12539319-B67D-47F3-A5B4-B0FB04044B5F 开始时间 BeginTime @@ -122869,7 +122881,7 @@ LABL 0 Arial Unicode MS,8,N 开始时间 datetime - + 3232AD17-64CB-4C62-AF5F-69632F8EFA75 结束时间 EndTime @@ -122880,7 +122892,7 @@ LABL 0 Arial Unicode MS,8,N 结束时间 datetime - + AD0C893A-148C-4B42-AED7-D17D45BD49B5 学完多久 AfterHowLong @@ -122891,7 +122903,7 @@ LABL 0 Arial Unicode MS,8,N 学完多久 int - + A4754794-8668-4E85-BFBF-5141E6960584 考试形式 ExamMode @@ -122903,7 +122915,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 7D4206C9-B889-46F1-B04E-A7E530EC1EE7 线下考试地点 ExamPlace @@ -122915,7 +122927,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(64) 64 - + 4FF2C26B-8417-4D42-8FC0-2C643246E9C8 是否关联开班 IsLinkOpenClass @@ -122926,7 +122938,7 @@ LABL 0 Arial Unicode MS,8,N 是否关联开班 bit - + A33BF7FD-DFC7-47A5-A541-B4EC0FA108B5 开班ID OpenClassId @@ -122937,7 +122949,7 @@ LABL 0 Arial Unicode MS,8,N 开班ID bigint - + 08760568-3D12-4E95-99E5-BD1D6611D834 状态 Status @@ -122949,7 +122961,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + C6E87DC6-1D1F-4A00-8F08-59F79F50C82C 备注 RemarkSz @@ -122964,7 +122976,7 @@ LABL 0 Arial Unicode MS,8,N - + FEC300DF-C6E1-439F-831E-E946885BC8FF 是否使用默认封面 UseDefaultCoverImage @@ -122975,7 +122987,7 @@ LABL 0 Arial Unicode MS,8,N 是否使用默认封面 bit - + C3481172-651C-405F-93E5-A75A74A6283A 默认封面图Name DefaultCoverImageName @@ -122987,7 +122999,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 296A462E-516A-46E5-A452-9C28DD9B44C8 默认标志 IsDefault @@ -123002,7 +123014,7 @@ LABL 0 Arial Unicode MS,8,N - + 91AE5AEF-06CC-4BD2-82A6-59B1E6A63566 删除标志 IsEnable @@ -123017,7 +123029,7 @@ LABL 0 Arial Unicode MS,8,N - + 3AB960B2-5384-4FB3-9AD5-E0E9D2D07413 预留字段1 Reverse1 @@ -123029,7 +123041,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F68F67D9-D5C9-4C33-8376-C41B6AF9D2E1 预留字段2 Reverse2 @@ -123041,7 +123053,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2DF3A3CC-4436-4172-89CD-623D7A7D2664 预留字段3 Reverse3 @@ -123053,7 +123065,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + A3E30BE2-D30B-4406-B7BF-17BABEC81B94 预留字段4 Reverse4 @@ -123065,7 +123077,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 450A0937-DFDE-4638-B55E-D61A082A8D55 预留字段5 Reverse5 @@ -123077,7 +123089,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 6EC6A7CC-FCEE-49D3-A0F2-05A54ED651D2 预留字段6 Reverse6 @@ -123089,7 +123101,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F27D7C52-75FB-4AA8-A2F9-5ECBC0E0E03D 预留字段7 Reverse7 @@ -123101,7 +123113,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 69A41498-5FD9-48CC-81FB-F551FBDB4933 预留字段8 Reverse8 @@ -123113,7 +123125,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 66DAA22C-859D-47D6-903A-E87325A08EDC 预留字段9 Reverse9 @@ -123125,7 +123137,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 53DBAA78-A7CE-441D-81C7-4D45FC4E491B 预留字段10 Reverse10 @@ -123137,7 +123149,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E2E74D12-8640-451C-A2B6-A9B5B8AEC6B7 预留字段I1 ReverseI1 @@ -123149,7 +123161,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + C2CAD344-FA1E-4AAF-A030-CF3195EA1501 预留字段I2 ReverseI2 @@ -123163,7 +123175,7 @@ LABL 0 Arial Unicode MS,8,N - + 41F770FB-5BC1-4C4D-B511-C39897D79E1C Key_1 Key_1 @@ -123172,15 +123184,15 @@ LABL 0 Arial Unicode MS,8,N 1724134340 Administrator - + - + - + @@ -123193,7 +123205,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训需求 - + 2DB5922E-C147-437A-BE59-A6819535C1A8 Id Id @@ -123208,7 +123220,7 @@ LABL 0 Arial Unicode MS,8,N - + C85C2913-78FA-4696-9903-709F96B5F05C 创建人 CreateBy @@ -123222,7 +123234,7 @@ LABL 0 Arial Unicode MS,8,N - + 38AAF3AB-DA6A-4676-8F83-37C642BD79D1 创建时间 CreateTime @@ -123236,7 +123248,7 @@ LABL 0 Arial Unicode MS,8,N - + 0B52A7E3-8152-41D3-BDCB-EF3A6DA653BC 创建程序 CreateProg @@ -123248,7 +123260,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + D84B2A9B-5837-4D9A-8DCF-938DFF8097E0 创建人IP CreateIP @@ -123260,7 +123272,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 7B4F6FDC-4AC7-4000-92DD-F5FD238B63FA 修改人 UpdateBy @@ -123274,7 +123286,7 @@ LABL 0 Arial Unicode MS,8,N - + 3C559211-07CD-4A09-902B-F6466FDEDC4F 修改时间 UpdateTime @@ -123288,7 +123300,7 @@ LABL 0 Arial Unicode MS,8,N - + 6ACA25BD-5DF7-4EC2-97C9-1F8745E27C43 修改程序 UpdateProg @@ -123300,7 +123312,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 67285C81-B621-474A-B040-9342BDBB12BF 修改人IP UpdateIP @@ -123312,7 +123324,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 9B5D2381-752F-463E-8885-7C06B6632392 操作日志ID OperateLogID @@ -123327,7 +123339,7 @@ LABL 0 Arial Unicode MS,8,N - + D4E66399-72AF-4DE4-80E7-2F5566E75D0C 课程来源 CourseSource @@ -123339,7 +123351,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + C2B0DB30-4AED-401B-94A1-A5A4AD0B4C3B 需求编号 RequestNo @@ -123351,7 +123363,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 168177A5-4A87-4769-B296-77CA937C78DE 需求课程名 CourseName @@ -123363,7 +123375,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + D01B337A-49BF-4B8C-BF5F-BA0C1826E527 课程ID CourseId @@ -123374,7 +123386,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + B66E75C5-AD14-4C41-BEC8-682DA197DC0F 培训月份 YearMonth @@ -123386,7 +123398,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 2BE87B12-1ED4-4596-9055-7B6DBB6DC5E3 需求来源 RequestSource @@ -123398,7 +123410,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AB0F1560-F542-4C26-AA78-C3DDAD9DCBEA 需求部门 DeptId @@ -123409,7 +123421,7 @@ LABL 0 Arial Unicode MS,8,N 需求部门 bigint - + 222A0404-B7C1-4A81-971A-812C83BB5992 申请人 ApplicantId @@ -123420,7 +123432,7 @@ LABL 0 Arial Unicode MS,8,N 申请人 bigint - + 04A432BC-73B6-4757-9845-8D5351EA4332 需求人数 RequestNum @@ -123431,7 +123443,7 @@ LABL 0 Arial Unicode MS,8,N 需求人数 int - + 24C59B04-5C69-40AB-99D9-BB35DCB439C5 培训对象 TrainStaffId @@ -123443,7 +123455,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 2DE1B073-A39D-4E9E-AFBD-412D364322B0 需求类别 TrainClass @@ -123455,7 +123467,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 401889F1-0E42-4E05-A028-9B6167EB0AC3 需求程度 TrainLevel @@ -123467,7 +123479,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + BE4ABAB9-B33D-4B6A-83CD-FFDF4BCF635B 内外训 InOrOut @@ -123479,7 +123491,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 47C2C323-2544-4ADA-8EDA-1597A2190C7C 讲师分类 TeacherClass @@ -123491,7 +123503,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 670E4101-10BB-4A96-8E99-376EA4244328 申请理由 Reason @@ -123503,7 +123515,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + 4A9DBF75-28FE-442C-A837-E0A94736B994 人均预算 PerCapitaBudget @@ -123516,7 +123528,7 @@ LABL 0 Arial Unicode MS,8,N 20 2 - + AB61CC4F-359A-4AA9-A850-A40716F85FCE 合计预算 TotalBudget @@ -123529,7 +123541,7 @@ LABL 0 Arial Unicode MS,8,N 20 2 - + 19865753-A69F-4C91-B8BB-B66D38856B2E 发起人 SponsorId @@ -123540,7 +123552,7 @@ LABL 0 Arial Unicode MS,8,N 发起人 bigint - + 9EF189FD-2445-4363-82D5-97ECFF7B0CCE 状态 Status @@ -123552,7 +123564,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + EBC5B308-E26A-4D14-BD92-5615DB4660C4 备注 RemarkSz @@ -123567,7 +123579,7 @@ LABL 0 Arial Unicode MS,8,N - + 71FD9C1D-9695-4FDF-A251-FAAB8138C6DE 默认标志 IsDefault @@ -123582,7 +123594,7 @@ LABL 0 Arial Unicode MS,8,N - + C0A551D8-064B-4F6C-A410-7FACB2A256E9 删除标志 IsEnable @@ -123597,7 +123609,7 @@ LABL 0 Arial Unicode MS,8,N - + 34F57372-6035-41C6-B99E-C95101AF6ECC WorkID WorkID @@ -123608,7 +123620,7 @@ LABL 0 Arial Unicode MS,8,N WorkID int - + EAE9C54C-60B7-4901-B736-9B8CFB21AB06 WorkNo WorkNo @@ -123620,7 +123632,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 94391BD3-97EF-4CB2-9789-FB93B4B2DB1F ToDoType ToDoType @@ -123632,7 +123644,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 70A0D170-00D3-4E65-B954-CD7D7FA6107B BatchSID BatchSID @@ -123644,7 +123656,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + C7C865E1-1023-4179-AD04-E42DAE11714D WorkState WorkState @@ -123655,7 +123667,7 @@ LABL 0 Arial Unicode MS,8,N WorkState int - + 372E89F9-075F-4375-B0B2-A1D2F71B60E0 ShiftID ShiftID @@ -123666,7 +123678,7 @@ LABL 0 Arial Unicode MS,8,N ShiftID int - + 4B5BEF0F-6EAF-49A9-AAC8-3150BF41543F ConfirmUserID ConfirmUserID @@ -123677,7 +123689,7 @@ LABL 0 Arial Unicode MS,8,N ConfirmUserID int - + F6745C34-7074-4822-B78D-149B8F234223 ConfirmTime ConfirmTime @@ -123688,7 +123700,7 @@ LABL 0 Arial Unicode MS,8,N ConfirmTime datetime - + 4A2D89AD-DF8C-44AB-92EA-A6E701732298 ConfirmComment ConfirmComment @@ -123700,7 +123712,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + 9962AE20-8143-49FE-AF4E-1D9285089331 同意人 AgreeUserId @@ -123711,7 +123723,7 @@ LABL 0 Arial Unicode MS,8,N 同意人 bigint - + 6F7B9F42-3721-4BDB-97B2-6C57CF5D0B74 同意时间 AgreeTime @@ -123722,7 +123734,7 @@ LABL 0 Arial Unicode MS,8,N 同意时间 datetime - + 519A31E4-44FB-439A-926C-F164E9224204 同意理由 AgreeReason @@ -123734,7 +123746,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + BADAFBF4-2C0F-4EAA-B8A5-B34FB40E171F 拒绝人 RefuseUserId @@ -123745,7 +123757,7 @@ LABL 0 Arial Unicode MS,8,N 拒绝人 bigint - + 63390978-FC60-4F8F-8997-1AC99FE68CA3 拒绝时间 RefuseTime @@ -123756,7 +123768,7 @@ LABL 0 Arial Unicode MS,8,N 拒绝时间 datetime - + A58C50B5-829E-468A-8093-5B404F2BD040 拒绝理由 RefuseReason @@ -123768,7 +123780,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(2000) 2000 - + EADE602A-E3DB-4538-9DC6-F3E7E35AA914 预留字段1 Reverse1 @@ -123780,7 +123792,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 64A9C288-7C6E-41DE-B71B-6E45A636FFDC 预留字段2 Reverse2 @@ -123792,7 +123804,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 1EF93DDC-749A-494B-AE41-EB5383983DEA 预留字段3 Reverse3 @@ -123804,7 +123816,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 79BCAF24-90F1-4D18-BB23-5F79ABBABF49 预留字段4 Reverse4 @@ -123816,7 +123828,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B31BA803-5B42-4852-B99B-F71E4FB05E68 预留字段5 Reverse5 @@ -123828,7 +123840,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2DF2FAC6-C04C-4E02-9475-D85588C730CA 预留字段6 Reverse6 @@ -123840,7 +123852,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B2DD1AAE-02D8-4C52-A54F-EAA20D26116E 预留字段7 Reverse7 @@ -123852,7 +123864,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9C65DF57-2D56-4B14-9071-42B0AB2F3064 预留字段8 Reverse8 @@ -123864,7 +123876,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2B14DC76-7D19-4A76-A34B-B191511EFA74 预留字段9 Reverse9 @@ -123876,7 +123888,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0A8DC580-6DF2-457C-8A23-9B28825CEB36 预留字段10 Reverse10 @@ -123888,7 +123900,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 7631A223-D8AD-4EDD-8E48-8B32F4966A94 预留字段I1 ReverseI1 @@ -123900,7 +123912,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 332CDAB6-C6CC-48BB-A1DE-1E3352BD3BFF 预留字段I2 ReverseI2 @@ -123914,7 +123926,7 @@ LABL 0 Arial Unicode MS,8,N - + 081CBB58-53E2-472A-8704-04FF1B29D1E6 Key_1 Key_1 @@ -123923,15 +123935,15 @@ LABL 0 Arial Unicode MS,8,N 1725601887 Administrator - + - + - + @@ -123955,7 +123967,7 @@ LABL 0 Arial Unicode MS,8,N - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -123989,7 +124001,7 @@ LABL 0 Arial Unicode MS,8,N - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -124023,7 +124035,7 @@ LABL 0 Arial Unicode MS,8,N - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -124057,7 +124069,7 @@ LABL 0 Arial Unicode MS,8,N - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -124091,7 +124103,7 @@ LABL 0 Arial Unicode MS,8,N - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -124125,7 +124137,7 @@ LABL 0 Arial Unicode MS,8,N - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -124159,7 +124171,7 @@ LABL 0 Arial Unicode MS,8,N - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -124193,7 +124205,7 @@ LABL 0 Arial Unicode MS,8,N - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -124227,7 +124239,7 @@ LABL 0 Arial Unicode MS,8,N - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -124261,7 +124273,7 @@ LABL 0 Arial Unicode MS,8,N - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -124295,7 +124307,7 @@ LABL 0 Arial Unicode MS,8,N - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -124329,7 +124341,7 @@ LABL 0 Arial Unicode MS,8,N - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -124363,7 +124375,7 @@ LABL 0 Arial Unicode MS,8,N - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -124397,7 +124409,7 @@ LABL 0 Arial Unicode MS,8,N - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -124431,7 +124443,7 @@ LABL 0 Arial Unicode MS,8,N - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -124462,10 +124474,10 @@ LABL 0 Arial Unicode MS,8,N - + - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -124499,7 +124511,7 @@ LABL 0 Arial Unicode MS,8,N - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -124509,7 +124521,7 @@ LABL 0 Arial Unicode MS,8,N - + @@ -124530,10 +124542,10 @@ LABL 0 Arial Unicode MS,8,N - + - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -124543,7 +124555,7 @@ LABL 0 Arial Unicode MS,8,N - + @@ -124564,10 +124576,10 @@ LABL 0 Arial Unicode MS,8,N - + - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -124577,7 +124589,7 @@ LABL 0 Arial Unicode MS,8,N - + @@ -124589,7 +124601,7 @@ LABL 0 Arial Unicode MS,8,N - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -124602,7 +124614,7 @@ LABL 0 Arial Unicode MS,8,N - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -124610,12 +124622,12 @@ LABL 0 Arial Unicode MS,8,N 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -124627,7 +124639,7 @@ LABL 0 Arial Unicode MS,8,N - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -124637,7 +124649,7 @@ LABL 0 Arial Unicode MS,8,N ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -124647,7 +124659,7 @@ LABL 0 Arial Unicode MS,8,N Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -124715,7 +124727,7 @@ LABL 0 Arial Unicode MS,8,N varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -124726,7 +124738,7 @@ LABL 0 Arial Unicode MS,8,N varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -124748,7 +124760,7 @@ LABL 0 Arial Unicode MS,8,N varchar(2000) 2000 - + @@ -124826,7 +124838,7 @@ LABL 0 Arial Unicode MS,8,N varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -124849,7 +124861,7 @@ LABL 0 Arial Unicode MS,8,N - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -124858,13 +124870,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/Controllers/Ghre/Ghre_RequestController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs index 32966369..3ebf116d 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_RequestController.cs @@ -1,4 +1,6 @@ -namespace Tiobon.Core.Api.Controllers; +using Consul.Filtering; + +namespace Tiobon.Core.Api.Controllers; /// /// 培训需求(Controller) @@ -44,4 +46,12 @@ public class Ghre_RequestController : BaseController> QueryGroup([FromBody] QueryBody filter, string type) + { + return await _service.QueryGroup(filter, type); + } + #endregion } \ No newline at end of file diff --git a/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs b/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs index 80cff99e..b5c29e5a 100644 --- a/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs +++ b/Tiobon.Core.IServices/Ghre/IGhre_RequestServices.cs @@ -1,4 +1,5 @@ -using Tiobon.Core.IServices.BASE; +using Tiobon.Core.Common; +using Tiobon.Core.IServices.BASE; using Tiobon.Core.Model; using Tiobon.Core.Model.Models; @@ -12,4 +13,6 @@ public interface IGhre_RequestServices : IBaseServices UpdateStatus(InsertGhre_RequestInput input, string status); Task> InsertByStatus(InsertGhre_RequestInput insertModel, string status); + + Task> QueryGroup(QueryBody filter, string type); } \ No newline at end of file diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs index 8e466e6e..20338468 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_Request.Dto.View.cs @@ -52,7 +52,10 @@ public class Ghre_RequestDto : Ghre_Request public string AgreeUserName { get; set; } public string RefuseUserName { get; set; } + public string WorkStateLabel { get; set; } + public string YearMonthLabel { get; set; } + public string MonthLabel { get; set; } } diff --git a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs index a5b7cba4..c0da2c4d 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_RequestServices.cs @@ -10,6 +10,8 @@ using Tiobon.Core.Model; using Tiobon.Core.Common.Helper; using Tiobon.Core.Common; using static Tiobon.Core.Model.Consts; +using Newtonsoft.Json.Linq; +using NPOI.Util.Collections; namespace Tiobon.Core.Services; @@ -190,4 +192,138 @@ public class Ghre_RequestServices : BaseServices> QueryGroup(QueryBody filter, string type) + { + if (string.IsNullOrWhiteSpace(filter.orderBy)) + filter.orderBy = "DeptName ASC"; + + if (filter.pageSize == 0) + filter.pageSize = 10000; + string conditions = "WHERE 1=1 "; + + foreach (JProperty jProperty in filter.jsonParam.Properties()) + { + var name = jProperty.Name; + var value = jProperty.Value.ToString(); + if (name == "page" || name == "pageSize") + continue; + if (name == "YearMonth") + { + if (value != null) + { + var jsonParam = JsonHelper.JsonToObj(value); + var ids1 = JsonHelper.JsonToObj>(jsonParam.columnValue.ToString()); + + conditions += $" AND {name}>= '{ids1[0]}-01'"; + conditions += $" AND {name}<= '{ids1[1]}-01'"; + } + continue; + } + if (name == "Year") + { + if (value != null) + { + var jsonParam = JsonHelper.JsonToObj(value); + var ids1 = JsonHelper.JsonToObj>(jsonParam.columnValue.ToString()); + + conditions += $" AND {name}>= '{ids1[0]}'"; + conditions += $" AND {name}<= '{ids1[1]}'"; + } + continue; + } + if (!string.IsNullOrWhiteSpace(value)) + conditions = DealConditions(conditions, name, value); + } + + string sql = @$"SELECT * + FROM (SELECT sum (RequestNum) RequestNum, + sum (TotalBudget) TotalBudget, + CourseName, + YearMonth1 YearMonthLabel, + DeptName, + TrainClass, + TrainLevel, + InOrOut + FROM (SELECT A.Id, + A.CourseName, + SUBSTRING (A.YearMonth, 1, 4) + '年' YearMonth1, + -- CAST (A.YearMonth + '-01' AS DATE) YearMonthDate, + CONVERT (INT, SUBSTRING (A.YearMonth, 1, 4)) Year, + ISNULL (B.DeptName, D.DeptName) DeptName, + ISNULL (B.DeptId, D.DeptId) DeptId, + ISNULL (A.RequestNum, 1) RequestNum, + A.TrainClass, + A.CourseSource, + A.RequestSource, + TrainLevel, + A.InOrOut, + ISNULL (A.TotalBudget, 0) TotalBudget + FROM Ghre_Request A + LEFT JOIN Ghro_Dept B ON A.DeptId = B.DeptID + LEFT JOIN Ghra_Staff C ON A.ApplicantId = C.StaffID + LEFT JOIN Ghro_Dept D ON C.DeptID = D.DeptID + WHERE A.IsEnable = 1) A {conditions} + GROUP BY CourseName, + YearMonth1, + DeptName, + TrainClass, + TrainLevel, + InOrOut) A + ORDER BY {filter.orderBy}"; + + if (type == "Month") + sql = @$"SELECT * + FROM (SELECT sum (RequestNum) RequestNum, + sum (TotalBudget) TotalBudget, + CourseName, + YearMonth1 YearMonthLabel, + DeptName, + TrainClass, + TrainLevel, + InOrOut + FROM (SELECT A.Id, + A.CourseName, + SUBSTRING (A.YearMonth, 1, 4) + + '年' + + SUBSTRING (A.YearMonth, 6, 2) + + '月' YearMonth1, + CAST (A.YearMonth + '-01' AS DATE) YearMonth, + ISNULL (B.DeptName, D.DeptName) DeptName, + ISNULL (B.DeptId, D.DeptId) DeptId, + ISNULL (A.RequestNum, 1) RequestNum, + A.TrainClass, A.CourseSource, + + TrainLevel, + A.RequestSource, + A.InOrOut, + ISNULL (A.TotalBudget, 0) TotalBudget + FROM Ghre_Request A + LEFT JOIN Ghro_Dept B ON A.DeptId = B.DeptID + LEFT JOIN Ghra_Staff C ON A.ApplicantId = C.StaffID + LEFT JOIN Ghro_Dept D ON C.DeptID = D.DeptID + WHERE A.IsEnable = 1) A {conditions} + GROUP BY CourseName, + YearMonth1, + DeptName, + TrainClass, + TrainLevel, + InOrOut) A + ORDER BY {filter.orderBy}"; + var result = await Db.Ado.SqlQueryAsync(sql); + + result.ForEach(async x => + { + x.TrainClassLabel = await GetParaLabel("TrainingRequestTrainClass", x.TrainClass); + x.TrainLevelLabel = await GetParaLabel("TrainingRequestTrainLevel", x.TrainLevel); + x.InOrOutLabel = await GetParaLabel("CourseInOrOut", x.InOrOut); + x.TeacherClassLabel = await GetParaLabel("TrainingTeacherType", x.InOrOut); + + }); + //return ServiceResult>.OprateSuccess("查询成功", result); + return new ServicePageResult(filter.pageNum, result.Count, filter.pageSize, result); + + + } + } \ No newline at end of file diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 1175a9dd..fa0305eb 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -1166,7 +1166,8 @@ WHERE A.Id = '{id}'"; TeacherEName = course.TeacherEName, TeacherPhotoUrl = course.TeacherPhotoUrl, DeptOrSchoolName = course.DeptOrSchoolName, - TeacherRemarkSz = course.TeacherRemarkSz + TeacherRemarkSz = course.TeacherRemarkSz, + CourseName = course.CourseName } ];