From e8eba7a97589f61560ea07669d67eb94516ac9fd Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Mon, 5 Aug 2024 17:11:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 435 +++++++++--------- Tiobon.Core.Api/Tiobon.Core.Model.xml | 10 + .../Base/Ghre/Ghre_CreditPoint.Dto.Base.cs | 5 + .../Models/Ghre/Ghre_CreditPoint.cs | 5 + .../Ghre/Ghre_ExamRecordServices.cs | 56 ++- Tiobon.Core/Tiobon.Core.Model.xml | 10 + 6 files changed, 306 insertions(+), 215 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 40c0f92d..e787ae1a 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -120218,7 +120218,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_CreditPoint 1721036579 Administrator -1721036911 +1722846926 Administrator 学分记录 @@ -120390,6 +120390,17 @@ LABL 0 Arial Unicode MS,8,N bigint +19E19D3F-6D84-4879-AAE8-67FE88BA46F5 +考试ID +ExamId +1722846887 +Administrator +1722846926 +Administrator +试卷ID +bigint + + BCB46406-51A1-4483-8518-0287F70CCADD 获得日期 Date @@ -120400,7 +120411,7 @@ LABL 0 Arial Unicode MS,8,N 获得日期 datetime - + 4C409552-962C-41B2-89F9-BEAE81BCD599 获得学分 CreditPoints @@ -120411,7 +120422,7 @@ LABL 0 Arial Unicode MS,8,N 获得学分 int - + AD0571FD-2B1E-4904-A50C-D31B9048E605 备注 RemarkSz @@ -120426,7 +120437,7 @@ LABL 0 Arial Unicode MS,8,N - + F8618A06-F8BE-4F38-AEBA-16354D8E2965 默认标志 IsDefault @@ -120441,7 +120452,7 @@ LABL 0 Arial Unicode MS,8,N - + D8C9B388-E4A8-4238-B1E6-1123562C2E52 删除标志 IsEnable @@ -120456,7 +120467,7 @@ LABL 0 Arial Unicode MS,8,N - + 2AB84A17-6A70-412F-A039-B358EC02F73C 预留字段1 Reverse1 @@ -120468,7 +120479,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 5E174EBD-8179-423A-8635-135CFE32DBD8 预留字段2 Reverse2 @@ -120480,7 +120491,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + BDFC6CC3-1961-4DD9-8831-0100F96012FA 预留字段3 Reverse3 @@ -120492,7 +120503,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 82A2EE6F-0ABB-443B-B19A-DF698D3059E6 预留字段4 Reverse4 @@ -120504,7 +120515,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3F262ED5-0B60-4E84-A082-30B8C0D11804 预留字段5 Reverse5 @@ -120516,7 +120527,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4C19F768-BC38-4DB1-95FE-A91FADC33E94 预留字段6 Reverse6 @@ -120528,7 +120539,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + C38AE6E3-5E73-4D38-8B0E-458AF13318A4 预留字段7 Reverse7 @@ -120540,7 +120551,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 6E4597F1-CC80-46A1-8C33-BFA961059D50 预留字段8 Reverse8 @@ -120552,7 +120563,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 03DBDADB-1656-42E3-99D9-18F072A408F0 预留字段9 Reverse9 @@ -120564,7 +120575,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + D52A9DD3-2CD7-4D4F-962F-83E1B8B50FF6 预留字段10 Reverse10 @@ -120576,7 +120587,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 35F0B2FC-591B-41A9-9FC8-A91CF502A61D 预留字段I1 ReverseI1 @@ -120588,7 +120599,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + D86F4790-2DAD-4A1A-8E8C-BA516A21B9A1 预留字段I2 ReverseI2 @@ -120602,7 +120613,7 @@ LABL 0 Arial Unicode MS,8,N - + 3BE0949D-16CB-473A-A62D-3A3DC1CC8E07 Key_1 Key_1 @@ -120616,10 +120627,10 @@ LABL 0 Arial Unicode MS,8,N - + - + @@ -120632,7 +120643,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则 - + 236DA490-0EF0-4C65-B950-7F8721F79307 Id Id @@ -120647,7 +120658,7 @@ LABL 0 Arial Unicode MS,8,N - + 7845CC23-BA7A-4E37-BF56-EB367B328E0C 创建人 CreateBy @@ -120661,7 +120672,7 @@ LABL 0 Arial Unicode MS,8,N - + 86211BC8-C753-4A17-9892-04BE9CC2DB64 创建时间 CreateTime @@ -120675,7 +120686,7 @@ LABL 0 Arial Unicode MS,8,N - + 7C784988-A6CC-4291-926B-B428042BE4A3 创建程序 CreateProg @@ -120687,7 +120698,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + D5E9D8A7-6543-451A-B050-1B267D11017A 创建人IP CreateIP @@ -120699,7 +120710,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 2227CDED-DEBC-485F-B7FA-C72FFCA985D2 修改人 UpdateBy @@ -120713,7 +120724,7 @@ LABL 0 Arial Unicode MS,8,N - + 22E847CF-3747-4A56-A6CA-B36D05A73770 修改时间 UpdateTime @@ -120727,7 +120738,7 @@ LABL 0 Arial Unicode MS,8,N - + AC80EED0-B3C9-43B8-B133-DDC3B6A53A47 修改程序 UpdateProg @@ -120739,7 +120750,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 81989CA0-C735-4746-B141-4406D5874BCC 修改人IP UpdateIP @@ -120751,7 +120762,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 35A85CAB-153D-44DC-87D6-691CF6E9B97D 操作日志ID OperateLogID @@ -120766,7 +120777,7 @@ LABL 0 Arial Unicode MS,8,N - + 290D824C-197C-437A-BC2F-9581228A3999 规则类型 RuleType @@ -120778,7 +120789,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 797A373B-E17A-4336-8DD5-E5EF22554B3E 培训种类 TrainType @@ -120790,7 +120801,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 009416B1-ABEA-4468-8655-DFBE44FE2F24 课程ID CourseId @@ -120801,7 +120812,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 5E41173F-F2F8-4A9A-972B-9DDA04C1DAFC 课程场景ID CourseSceneId @@ -120812,7 +120823,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + DCEBF3EF-EBA8-4B7F-8225-E14DBBCFFC7B 厂区 ZoneId @@ -120823,7 +120834,7 @@ LABL 0 Arial Unicode MS,8,N 厂区 int - + DF4CA9F0-D489-47D9-BC2F-15A2CA61024B 部门 DeptId @@ -120834,7 +120845,7 @@ LABL 0 Arial Unicode MS,8,N 部门 int - + 11CD542D-061E-4B85-A96B-7A0543F3C4AE 职称 TitleId @@ -120845,7 +120856,7 @@ LABL 0 Arial Unicode MS,8,N 职称 int - + AE698472-4094-467D-96DC-5B3579FBFAB9 职等 GradeId @@ -120856,7 +120867,7 @@ LABL 0 Arial Unicode MS,8,N 职等 int - + AF5F0E34-DA3F-4286-A4EC-88F51CDA9EF5 岗位 JobId @@ -120867,7 +120878,7 @@ LABL 0 Arial Unicode MS,8,N 岗位 int - + 8F74C8FF-6DCB-4BE1-B049-0BDD3D5D8FC9 年度 Year @@ -120879,7 +120890,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + FA2DBC72-8C81-4DE1-B906-376DCDE8A2F9 完成期限 DeadlineMonth @@ -120890,7 +120901,7 @@ LABL 0 Arial Unicode MS,8,N 完成期限 int - + 67DC0C25-BDB7-4E86-AD1A-DBAC953CBE1D 备注 RemarkSz @@ -120905,7 +120916,7 @@ LABL 0 Arial Unicode MS,8,N - + 49D9AB19-3FB3-467A-9E98-18487BC09CE6 结果 Result @@ -120917,7 +120928,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(256) 256 - + 2D5BA3A4-EFBB-4770-AFD6-9B40D4C4F2B6 默认标志 IsDefault @@ -120932,7 +120943,7 @@ LABL 0 Arial Unicode MS,8,N - + 367902A9-EE5A-450C-8157-BE34BB2BD3B4 删除标志 IsEnable @@ -120947,7 +120958,7 @@ LABL 0 Arial Unicode MS,8,N - + CFBFA0E2-D80B-48FE-AE5A-BD7B661D21F6 预留字段1 Reverse1 @@ -120959,7 +120970,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 811A60A5-B9EA-441E-BB3D-D04B9D14154D 预留字段2 Reverse2 @@ -120971,7 +120982,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D223FC7-D860-43E9-9109-B69B141DF255 预留字段3 Reverse3 @@ -120983,7 +120994,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 841830F3-83F5-4A89-AB54-AC9C20B5A748 预留字段4 Reverse4 @@ -120995,7 +121006,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0D881F32-B7B0-4979-BB1B-F78B96F60FB5 预留字段5 Reverse5 @@ -121007,7 +121018,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AB281A43-9014-4DEC-ACFC-1694D7E08CAB 预留字段6 Reverse6 @@ -121019,7 +121030,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 43B74A75-DB24-4B7D-9653-A2B6A7ED01E1 预留字段7 Reverse7 @@ -121031,7 +121042,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B50A76AE-CE1C-40AF-9D71-25D03B3DFC85 预留字段8 Reverse8 @@ -121043,7 +121054,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 94EE4260-04D6-4A70-8FF1-113D921A921E 预留字段9 Reverse9 @@ -121055,7 +121066,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9F273A96-2C2F-44C2-BE9F-9CA706457DE0 预留字段10 Reverse10 @@ -121067,7 +121078,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 324CDD0F-14BF-40B4-8B54-0835EF2673B7 预留字段I1 ReverseI1 @@ -121079,7 +121090,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 9B85210E-4450-43BE-9F3E-89C9BAE32C7B 预留字段I2 ReverseI2 @@ -121093,7 +121104,7 @@ LABL 0 Arial Unicode MS,8,N - + 02F1F0EA-B9DC-4243-9765-FB0FB60A73B4 Key_1 Key_1 @@ -121102,15 +121113,15 @@ LABL 0 Arial Unicode MS,8,N 1722318936 Administrator - + - + - + @@ -121123,7 +121134,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训证书规则 - + 74B0AAD1-B9E2-4EDC-8F94-267A7290CFD7 Id Id @@ -121138,7 +121149,7 @@ LABL 0 Arial Unicode MS,8,N - + 101FABA8-1B4B-4152-9CC6-F9CDBB84036C 创建人 CreateBy @@ -121152,7 +121163,7 @@ LABL 0 Arial Unicode MS,8,N - + 778A7CF1-CE3C-4D0F-8C1D-4E4DCF460E79 创建时间 CreateTime @@ -121166,7 +121177,7 @@ LABL 0 Arial Unicode MS,8,N - + ABA61C97-6ECC-4EAE-A3A5-1F3CD06AF937 创建程序 CreateProg @@ -121178,7 +121189,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4B9162AD-E539-4D88-9033-1A14B95F4BC1 创建人IP CreateIP @@ -121190,7 +121201,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 832CE7C6-2F51-4792-88F8-09CA93BC9EE3 修改人 UpdateBy @@ -121204,7 +121215,7 @@ LABL 0 Arial Unicode MS,8,N - + 38F733AB-C497-4FA9-B06B-9B5C01567232 修改时间 UpdateTime @@ -121218,7 +121229,7 @@ LABL 0 Arial Unicode MS,8,N - + E517BC43-EDAB-4FD0-9AFD-27871946D7A4 修改程序 UpdateProg @@ -121230,7 +121241,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + AC751D23-BE2F-407B-B57B-43179C6A1DD2 修改人IP UpdateIP @@ -121242,7 +121253,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 91C6434C-8BB0-40EE-85F8-097E7850AA81 操作日志ID OperateLogID @@ -121257,7 +121268,7 @@ LABL 0 Arial Unicode MS,8,N - + 5FF54614-5C5C-4F71-8467-0372DD3761F0 规则类型 RuleType @@ -121269,7 +121280,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + B0C05A48-302C-4CE6-8BA1-A0C44BD0303E 规则编号 RuleNo @@ -121281,7 +121292,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 150DA0CC-7A81-4020-8C50-6C77A1CBB47C 证书名称 CertificateName @@ -121293,7 +121304,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + CB9DAAC2-2757-4594-B1CD-0443C4CA61AE 课程场景ID CourseSceneId @@ -121304,7 +121315,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + D5BFD533-C0CB-40EF-B419-C76CFA5B2472 课程ID CourseId @@ -121315,7 +121326,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 63D22867-D35B-48C8-8315-96999A56F14F 有效期类型 ValidityType @@ -121327,7 +121338,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AA8964B1-9490-4BA5-8BA4-4C1E4260BAEC 固定数 StaticNum @@ -121338,7 +121349,7 @@ LABL 0 Arial Unicode MS,8,N 固定数 int - + 70867D03-D648-4D1C-9617-7F20505B1FF0 固定类型 StaticType @@ -121350,7 +121361,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 419FB467-143A-4B5A-9DEA-1C321943D83F 有效期 ValidityTime @@ -121361,7 +121372,7 @@ LABL 0 Arial Unicode MS,8,N 有效期 datetime - + 408CA59F-CABC-49BA-B094-D1DDB66652AE 发放规则 SendRule @@ -121373,7 +121384,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 0DCFC327-8D5A-40B3-813D-42A7753DBC3D 分数 ScoreMin @@ -121384,7 +121395,7 @@ LABL 0 Arial Unicode MS,8,N 分数 int - + 343AC157-AD4F-4382-BC76-BC9EA0317D8D 分数1 ScoreMax @@ -121395,7 +121406,7 @@ LABL 0 Arial Unicode MS,8,N 分数1 int - + 8C3CC76E-55C9-4B86-9744-22EAA8105E9B 备注 RemarkSz @@ -121410,7 +121421,7 @@ LABL 0 Arial Unicode MS,8,N - + 5748058F-BCCD-49C0-9012-3D7E96B6D69A 默认标志 IsDefault @@ -121425,7 +121436,7 @@ LABL 0 Arial Unicode MS,8,N - + 2589055F-505E-441A-9696-9964A7A4A008 删除标志 IsEnable @@ -121440,7 +121451,7 @@ LABL 0 Arial Unicode MS,8,N - + D20B915C-FCA1-494B-A8A2-B2FF85468C64 预留字段1 Reverse1 @@ -121452,7 +121463,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 1B4FABC6-E541-4068-ACFB-BC9078682988 预留字段2 Reverse2 @@ -121464,7 +121475,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6310193-4CEE-4148-BE8B-3C11D8F4322D 预留字段3 Reverse3 @@ -121476,7 +121487,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9FE04BB6-928C-4531-9DDD-0FDBC30BB174 预留字段4 Reverse4 @@ -121488,7 +121499,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + D97789F8-ED46-447A-AD69-0776DE2FABCD 预留字段5 Reverse5 @@ -121500,7 +121511,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AEDD3137-4121-440A-9A7E-B6F299000B70 预留字段6 Reverse6 @@ -121512,7 +121523,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4FCFEEF7-1047-46A9-916C-FA8C1AA3F795 预留字段7 Reverse7 @@ -121524,7 +121535,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 323C988B-20C0-43EC-ADAE-0FF35D6DFA4A 预留字段8 Reverse8 @@ -121536,7 +121547,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 69763777-A397-4C79-B48F-02E75CD145FF 预留字段9 Reverse9 @@ -121548,7 +121559,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6FBA743-4C50-4218-8E94-29BFBEEB0F26 预留字段10 Reverse10 @@ -121560,7 +121571,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + FCCD8A45-2561-4DD5-A9E9-348C2FD700BC 预留字段I1 ReverseI1 @@ -121572,7 +121583,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 4EF2055B-A955-44E6-A36E-C6441D831DD6 预留字段I2 ReverseI2 @@ -121586,7 +121597,7 @@ LABL 0 Arial Unicode MS,8,N - + 9A140C59-A38D-4A71-9AAB-F1F0C0F7E66B Key_1 Key_1 @@ -121595,15 +121606,15 @@ LABL 0 Arial Unicode MS,8,N 1721280148 Administrator - + - + - + @@ -121616,7 +121627,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则人员 - + 8DBABE84-0D95-4963-B5DF-D877A206762B Id Id @@ -121631,7 +121642,7 @@ LABL 0 Arial Unicode MS,8,N - + 48A72633-A433-493B-9FCF-BD126E84A4AF 创建人 CreateBy @@ -121645,7 +121656,7 @@ LABL 0 Arial Unicode MS,8,N - + CBF754F2-F6C8-4BF8-BBFD-F479FF0BE68F 创建时间 CreateTime @@ -121659,7 +121670,7 @@ LABL 0 Arial Unicode MS,8,N - + C8F58FBE-8633-4F75-BD8E-3E04F33B8863 创建程序 CreateProg @@ -121671,7 +121682,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4D66366A-5007-40A1-962C-BF3D01F8C361 创建人IP CreateIP @@ -121683,7 +121694,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 64AFEE52-E383-4E01-B6FB-92E27CA8DFF4 修改人 UpdateBy @@ -121697,7 +121708,7 @@ LABL 0 Arial Unicode MS,8,N - + DDDCCDAF-B043-44AA-BBDF-01D692B67095 修改时间 UpdateTime @@ -121711,7 +121722,7 @@ LABL 0 Arial Unicode MS,8,N - + 974D9E72-CDB6-4CEF-8D2D-4D4B26993235 修改程序 UpdateProg @@ -121723,7 +121734,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 21CCFED9-583C-4B5A-8370-170748173C49 修改人IP UpdateIP @@ -121735,7 +121746,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + A5BF1114-3882-4699-83F8-3B0F5C2FA382 操作日志ID OperateLogID @@ -121750,7 +121761,7 @@ LABL 0 Arial Unicode MS,8,N - + EEFF42B2-E137-4D20-B315-59446F45D0CA 必选修规则ID StudyRuleId @@ -121761,7 +121772,7 @@ LABL 0 Arial Unicode MS,8,N 必选修规则ID bigint - + DE5726E5-8EF1-4BB4-AB0C-735D098B2A57 人员 StaffId @@ -121772,7 +121783,7 @@ LABL 0 Arial Unicode MS,8,N 人员 bigint - + BEF0B3E2-5C5F-4A6E-A696-23BE258E5967 员工姓名 StaffName @@ -121787,7 +121798,7 @@ LABL 0 Arial Unicode MS,8,N - + E04C7821-5C70-4181-A47A-CB6781A4EA94 备注 RemarkSz @@ -121802,7 +121813,7 @@ LABL 0 Arial Unicode MS,8,N - + E963DF7D-5FF1-46E5-BFD1-C77FBC755D50 默认标志 IsDefault @@ -121817,7 +121828,7 @@ LABL 0 Arial Unicode MS,8,N - + 8EC54578-BC99-4FA2-AA3E-49C78AD49294 删除标志 IsEnable @@ -121832,7 +121843,7 @@ LABL 0 Arial Unicode MS,8,N - + 20F23FED-B864-48D9-A5F2-62530E6B6B6D 预留字段1 Reverse1 @@ -121844,7 +121855,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D83EE02-C7B8-4454-9961-5D4317D0393D 预留字段2 Reverse2 @@ -121856,7 +121867,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 35840EFC-0D77-4B15-8DCA-C163FC95D7F0 预留字段3 Reverse3 @@ -121868,7 +121879,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 58515022-4E1B-4716-BCE9-0452E0DF1EC1 预留字段4 Reverse4 @@ -121880,7 +121891,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 23D6B0F2-E0BB-48E1-B6C7-02CD99506ECF 预留字段5 Reverse5 @@ -121892,7 +121903,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2387FA8F-20B2-4370-B3CB-D4B3DEC74BF4 预留字段6 Reverse6 @@ -121904,7 +121915,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 73BE3393-7BFC-4ED3-9421-1B079B700C59 预留字段7 Reverse7 @@ -121916,7 +121927,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3382A8F6-1F0B-45ED-9048-D60BD40A3ACA 预留字段8 Reverse8 @@ -121928,7 +121939,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2D7C8BCC-C8A9-42B2-AA94-02AC70668E77 预留字段9 Reverse9 @@ -121940,7 +121951,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E1095425-D8C3-47FD-AE78-6FC3AF87EE98 预留字段10 Reverse10 @@ -121952,7 +121963,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3D1EA6FC-A74C-45BB-9AEA-A60F4584D106 预留字段I1 ReverseI1 @@ -121964,7 +121975,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + EACF32DF-891A-4372-9E13-9A98AE126EED 预留字段I2 ReverseI2 @@ -121978,7 +121989,7 @@ LABL 0 Arial Unicode MS,8,N - + 2A211835-FB66-43E3-AA9F-BF663C744603 Key_1 Key_1 @@ -121987,15 +121998,15 @@ LABL 0 Arial Unicode MS,8,N 1721372451 Administrator - + - + - + @@ -122008,7 +122019,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则结果 - + 01A907E6-5537-47B2-ABC9-6CFA5A647507 Id Id @@ -122023,7 +122034,7 @@ LABL 0 Arial Unicode MS,8,N - + 5E71B65A-2A07-4484-AF90-87A9C052326B 创建人 CreateBy @@ -122037,7 +122048,7 @@ LABL 0 Arial Unicode MS,8,N - + 4521BD68-D481-4D53-935A-09261F02C9A2 创建时间 CreateTime @@ -122051,7 +122062,7 @@ LABL 0 Arial Unicode MS,8,N - + 9FB3C544-01C4-4652-8E4C-403EB0A1760F 创建程序 CreateProg @@ -122063,7 +122074,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + CAA25DB6-48FC-429A-903F-FA58582217A6 创建人IP CreateIP @@ -122075,7 +122086,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 16A6E494-7B80-4DA6-A7C6-E29ACE72551B 修改人 UpdateBy @@ -122089,7 +122100,7 @@ LABL 0 Arial Unicode MS,8,N - + 548FE2AC-0350-4070-A988-C902ED4FA468 修改时间 UpdateTime @@ -122103,7 +122114,7 @@ LABL 0 Arial Unicode MS,8,N - + 39495E88-C800-47D9-B935-A225C1666DE8 修改程序 UpdateProg @@ -122115,7 +122126,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 8EFD95E4-C07A-4EEB-B87C-34CB110FC739 修改人IP UpdateIP @@ -122127,7 +122138,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 8C10977C-3918-4721-B062-7D93B080EDB6 操作日志ID OperateLogID @@ -122142,7 +122153,7 @@ LABL 0 Arial Unicode MS,8,N - + 1DB2330D-A062-40AE-B906-8952214ADE0B 必选修规则ID StudyRuleId @@ -122153,7 +122164,7 @@ LABL 0 Arial Unicode MS,8,N 必选修规则ID bigint - + AE66BBDE-61E2-4632-9F6A-5A4D9CF8120B 人员ID StaffId @@ -122164,7 +122175,7 @@ LABL 0 Arial Unicode MS,8,N 人员ID INT - + C9FA34E7-332C-4E6B-A64E-E4DD2F23AFD0 工号 StaffNo @@ -122179,7 +122190,7 @@ LABL 0 Arial Unicode MS,8,N - + B15E23D0-4F7B-4C44-91C3-6B9D03F7B3A5 员工姓名 StaffName @@ -122194,7 +122205,7 @@ LABL 0 Arial Unicode MS,8,N - + E9317953-9D17-4B5E-9AB5-FCD7B0E3C2ED 状态 Status @@ -122206,7 +122217,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + DEFC1296-F202-46CB-AE27-01C603090F44 备注 RemarkSz @@ -122221,7 +122232,7 @@ LABL 0 Arial Unicode MS,8,N - + 2E05DAB7-49D3-4778-83D4-6A113DC23457 默认标志 IsDefault @@ -122236,7 +122247,7 @@ LABL 0 Arial Unicode MS,8,N - + CC1468AE-9433-418C-BFFC-39F0C1E517FE 删除标志 IsEnable @@ -122251,7 +122262,7 @@ LABL 0 Arial Unicode MS,8,N - + 2F10D326-1C57-42B1-9DFD-3C4904ACCD80 预留字段1 Reverse1 @@ -122263,7 +122274,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 37878AC3-D2D2-4E10-BFFF-30FB2BD580C4 预留字段2 Reverse2 @@ -122275,7 +122286,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8B7EB0D8-53C4-40D6-B7AA-0C3B18C6D897 预留字段3 Reverse3 @@ -122287,7 +122298,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E9A0CFAE-2187-4CBE-8D74-091DBB1DFA14 预留字段4 Reverse4 @@ -122299,7 +122310,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 76F48910-F9D0-4E4A-825C-7F36880FE07B 预留字段5 Reverse5 @@ -122311,7 +122322,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 71C75EE7-93FE-416F-968F-5CE4F9D93C4C 预留字段6 Reverse6 @@ -122323,7 +122334,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0EACD58B-2142-4212-927A-6B2B71CDD091 预留字段7 Reverse7 @@ -122335,7 +122346,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 17AC2768-F90F-45D0-8876-B831C78F1E38 预留字段8 Reverse8 @@ -122347,7 +122358,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F924F9B7-7CC3-46E9-AE59-2AE12EA72F82 预留字段9 Reverse9 @@ -122359,7 +122370,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + BD8F0293-5749-4E81-88D8-E77650FCE222 预留字段10 Reverse10 @@ -122371,7 +122382,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 67AFD063-C430-4A74-9E90-3CC97CFBBFAC 预留字段I1 ReverseI1 @@ -122383,7 +122394,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + FD09DC2C-989C-4E42-90E2-777878BC2559 预留字段I2 ReverseI2 @@ -122397,7 +122408,7 @@ LABL 0 Arial Unicode MS,8,N - + 2A634DE7-F87B-42B4-B9E9-3B6AC488C700 Key_1 Key_1 @@ -122406,15 +122417,15 @@ LABL 0 Arial Unicode MS,8,N 1722318737 Administrator - + - + - + @@ -122438,7 +122449,7 @@ LABL 0 Arial Unicode MS,8,N - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -122472,7 +122483,7 @@ LABL 0 Arial Unicode MS,8,N - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -122506,7 +122517,7 @@ LABL 0 Arial Unicode MS,8,N - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -122540,7 +122551,7 @@ LABL 0 Arial Unicode MS,8,N - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -122574,7 +122585,7 @@ LABL 0 Arial Unicode MS,8,N - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -122608,7 +122619,7 @@ LABL 0 Arial Unicode MS,8,N - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -122642,7 +122653,7 @@ LABL 0 Arial Unicode MS,8,N - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -122676,7 +122687,7 @@ LABL 0 Arial Unicode MS,8,N - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -122710,7 +122721,7 @@ LABL 0 Arial Unicode MS,8,N - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -122744,7 +122755,7 @@ LABL 0 Arial Unicode MS,8,N - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -122778,7 +122789,7 @@ LABL 0 Arial Unicode MS,8,N - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -122812,7 +122823,7 @@ LABL 0 Arial Unicode MS,8,N - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -122846,7 +122857,7 @@ LABL 0 Arial Unicode MS,8,N - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -122880,7 +122891,7 @@ LABL 0 Arial Unicode MS,8,N - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -122914,7 +122925,7 @@ LABL 0 Arial Unicode MS,8,N - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -122945,17 +122956,17 @@ LABL 0 Arial Unicode MS,8,N - + - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator 1721372697 Administrator - + @@ -122982,7 +122993,7 @@ LABL 0 Arial Unicode MS,8,N - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -122992,7 +123003,7 @@ LABL 0 Arial Unicode MS,8,N - + @@ -123013,20 +123024,20 @@ LABL 0 Arial Unicode MS,8,N - + - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator 1721372642 Administrator - + - + @@ -123047,20 +123058,20 @@ LABL 0 Arial Unicode MS,8,N - + - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator 1722318936 Administrator - + - + @@ -123072,7 +123083,7 @@ LABL 0 Arial Unicode MS,8,N - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -123085,7 +123096,7 @@ LABL 0 Arial Unicode MS,8,N - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -123093,12 +123104,12 @@ LABL 0 Arial Unicode MS,8,N 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -123110,7 +123121,7 @@ LABL 0 Arial Unicode MS,8,N - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -123120,7 +123131,7 @@ LABL 0 Arial Unicode MS,8,N ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -123130,7 +123141,7 @@ LABL 0 Arial Unicode MS,8,N Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -123198,7 +123209,7 @@ LABL 0 Arial Unicode MS,8,N varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -123209,7 +123220,7 @@ LABL 0 Arial Unicode MS,8,N varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -123231,7 +123242,7 @@ LABL 0 Arial Unicode MS,8,N varchar(2000) 2000 - + @@ -123309,7 +123320,7 @@ LABL 0 Arial Unicode MS,8,N varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -123332,7 +123343,7 @@ LABL 0 Arial Unicode MS,8,N - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -123341,13 +123352,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 a204a391..84ebd9ec 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -2160,6 +2160,11 @@ 课程快照ID + + + 考试ID + + 获得日期 @@ -7931,6 +7936,11 @@ 课程快照ID + + + 考试ID + + 获得日期 diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs index 04cca03c..df354488 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_CreditPoint.Dto.Base.cs @@ -41,6 +41,11 @@ namespace Tiobon.Core.Model.Models /// public long? CourseSnapId { get; set; } + /// + /// 考试ID + /// + public long? ExamId { get; set; } + /// /// 获得日期 /// diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs index 07a6f150..45f80e52 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_CreditPoint.cs @@ -43,6 +43,11 @@ namespace Tiobon.Core.Model.Models /// public long? CourseSnapId { get; set; } + /// + /// 考试ID + /// + public long? ExamId { get; set; } + /// /// 获得日期 /// diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs index d0435226..ca5694a1 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamRecordServices.cs @@ -436,6 +436,11 @@ public class Ghre_ExamRecordServices : BaseServices= dt.Date)) + return ServiceResult.OprateFailed("考试已结束!"); + + var details = await Db.Queryable().Where(x => x.ExamRecordId == record.Id).ToListAsync(); var detailIds = details.Select(x => x.Id).ToList(); var recordAnswers = await Db.Queryable() @@ -631,7 +636,7 @@ public class Ghre_ExamRecordServices : BaseServices() { - "Status","RetakeTimes" + "Status","RetakeTimes","ScoreStatus" }); return ServiceResult.OprateSuccess("成功!"); @@ -677,7 +683,7 @@ public class Ghre_ExamRecordServices : BaseServices= dt)) return ServiceResult.OprateFailed("考试已结束!"); @@ -813,6 +819,50 @@ public class Ghre_ExamRecordServices : BaseServices { "Status", "Score", "ActualEndTime", "ScoreStatus" }, null, $"Id='{record.Id}'"); + + await Task.Factory.StartNew(async () => await DealPass(Db, studyRecordId)); + return ServiceResult.OprateSuccess("提交成功!"); } + + public async Task DealPass(ISqlSugarClient Db, long studyRecordId) + { + + var record = await Db.Queryable().FirstAsync(x => x.Id == studyRecordId); + + var studyRecord = await Db.Queryable().FirstAsync(x => x.Id == record.StudyRecordId); + var examPaper = await Db.Queryable().FirstAsync(x => x.Id == record.ExamPaperId); + record.IsPass = examPaper.PassScore > (record.Score + record.AdjustScore) ? false : true; + + await Db.Updateable(record).UpdateColumns(it => new { it.IsPass }, true)//true表示追加AOP赋值列 + .ExecuteCommandAsync(); + + if (record.IsPass == true) + { + if (studyRecord.CourseSceneId.IsNull() && !await Db.Queryable().AnyAsync(x => x.ExamId == studyRecord.ExamId)) + { + var course = await Db.Queryable().FirstAsync(x => x.Id == studyRecord.CourseId); + #region 学分发放 + var creditPoint = new Ghre_CreditPoint() + { + CourseId = studyRecord.CourseId, + CourseSnapId = studyRecord.CourseSnapId, + StaffId = studyRecord.StaffId, + ExamId = studyRecord.ExamId, + Date = DateTime.Now.Date, + CreditPoints = course.CreditPoints + }; + + await Db.Insertable(creditPoint).ExecuteReturnSnowflakeIdListAsync(); + #endregion + + #region 证书发放 + + #endregion + } + + } + + return true; + } } \ No newline at end of file diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index a204a391..84ebd9ec 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -2160,6 +2160,11 @@ 课程快照ID + + + 考试ID + + 获得日期 @@ -7931,6 +7936,11 @@ 课程快照ID + + + 考试ID + + 获得日期