diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 72a8034c..85cb342b 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -119126,7 +119126,7 @@ LABL 0 Arial Unicode MS,8,N Ghre_StudyRecord 1721036281 Administrator -1721372697 +1721701758 Administrator 培训记录 @@ -119320,17 +119320,28 @@ LABL 0 Arial Unicode MS,8,N datetime -45EBF5C8-9967-4290-95C8-105DB6C23DCE -截止时间 -DeadlineTime -1721270064 +43191415-6C06-4272-9E3C-581AB93DA07B +课程开始时间 +CourseBeginTime +1721701709 Administrator -1721270092 +1721701758 Administrator -截止时间 +课程结束时间 datetime +69B90B41-711C-42FE-8BEA-4A382F27D032 +课程结束时间 +CourseEndTime +1721701709 +Administrator +1721701758 +Administrator +课程结束时间 +datetime + + 763FA809-561E-42CE-89A7-E131E9F75D21 开始时间 BeginTime @@ -119341,7 +119352,7 @@ LABL 0 Arial Unicode MS,8,N 开始时间 datetime - + 7FB786E1-DBCD-478C-BB1C-FBA8A2784290 结束时间 EndTime @@ -119352,7 +119363,7 @@ LABL 0 Arial Unicode MS,8,N 结束时间 datetime - + 5A5EAD9D-87F6-4728-8973-0A3CE036B73D 学习进度 StudyProgress @@ -119364,7 +119375,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + A3D60CB4-398C-4C17-AC0D-3A5D01053BD1 课程类型 CourseType @@ -119376,7 +119387,19 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + +8187AA06-752F-470D-B405-27E5AE83A009 +课程状态 +CourseStatus +1721701574 +Administrator +1721701655 +Administrator +课程状态 +nvarchar(32) +32 + + D06F7EB3-A751-4FB5-8011-5FB2ADD73774 备注 RemarkSz @@ -119391,7 +119414,7 @@ LABL 0 Arial Unicode MS,8,N - + 84834DDF-CCAB-4FAD-BFAA-9A70A115438F 默认标志 IsDefault @@ -119406,7 +119429,7 @@ LABL 0 Arial Unicode MS,8,N - + CA9B788F-250C-4F84-A378-D4964DE6B12D 删除标志 IsEnable @@ -119421,7 +119444,7 @@ LABL 0 Arial Unicode MS,8,N - + 287779C1-B4AE-43FF-AD01-0C94632EE862 预留字段1 Reverse1 @@ -119433,7 +119456,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 60865B87-381E-4BAC-8B98-DF92F3CEE751 预留字段2 Reverse2 @@ -119445,7 +119468,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + EF363669-084B-408C-8CE0-2F52736C9957 预留字段3 Reverse3 @@ -119457,7 +119480,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 7CFE9231-DA32-40FC-967E-DD71159B0F5B 预留字段4 Reverse4 @@ -119469,7 +119492,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2039BA97-1E2B-4B9A-92F7-1885A3ECC10D 预留字段5 Reverse5 @@ -119481,7 +119504,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + C1498D8A-8FB6-44E4-BE76-1AE8DFB63F17 预留字段6 Reverse6 @@ -119493,7 +119516,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8ABD1E63-2895-4791-9D53-056D74507A16 预留字段7 Reverse7 @@ -119505,7 +119528,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2DB56360-19EF-4EAA-8706-C8F2F76B11A1 预留字段8 Reverse8 @@ -119517,7 +119540,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 02AB686C-EB7A-4133-A741-975E26DB1EE3 预留字段9 Reverse9 @@ -119529,7 +119552,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 82891A7F-2938-451F-9CAA-8350F108E8FC 预留字段10 Reverse10 @@ -119541,7 +119564,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + CA073A33-F018-4D37-BAF3-76E3285876A9 预留字段I1 ReverseI1 @@ -119553,7 +119576,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 327304F6-EB7B-400E-BFCC-D635BDADE7C0 预留字段I2 ReverseI2 @@ -119567,7 +119590,7 @@ LABL 0 Arial Unicode MS,8,N - + A235A321-E78A-40EC-B803-ACA9385FE9BE Key_1 Key_1 @@ -119581,10 +119604,10 @@ LABL 0 Arial Unicode MS,8,N - + - + @@ -119597,7 +119620,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训记录 - + B24F0190-9813-42F7-AB7A-EE44909AFC18 Id Id @@ -119612,7 +119635,7 @@ LABL 0 Arial Unicode MS,8,N - + DD3C287F-E8D6-452E-951C-E318FDE14DC0 创建人 CreateBy @@ -119626,7 +119649,7 @@ LABL 0 Arial Unicode MS,8,N - + 376DE299-8308-40A0-A04D-43FD7C9DED2C 创建时间 CreateTime @@ -119640,7 +119663,7 @@ LABL 0 Arial Unicode MS,8,N - + 909D9A2D-FAB5-4AFD-95C0-16DC8A62E69D 创建程序 CreateProg @@ -119652,7 +119675,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 3BD8B248-233E-425C-AB0C-63814EADF8E9 创建人IP CreateIP @@ -119664,7 +119687,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 77820470-46AD-4EE4-B7A2-FEE8D4E8B8AA 修改人 UpdateBy @@ -119678,7 +119701,7 @@ LABL 0 Arial Unicode MS,8,N - + 4F75C5DC-BA50-4D4D-9DD9-4729DFA39FFD 修改时间 UpdateTime @@ -119692,7 +119715,7 @@ LABL 0 Arial Unicode MS,8,N - + 167CEE72-8211-4F9C-A76C-05EA1071F367 修改程序 UpdateProg @@ -119704,7 +119727,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + E630D53D-38E8-426E-B097-D2DFA4FC2184 修改人IP UpdateIP @@ -119716,7 +119739,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 0DAA688A-5803-4345-BB27-707BFA612B83 操作日志ID OperateLogID @@ -119731,7 +119754,7 @@ LABL 0 Arial Unicode MS,8,N - + D1FE9B06-DAC1-4034-98A2-D355A97307F8 培训证书规则ID CertificateRuleId @@ -119742,7 +119765,7 @@ LABL 0 Arial Unicode MS,8,N 培训证书规则ID bigint - + 1A7C3A9A-A497-4620-83FD-36E0D6CDBB98 员工ID StaffId @@ -119753,7 +119776,7 @@ LABL 0 Arial Unicode MS,8,N 员工ID int - + D0EF2B27-068E-430B-8400-513C4C97834C 课程快照ID CourseSnapId @@ -119764,7 +119787,7 @@ LABL 0 Arial Unicode MS,8,N 课程快照ID bigint - + 856317C8-AEF1-4CBE-9626-519B0311E2FE 课程ID CourseId @@ -119775,7 +119798,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 1C3AC4D7-82D8-44A6-AA99-5D8D896BB7AE 证书类型 CertificateType @@ -119787,7 +119810,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 0B1B5407-A962-4DA7-89B5-6959E8DAD9E9 证书Url CertificateUrl @@ -119799,7 +119822,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(128) 128 - + 319305AD-326A-432B-80C9-721506A79263 颁发日期 AwardDate @@ -119810,7 +119833,7 @@ LABL 0 Arial Unicode MS,8,N 颁发日期 datetime - + 4372395C-A313-4F29-AF3F-230EB7ADE95D 有效期 ValidityPeriod @@ -119822,7 +119845,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 4B5789B7-9B7E-48FE-BA82-D96F444445A1 有效期1 ValidityPeriodTime @@ -119833,7 +119856,7 @@ LABL 0 Arial Unicode MS,8,N 结束时间 datetime - + 43DB4157-0239-4F9B-AF01-1B5F35FF84AF 颁奖来源 AwardSource @@ -119845,7 +119868,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + A8E011FB-9D06-4737-B071-400C7DBE021F 备注 RemarkSz @@ -119860,7 +119883,7 @@ LABL 0 Arial Unicode MS,8,N - + BB895B8A-6556-4A69-B2A6-3CBB8A10917B 默认标志 IsDefault @@ -119875,7 +119898,7 @@ LABL 0 Arial Unicode MS,8,N - + A32DC3B1-8A4A-4731-9048-7C7D5BEAE18D 删除标志 IsEnable @@ -119890,7 +119913,7 @@ LABL 0 Arial Unicode MS,8,N - + BAA75F53-F765-4653-A54F-6CD3E01741A2 预留字段1 Reverse1 @@ -119902,7 +119925,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 5924E38A-E889-42F7-BE88-7A548D10E54D 预留字段2 Reverse2 @@ -119914,7 +119937,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8D8EBC2B-563A-40D1-9E24-F93E1F8722D1 预留字段3 Reverse3 @@ -119926,7 +119949,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8C8A268B-98C5-4E7B-B70A-3BC0011DE0E7 预留字段4 Reverse4 @@ -119938,7 +119961,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 575E4CBB-3CDC-48BD-A0D3-5A197E966040 预留字段5 Reverse5 @@ -119950,7 +119973,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 552E182E-6E51-45E7-88E9-A346E3878C1C 预留字段6 Reverse6 @@ -119962,7 +119985,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + EA79E16F-B832-49DA-A29A-7A7E6A3B5253 预留字段7 Reverse7 @@ -119974,7 +119997,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 334FC158-33DC-452E-B7B2-F5CF611E4106 预留字段8 Reverse8 @@ -119986,7 +120009,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 8C916540-CBDC-45CE-806D-12548E2AB615 预留字段9 Reverse9 @@ -119998,7 +120021,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + FB62856E-02E4-40F7-AB0A-25FFD2EB1827 预留字段10 Reverse10 @@ -120010,7 +120033,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + F82B1D37-5433-462A-984A-C2B5474EDCEF 预留字段I1 ReverseI1 @@ -120022,7 +120045,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 3456F610-CA9D-4AEE-B5C4-F83EB9D628DB 预留字段I2 ReverseI2 @@ -120036,7 +120059,7 @@ LABL 0 Arial Unicode MS,8,N - + 1067DE8F-0741-499F-8684-0A62C0D4DCD7 Key_1 Key_1 @@ -120045,15 +120068,15 @@ LABL 0 Arial Unicode MS,8,N 1721280295 Administrator - + - + - + @@ -120066,7 +120089,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 学分记录 - + 0609050B-2AD7-4E64-830A-D08C0630675B Id Id @@ -120081,7 +120104,7 @@ LABL 0 Arial Unicode MS,8,N - + ED3C4340-4B53-40C3-BA76-624016DF5C66 创建人 CreateBy @@ -120095,7 +120118,7 @@ LABL 0 Arial Unicode MS,8,N - + ECD05F00-C167-49C8-92B8-98833BA9EAEA 创建时间 CreateTime @@ -120109,7 +120132,7 @@ LABL 0 Arial Unicode MS,8,N - + 7168741B-FC64-4BC3-A52B-C425F08853E7 创建程序 CreateProg @@ -120121,7 +120144,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + B9700C41-2D1D-4C71-8613-149E9D893835 创建人IP CreateIP @@ -120133,7 +120156,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 28F2FBE7-170C-4648-8D87-2804A904E1E2 修改人 UpdateBy @@ -120147,7 +120170,7 @@ LABL 0 Arial Unicode MS,8,N - + BD170693-2350-4F86-8D4B-91142F473B46 修改时间 UpdateTime @@ -120161,7 +120184,7 @@ LABL 0 Arial Unicode MS,8,N - + 896FC88C-C6F5-42D7-A194-1F1AE00E66E3 修改程序 UpdateProg @@ -120173,7 +120196,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 7093FE14-52BB-4BF4-8079-C8F1A530F791 修改人IP UpdateIP @@ -120185,7 +120208,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 412DF897-4FD5-4D39-9663-97DDBED5B2B9 操作日志ID OperateLogID @@ -120200,7 +120223,7 @@ LABL 0 Arial Unicode MS,8,N - + 1C59F865-077C-4F40-9D80-F014A5AA78E3 员工ID StaffId @@ -120211,7 +120234,7 @@ LABL 0 Arial Unicode MS,8,N 员工ID int - + 48FED72C-2120-43C7-B98A-B4845BB6185B 课程ID CourseId @@ -120222,7 +120245,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 8C0E4190-FF55-4FD0-AAA2-282C7753A87F 课程快照ID CourseSnapId @@ -120233,7 +120256,7 @@ LABL 0 Arial Unicode MS,8,N 课程快照ID bigint - + BCB46406-51A1-4483-8518-0287F70CCADD 获得日期 Date @@ -120244,7 +120267,7 @@ LABL 0 Arial Unicode MS,8,N 获得日期 datetime - + 4C409552-962C-41B2-89F9-BEAE81BCD599 获得学分 CreditPoints @@ -120255,7 +120278,7 @@ LABL 0 Arial Unicode MS,8,N 获得学分 int - + AD0571FD-2B1E-4904-A50C-D31B9048E605 备注 RemarkSz @@ -120270,7 +120293,7 @@ LABL 0 Arial Unicode MS,8,N - + F8618A06-F8BE-4F38-AEBA-16354D8E2965 默认标志 IsDefault @@ -120285,7 +120308,7 @@ LABL 0 Arial Unicode MS,8,N - + D8C9B388-E4A8-4238-B1E6-1123562C2E52 删除标志 IsEnable @@ -120300,7 +120323,7 @@ LABL 0 Arial Unicode MS,8,N - + 2AB84A17-6A70-412F-A039-B358EC02F73C 预留字段1 Reverse1 @@ -120312,7 +120335,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 5E174EBD-8179-423A-8635-135CFE32DBD8 预留字段2 Reverse2 @@ -120324,7 +120347,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + BDFC6CC3-1961-4DD9-8831-0100F96012FA 预留字段3 Reverse3 @@ -120336,7 +120359,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 82A2EE6F-0ABB-443B-B19A-DF698D3059E6 预留字段4 Reverse4 @@ -120348,7 +120371,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3F262ED5-0B60-4E84-A082-30B8C0D11804 预留字段5 Reverse5 @@ -120360,7 +120383,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4C19F768-BC38-4DB1-95FE-A91FADC33E94 预留字段6 Reverse6 @@ -120372,7 +120395,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + C38AE6E3-5E73-4D38-8B0E-458AF13318A4 预留字段7 Reverse7 @@ -120384,7 +120407,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 6E4597F1-CC80-46A1-8C33-BFA961059D50 预留字段8 Reverse8 @@ -120396,7 +120419,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 03DBDADB-1656-42E3-99D9-18F072A408F0 预留字段9 Reverse9 @@ -120408,7 +120431,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + D52A9DD3-2CD7-4D4F-962F-83E1B8B50FF6 预留字段10 Reverse10 @@ -120420,7 +120443,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 35F0B2FC-591B-41A9-9FC8-A91CF502A61D 预留字段I1 ReverseI1 @@ -120432,7 +120455,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + D86F4790-2DAD-4A1A-8E8C-BA516A21B9A1 预留字段I2 ReverseI2 @@ -120446,7 +120469,7 @@ LABL 0 Arial Unicode MS,8,N - + 3BE0949D-16CB-473A-A62D-3A3DC1CC8E07 Key_1 Key_1 @@ -120455,15 +120478,15 @@ LABL 0 Arial Unicode MS,8,N 1721036579 Administrator - + - + - + @@ -120476,7 +120499,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则 - + 236DA490-0EF0-4C65-B950-7F8721F79307 Id Id @@ -120491,7 +120514,7 @@ LABL 0 Arial Unicode MS,8,N - + 7845CC23-BA7A-4E37-BF56-EB367B328E0C 创建人 CreateBy @@ -120505,7 +120528,7 @@ LABL 0 Arial Unicode MS,8,N - + 86211BC8-C753-4A17-9892-04BE9CC2DB64 创建时间 CreateTime @@ -120519,7 +120542,7 @@ LABL 0 Arial Unicode MS,8,N - + 7C784988-A6CC-4291-926B-B428042BE4A3 创建程序 CreateProg @@ -120531,7 +120554,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + D5E9D8A7-6543-451A-B050-1B267D11017A 创建人IP CreateIP @@ -120543,7 +120566,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 2227CDED-DEBC-485F-B7FA-C72FFCA985D2 修改人 UpdateBy @@ -120557,7 +120580,7 @@ LABL 0 Arial Unicode MS,8,N - + 22E847CF-3747-4A56-A6CA-B36D05A73770 修改时间 UpdateTime @@ -120571,7 +120594,7 @@ LABL 0 Arial Unicode MS,8,N - + AC80EED0-B3C9-43B8-B133-DDC3B6A53A47 修改程序 UpdateProg @@ -120583,7 +120606,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 81989CA0-C735-4746-B141-4406D5874BCC 修改人IP UpdateIP @@ -120595,7 +120618,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 35A85CAB-153D-44DC-87D6-691CF6E9B97D 操作日志ID OperateLogID @@ -120610,7 +120633,7 @@ LABL 0 Arial Unicode MS,8,N - + 290D824C-197C-437A-BC2F-9581228A3999 规则类型 RuleType @@ -120622,7 +120645,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 797A373B-E17A-4336-8DD5-E5EF22554B3E 培训种类 TrainType @@ -120634,7 +120657,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 009416B1-ABEA-4468-8655-DFBE44FE2F24 课程ID CourseId @@ -120645,7 +120668,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 5E41173F-F2F8-4A9A-972B-9DDA04C1DAFC 课程场景ID CourseSceneId @@ -120656,7 +120679,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + DCEBF3EF-EBA8-4B7F-8225-E14DBBCFFC7B 厂区 ZoneId @@ -120667,7 +120690,7 @@ LABL 0 Arial Unicode MS,8,N 厂区 int - + DF4CA9F0-D489-47D9-BC2F-15A2CA61024B 部门 DeptId @@ -120678,7 +120701,7 @@ LABL 0 Arial Unicode MS,8,N 部门 int - + 11CD542D-061E-4B85-A96B-7A0543F3C4AE 职称 TitleId @@ -120689,7 +120712,7 @@ LABL 0 Arial Unicode MS,8,N 职称 int - + AE698472-4094-467D-96DC-5B3579FBFAB9 职等 GradeId @@ -120700,7 +120723,7 @@ LABL 0 Arial Unicode MS,8,N 职等 int - + AF5F0E34-DA3F-4286-A4EC-88F51CDA9EF5 岗位 JobId @@ -120711,7 +120734,7 @@ LABL 0 Arial Unicode MS,8,N 岗位 int - + 8F74C8FF-6DCB-4BE1-B049-0BDD3D5D8FC9 年度 Year @@ -120723,7 +120746,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + FA2DBC72-8C81-4DE1-B906-376DCDE8A2F9 完成期限 DeadlineMonth @@ -120734,7 +120757,7 @@ LABL 0 Arial Unicode MS,8,N 完成期限 int - + 67DC0C25-BDB7-4E86-AD1A-DBAC953CBE1D 备注 RemarkSz @@ -120749,7 +120772,7 @@ LABL 0 Arial Unicode MS,8,N - + 2D5BA3A4-EFBB-4770-AFD6-9B40D4C4F2B6 默认标志 IsDefault @@ -120764,7 +120787,7 @@ LABL 0 Arial Unicode MS,8,N - + 367902A9-EE5A-450C-8157-BE34BB2BD3B4 删除标志 IsEnable @@ -120779,7 +120802,7 @@ LABL 0 Arial Unicode MS,8,N - + CFBFA0E2-D80B-48FE-AE5A-BD7B661D21F6 预留字段1 Reverse1 @@ -120791,7 +120814,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 811A60A5-B9EA-441E-BB3D-D04B9D14154D 预留字段2 Reverse2 @@ -120803,7 +120826,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D223FC7-D860-43E9-9109-B69B141DF255 预留字段3 Reverse3 @@ -120815,7 +120838,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 841830F3-83F5-4A89-AB54-AC9C20B5A748 预留字段4 Reverse4 @@ -120827,7 +120850,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 0D881F32-B7B0-4979-BB1B-F78B96F60FB5 预留字段5 Reverse5 @@ -120839,7 +120862,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AB281A43-9014-4DEC-ACFC-1694D7E08CAB 预留字段6 Reverse6 @@ -120851,7 +120874,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 43B74A75-DB24-4B7D-9653-A2B6A7ED01E1 预留字段7 Reverse7 @@ -120863,7 +120886,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B50A76AE-CE1C-40AF-9D71-25D03B3DFC85 预留字段8 Reverse8 @@ -120875,7 +120898,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 94EE4260-04D6-4A70-8FF1-113D921A921E 预留字段9 Reverse9 @@ -120887,7 +120910,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9F273A96-2C2F-44C2-BE9F-9CA706457DE0 预留字段10 Reverse10 @@ -120899,7 +120922,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 324CDD0F-14BF-40B4-8B54-0835EF2673B7 预留字段I1 ReverseI1 @@ -120911,7 +120934,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 9B85210E-4450-43BE-9F3E-89C9BAE32C7B 预留字段I2 ReverseI2 @@ -120925,7 +120948,7 @@ LABL 0 Arial Unicode MS,8,N - + 02F1F0EA-B9DC-4243-9765-FB0FB60A73B4 Key_1 Key_1 @@ -120934,15 +120957,15 @@ LABL 0 Arial Unicode MS,8,N 1721372686 Administrator - + - + - + @@ -120955,7 +120978,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 培训证书规则 - + 74B0AAD1-B9E2-4EDC-8F94-267A7290CFD7 Id Id @@ -120970,7 +120993,7 @@ LABL 0 Arial Unicode MS,8,N - + 101FABA8-1B4B-4152-9CC6-F9CDBB84036C 创建人 CreateBy @@ -120984,7 +121007,7 @@ LABL 0 Arial Unicode MS,8,N - + 778A7CF1-CE3C-4D0F-8C1D-4E4DCF460E79 创建时间 CreateTime @@ -120998,7 +121021,7 @@ LABL 0 Arial Unicode MS,8,N - + ABA61C97-6ECC-4EAE-A3A5-1F3CD06AF937 创建程序 CreateProg @@ -121010,7 +121033,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4B9162AD-E539-4D88-9033-1A14B95F4BC1 创建人IP CreateIP @@ -121022,7 +121045,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 832CE7C6-2F51-4792-88F8-09CA93BC9EE3 修改人 UpdateBy @@ -121036,7 +121059,7 @@ LABL 0 Arial Unicode MS,8,N - + 38F733AB-C497-4FA9-B06B-9B5C01567232 修改时间 UpdateTime @@ -121050,7 +121073,7 @@ LABL 0 Arial Unicode MS,8,N - + E517BC43-EDAB-4FD0-9AFD-27871946D7A4 修改程序 UpdateProg @@ -121062,7 +121085,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + AC751D23-BE2F-407B-B57B-43179C6A1DD2 修改人IP UpdateIP @@ -121074,7 +121097,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 91C6434C-8BB0-40EE-85F8-097E7850AA81 操作日志ID OperateLogID @@ -121089,7 +121112,7 @@ LABL 0 Arial Unicode MS,8,N - + 5FF54614-5C5C-4F71-8467-0372DD3761F0 规则类型 RuleType @@ -121101,7 +121124,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + B0C05A48-302C-4CE6-8BA1-A0C44BD0303E 规则编号 RuleNo @@ -121113,7 +121136,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 150DA0CC-7A81-4020-8C50-6C77A1CBB47C 证书名称 CertificateName @@ -121125,7 +121148,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + CB9DAAC2-2757-4594-B1CD-0443C4CA61AE 课程场景ID CourseSceneId @@ -121136,7 +121159,7 @@ LABL 0 Arial Unicode MS,8,N 课程场景ID bigint - + D5BFD533-C0CB-40EF-B419-C76CFA5B2472 课程ID CourseId @@ -121147,7 +121170,7 @@ LABL 0 Arial Unicode MS,8,N 课程ID bigint - + 63D22867-D35B-48C8-8315-96999A56F14F 有效期类型 ValidityType @@ -121159,7 +121182,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + AA8964B1-9490-4BA5-8BA4-4C1E4260BAEC 固定数 StaticNum @@ -121170,7 +121193,7 @@ LABL 0 Arial Unicode MS,8,N 固定数 int - + 70867D03-D648-4D1C-9617-7F20505B1FF0 固定类型 StaticType @@ -121182,7 +121205,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 419FB467-143A-4B5A-9DEA-1C321943D83F 有效期 ValidityTime @@ -121193,7 +121216,7 @@ LABL 0 Arial Unicode MS,8,N 有效期 datetime - + 408CA59F-CABC-49BA-B094-D1DDB66652AE 发放规则 SendRule @@ -121205,7 +121228,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(32) 32 - + 0DCFC327-8D5A-40B3-813D-42A7753DBC3D 分数 ScoreMin @@ -121216,7 +121239,7 @@ LABL 0 Arial Unicode MS,8,N 分数 int - + 343AC157-AD4F-4382-BC76-BC9EA0317D8D 分数1 ScoreMax @@ -121227,7 +121250,7 @@ LABL 0 Arial Unicode MS,8,N 分数1 int - + 8C3CC76E-55C9-4B86-9744-22EAA8105E9B 备注 RemarkSz @@ -121242,7 +121265,7 @@ LABL 0 Arial Unicode MS,8,N - + 5748058F-BCCD-49C0-9012-3D7E96B6D69A 默认标志 IsDefault @@ -121257,7 +121280,7 @@ LABL 0 Arial Unicode MS,8,N - + 2589055F-505E-441A-9696-9964A7A4A008 删除标志 IsEnable @@ -121272,7 +121295,7 @@ LABL 0 Arial Unicode MS,8,N - + D20B915C-FCA1-494B-A8A2-B2FF85468C64 预留字段1 Reverse1 @@ -121284,7 +121307,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 1B4FABC6-E541-4068-ACFB-BC9078682988 预留字段2 Reverse2 @@ -121296,7 +121319,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6310193-4CEE-4148-BE8B-3C11D8F4322D 预留字段3 Reverse3 @@ -121308,7 +121331,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 9FE04BB6-928C-4531-9DDD-0FDBC30BB174 预留字段4 Reverse4 @@ -121320,7 +121343,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + D97789F8-ED46-447A-AD69-0776DE2FABCD 预留字段5 Reverse5 @@ -121332,7 +121355,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + AEDD3137-4121-440A-9A7E-B6F299000B70 预留字段6 Reverse6 @@ -121344,7 +121367,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4FCFEEF7-1047-46A9-916C-FA8C1AA3F795 预留字段7 Reverse7 @@ -121356,7 +121379,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 323C988B-20C0-43EC-ADAE-0FF35D6DFA4A 预留字段8 Reverse8 @@ -121368,7 +121391,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 69763777-A397-4C79-B48F-02E75CD145FF 预留字段9 Reverse9 @@ -121380,7 +121403,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + B6FBA743-4C50-4218-8E94-29BFBEEB0F26 预留字段10 Reverse10 @@ -121392,7 +121415,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + FCCD8A45-2561-4DD5-A9E9-348C2FD700BC 预留字段I1 ReverseI1 @@ -121404,7 +121427,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + 4EF2055B-A955-44E6-A36E-C6441D831DD6 预留字段I2 ReverseI2 @@ -121418,7 +121441,7 @@ LABL 0 Arial Unicode MS,8,N - + 9A140C59-A38D-4A71-9AAB-F1F0C0F7E66B Key_1 Key_1 @@ -121427,15 +121450,15 @@ LABL 0 Arial Unicode MS,8,N 1721280148 Administrator - + - + - + @@ -121448,7 +121471,7 @@ LABL 0 Arial Unicode MS,8,N Administrator 必选修规则人员 - + 8DBABE84-0D95-4963-B5DF-D877A206762B Id Id @@ -121463,7 +121486,7 @@ LABL 0 Arial Unicode MS,8,N - + 48A72633-A433-493B-9FCF-BD126E84A4AF 创建人 CreateBy @@ -121477,7 +121500,7 @@ LABL 0 Arial Unicode MS,8,N - + CBF754F2-F6C8-4BF8-BBFD-F479FF0BE68F 创建时间 CreateTime @@ -121491,7 +121514,7 @@ LABL 0 Arial Unicode MS,8,N - + C8F58FBE-8633-4F75-BD8E-3E04F33B8863 创建程序 CreateProg @@ -121503,7 +121526,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 4D66366A-5007-40A1-962C-BF3D01F8C361 创建人IP CreateIP @@ -121515,7 +121538,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 64AFEE52-E383-4E01-B6FB-92E27CA8DFF4 修改人 UpdateBy @@ -121529,7 +121552,7 @@ LABL 0 Arial Unicode MS,8,N - + DDDCCDAF-B043-44AA-BBDF-01D692B67095 修改时间 UpdateTime @@ -121543,7 +121566,7 @@ LABL 0 Arial Unicode MS,8,N - + 974D9E72-CDB6-4CEF-8D2D-4D4B26993235 修改程序 UpdateProg @@ -121555,7 +121578,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + 21CCFED9-583C-4B5A-8370-170748173C49 修改人IP UpdateIP @@ -121567,7 +121590,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(100) 100 - + A5BF1114-3882-4699-83F8-3B0F5C2FA382 操作日志ID OperateLogID @@ -121582,7 +121605,7 @@ LABL 0 Arial Unicode MS,8,N - + EEFF42B2-E137-4D20-B315-59446F45D0CA 必选修规则ID StudyRuleId @@ -121593,7 +121616,7 @@ LABL 0 Arial Unicode MS,8,N 必选修规则ID bigint - + DE5726E5-8EF1-4BB4-AB0C-735D098B2A57 人员 StaffId @@ -121604,7 +121627,7 @@ LABL 0 Arial Unicode MS,8,N 人员 bigint - + BEF0B3E2-5C5F-4A6E-A696-23BE258E5967 员工姓名 StaffName @@ -121619,7 +121642,7 @@ LABL 0 Arial Unicode MS,8,N - + E04C7821-5C70-4181-A47A-CB6781A4EA94 备注 RemarkSz @@ -121634,7 +121657,7 @@ LABL 0 Arial Unicode MS,8,N - + E963DF7D-5FF1-46E5-BFD1-C77FBC755D50 默认标志 IsDefault @@ -121649,7 +121672,7 @@ LABL 0 Arial Unicode MS,8,N - + 8EC54578-BC99-4FA2-AA3E-49C78AD49294 删除标志 IsEnable @@ -121664,7 +121687,7 @@ LABL 0 Arial Unicode MS,8,N - + 20F23FED-B864-48D9-A5F2-62530E6B6B6D 预留字段1 Reverse1 @@ -121676,7 +121699,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 4D83EE02-C7B8-4454-9961-5D4317D0393D 预留字段2 Reverse2 @@ -121688,7 +121711,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 35840EFC-0D77-4B15-8DCA-C163FC95D7F0 预留字段3 Reverse3 @@ -121700,7 +121723,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 58515022-4E1B-4716-BCE9-0452E0DF1EC1 预留字段4 Reverse4 @@ -121712,7 +121735,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 23D6B0F2-E0BB-48E1-B6C7-02CD99506ECF 预留字段5 Reverse5 @@ -121724,7 +121747,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2387FA8F-20B2-4370-B3CB-D4B3DEC74BF4 预留字段6 Reverse6 @@ -121736,7 +121759,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 73BE3393-7BFC-4ED3-9421-1B079B700C59 预留字段7 Reverse7 @@ -121748,7 +121771,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3382A8F6-1F0B-45ED-9048-D60BD40A3ACA 预留字段8 Reverse8 @@ -121760,7 +121783,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 2D7C8BCC-C8A9-42B2-AA94-02AC70668E77 预留字段9 Reverse9 @@ -121772,7 +121795,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + E1095425-D8C3-47FD-AE78-6FC3AF87EE98 预留字段10 Reverse10 @@ -121784,7 +121807,7 @@ LABL 0 Arial Unicode MS,8,N nvarchar(1000) 1000 - + 3D1EA6FC-A74C-45BB-9AEA-A60F4584D106 预留字段I1 ReverseI1 @@ -121796,7 +121819,7 @@ LABL 0 Arial Unicode MS,8,N 0 int - + EACF32DF-891A-4372-9E13-9A98AE126EED 预留字段I2 ReverseI2 @@ -121810,7 +121833,7 @@ LABL 0 Arial Unicode MS,8,N - + 2A211835-FB66-43E3-AA9F-BF663C744603 Key_1 Key_1 @@ -121819,15 +121842,15 @@ LABL 0 Arial Unicode MS,8,N 1721372451 Administrator - + - + - + @@ -121851,7 +121874,7 @@ LABL 0 Arial Unicode MS,8,N - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -121885,7 +121908,7 @@ LABL 0 Arial Unicode MS,8,N - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -121919,7 +121942,7 @@ LABL 0 Arial Unicode MS,8,N - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -121953,7 +121976,7 @@ LABL 0 Arial Unicode MS,8,N - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -121987,7 +122010,7 @@ LABL 0 Arial Unicode MS,8,N - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -122021,7 +122044,7 @@ LABL 0 Arial Unicode MS,8,N - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -122055,7 +122078,7 @@ LABL 0 Arial Unicode MS,8,N - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -122089,7 +122112,7 @@ LABL 0 Arial Unicode MS,8,N - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -122123,7 +122146,7 @@ LABL 0 Arial Unicode MS,8,N - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -122157,7 +122180,7 @@ LABL 0 Arial Unicode MS,8,N - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -122191,7 +122214,7 @@ LABL 0 Arial Unicode MS,8,N - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -122225,7 +122248,7 @@ LABL 0 Arial Unicode MS,8,N - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -122259,7 +122282,7 @@ LABL 0 Arial Unicode MS,8,N - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -122293,7 +122316,7 @@ LABL 0 Arial Unicode MS,8,N - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -122327,7 +122350,7 @@ LABL 0 Arial Unicode MS,8,N - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -122358,17 +122381,17 @@ LABL 0 Arial Unicode MS,8,N - + - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator 1721372697 Administrator - + @@ -122392,20 +122415,20 @@ LABL 0 Arial Unicode MS,8,N - + - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator 1721280295 Administrator - + - + @@ -122426,20 +122449,20 @@ LABL 0 Arial Unicode MS,8,N - + - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator 1721372642 Administrator - + - + @@ -122451,7 +122474,7 @@ LABL 0 Arial Unicode MS,8,N - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -122464,7 +122487,7 @@ LABL 0 Arial Unicode MS,8,N - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema 1597196432 @@ -122472,12 +122495,12 @@ LABL 0 Arial Unicode MS,8,N 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -122489,7 +122512,7 @@ LABL 0 Arial Unicode MS,8,N - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -122499,7 +122522,7 @@ LABL 0 Arial Unicode MS,8,N ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -122509,7 +122532,7 @@ LABL 0 Arial Unicode MS,8,N Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -122577,7 +122600,7 @@ LABL 0 Arial Unicode MS,8,N varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -122588,7 +122611,7 @@ LABL 0 Arial Unicode MS,8,N varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -122610,7 +122633,7 @@ LABL 0 Arial Unicode MS,8,N varchar(2000) 2000 - + @@ -122688,7 +122711,7 @@ LABL 0 Arial Unicode MS,8,N varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -122711,7 +122734,7 @@ LABL 0 Arial Unicode MS,8,N - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -122720,13 +122743,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.Model/ViewModels/Menu.cs b/Tiobon.Core.Model/ViewModels/Menu.cs index 15ee9079..36566a3b 100644 --- a/Tiobon.Core.Model/ViewModels/Menu.cs +++ b/Tiobon.Core.Model/ViewModels/Menu.cs @@ -107,7 +107,7 @@ public class TableColumn public int SortNo { get; set; } public string searchOperator1 { get; set; } public List searchOperator { get; set; } - public string searchColumnDefaultValue { get; set; } + public object searchColumnDefaultValue { get; set; } = ""; public string AppColumnType { get; set; } public int pageColumnID { get; set; } } diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 8303862a..de164d5d 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -819,6 +819,9 @@ public partial class CommonServices : BaseServices>, ICommon if (!string.IsNullOrWhiteSpace(x.searchOperator1)) x.searchOperator = JsonConvert.DeserializeObject>(x.searchOperator1); x.searchOperator1 = null; + + if (x.multipleSearchValue == "true") + x.searchColumnDefaultValue = new List(); }); Db.Ado.CommitTran(); diff --git a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs index ca9d5ef7..642b11c2 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CertificateRuleServices.cs @@ -38,18 +38,18 @@ public class Ghre_CertificateRuleServices : BaseServices(value); switch (jsonParam.operationKey) { case "Equal": - condition = $" ( CourseSceneId='{jsonParam.columnValue}' or CourseId='{jsonParam.columnValue}' )"; + condition = $" ( CourseSceneId='{jsonParam.columnValue}' or CourseId='{jsonParam.columnValue}' )"; break; case "NotEqual": - condition = $"( CourseSceneId!='{{jsonParam.columnValue}}' AND CourseId!='{{jsonParam.columnValue}}' )\";"; - break; + condition = $"( CourseSceneId!='{{jsonParam.columnValue}}' AND CourseId!='{{jsonParam.columnValue}}' )\";"; + break; default: break; } @@ -65,8 +65,10 @@ public class Ghre_CertificateRuleServices : BaseServices(sql); + entitys.ForEach(entity => + { + if (!string.IsNullOrWhiteSpace(entity.Indate)) + entity.Indate = DateTimeHelper.ConvertToDayString(entity.Indate); + }); + return new ServicePageResult(filter.pageNum, total, filter.pageSize, entitys); } diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index 5ba643dd..efbe86ec 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -452,7 +452,7 @@ public class Ghre_CourseServices : BaseServices(value); - // conditions += $" AND (Indate BETWEEN '{jsonParam.columnValue[0]}' AND '{jsonParam.columnValue[1]}')"; + if (name == "CourseNoOrName") + { + var jsonParam = JsonConvert.DeserializeObject(value); + conditions += $" AND (CourseNo LIKE '%{jsonParam.columnValue}%' OR CourseName LIKE '%{jsonParam.columnValue}%')"; - // continue; - //} + continue; + } + if (name == "CourseClassId") + { + var jsonParam = JsonConvert.DeserializeObject(value); + conditions += $" AND CourseClassId LIKE '%{jsonParam.columnValue}%' "; + + continue; + } //if (name == "Date") //{ // var jsonParam = JsonConvert.DeserializeObject(value); @@ -605,7 +612,7 @@ public class Ghre_CourseServices : BaseServices(sql) diff --git a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs index 150be514..cd14cca9 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs @@ -831,8 +831,16 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';"); if (status == "Released" && entity.Status != "Released") { - if (entity.LinkType == "CourseId" && !await _ghre_CourseServices.AnyAsync(entity.LinkId)) - return ServiceResult.OprateFailed($"试卷【{entity.PaperName}({entity.PaperNo})】,关联的课程,已被删除,请重新维护数据!"); + if (entity.LinkType == "CourseId") + { + if (!await _ghre_CourseServices.AnyAsync(entity.LinkId)) + return ServiceResult.OprateFailed($"试卷【{entity.PaperName}({entity.PaperNo})】,关联的课程,已被删除,请重新维护数据!"); + + var course = await _ghre_CourseServices.QueryById(entity.LinkId); + if (course.Status != "Released") + return ServiceResult.OprateFailed($"试卷【{entity.PaperName}({entity.PaperNo})】,关联的课程【{course.CourseName}】,尚未被启用,请重新维护数据!"); + } + if (entity.LinkType == "CourseSceneId" && !await _ghre_CourseSceneServices.AnyAsync(entity.LinkId)) return ServiceResult.OprateFailed($"试卷【{entity.PaperName}({entity.PaperNo})】,关联的课程场景,已被删除,请重新维护数据!"); diff --git a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs index 08e12af9..695f92e6 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_StudyRecordServices.cs @@ -8,6 +8,7 @@ using Newtonsoft.Json.Linq; using Tiobon.Core.Common; using Tiobon.Core.Model; using Newtonsoft.Json; +using Tiobon.Core.Common.Helper; namespace Tiobon.Core.Services { @@ -113,6 +114,12 @@ namespace Tiobon.Core.Services var entitys = await Db.Ado.SqlQueryAsync(sql); + entitys.ForEach(entity => + { + if (!string.IsNullOrWhiteSpace(entity.Indate)) + entity.Indate = DateTimeHelper.ConvertToDayString(entity.Indate); + }); + return new ServicePageResult(filter.pageNum, total, filter.pageSize, entitys); } @@ -161,7 +168,7 @@ namespace Tiobon.Core.Services }); entity.SearchFields.Add(new CoursePublicSearchField() { - label = "'课程场景", + label = "课程场景", field = "CourseSceneId", elementType = "ApiSelect", dataSource = "CommonList_TrainingCourseScene", @@ -171,7 +178,7 @@ namespace Tiobon.Core.Services }); entity.SearchFields.Add(new CoursePublicSearchField() { - label = "'课程状态", + label = "课程状态", field = "CourseStatus", elementType = "ApiSelect", dataSource = "TBParaDetail_Train_CourseIsOpen", @@ -181,7 +188,7 @@ namespace Tiobon.Core.Services }); entity.SearchFields.Add(new CoursePublicSearchField() { - label = "'学习状态", + label = "学习状态", field = "StudyStatus", elementType = "ApiSelect", dataSource = "TBParaDetail_Train_CourseIsOpen", @@ -249,13 +256,20 @@ namespace Tiobon.Core.Services var value = jProperty.Value.ToString(); if (name == "page" || name == "pageSize") continue; - //if (name == "Date") - //{ - // var jsonParam = JsonConvert.DeserializeObject(value); - // conditions += $" AND (Date BETWEEN '{jsonParam.columnValue[0]}' AND '{jsonParam.columnValue[1]}')"; + if (name == "CourseNoOrName") + { + var jsonParam = JsonConvert.DeserializeObject(value); + conditions += $" AND CourseName LIKE '%{jsonParam.columnValue}%'"; + + continue; + } + if (name == "CourseClassId") + { + var jsonParam = JsonConvert.DeserializeObject(value); + conditions += $" AND CourseClassId LIKE '%{jsonParam.columnValue}%' "; - // continue; - //} + continue; + } if (!string.IsNullOrWhiteSpace(value)) { var jsonParam = JsonConvert.DeserializeObject(value);