From 2d90cd38abf268b27cdbf5058a8520aed0302ea8 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 16 May 2025 09:22:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=A7=E5=8F=8D=E9=A6=88=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Model/Tiobon.Web.pdm | 251 ++++++++++-------- Tiobon.Core.Api/Tiobon.Core.Model.xml | 30 +++ .../Ghre/Ghre_OpenClassFeedback.Dto.Base.cs | 17 +- .../Models/Ghre/Ghre_OpenClassFeedback.cs | 17 +- .../Ghre/Ghre_OpenClassFeedback.Dto.View.cs | 2 + .../Ghre/Ghre_OpenClassFeedbackServices.cs | 8 + .../Ghre/Ghre_OpenClassServices.cs | 18 +- .../Ghre/Ghre_SurveyServices.cs | 7 +- Tiobon.Core/Tiobon.Core.Model.xml | 30 +++ 9 files changed, 261 insertions(+), 119 deletions(-) diff --git a/Model/Tiobon.Web.pdm b/Model/Tiobon.Web.pdm index 8f9c0f3b..535ee736 100644 --- a/Model/Tiobon.Web.pdm +++ b/Model/Tiobon.Web.pdm @@ -1,5 +1,5 @@ - + @@ -63512,7 +63512,7 @@ Ghra_staff_InsureBase Ghre_OpenClassFeedback 1738915573 Administrator -1747292807 +1747303228 Administrator 开班反馈 @@ -63730,6 +63730,39 @@ Ghra_staff_InsureBase datetime +94931244-1C19-419D-95A1-A868947F234A +讲师ID +TeacherId +1747303181 +Administrator +1747303514 +Administrator +讲师ID +bigint + + +1FEFA229-07AB-488A-8999-4FFC2149CA76 +课程开始时间 +CourseBeginTime +1747303180 +Administrator +1747303278 +Administrator +课程开始时间 +datetime + + +83398947-FC49-41AC-AF06-777E9D943272 +课程结束时间 +CourseEndTime +1747303180 +Administrator +1747303286 +Administrator +课程结束时间 +datetime + + FB0CC2E3-2160-41F7-B02A-879E73799842 备注 RemarkSz @@ -63744,7 +63777,7 @@ Ghra_staff_InsureBase - + 674EDE01-7FD7-41D5-8585-170660E4A28A 默认标志 IsDefault @@ -63759,7 +63792,7 @@ Ghra_staff_InsureBase - + 52747696-6B6B-496D-97DA-C4E25BE0F52A 删除标志 IsEnable @@ -63774,7 +63807,7 @@ Ghra_staff_InsureBase - + E560B63C-4BE9-4BE0-938A-127D011C396D 预留字段1 Reverse1 @@ -63786,7 +63819,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 16DF9E64-63E7-4640-AAC7-A5F6D0B46ECF 预留字段2 Reverse2 @@ -63798,7 +63831,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 6CB2EE40-6509-4655-A1E8-DCF607ECEA31 预留字段3 Reverse3 @@ -63810,7 +63843,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 26A169C9-A218-4638-9470-B9886456AFB1 预留字段4 Reverse4 @@ -63822,7 +63855,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 5862B3E4-A0AA-4BD2-BCAB-6B86FF5F0CE1 预留字段5 Reverse5 @@ -63834,7 +63867,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + A8291485-8745-4207-A42E-ED66CFF42109 预留字段6 Reverse6 @@ -63846,7 +63879,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 0337AB74-25BF-4087-878A-4E063AE12BAA 预留字段7 Reverse7 @@ -63858,7 +63891,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 77B177AC-36CF-4C9E-A9B5-EE366E4DE338 预留字段8 Reverse8 @@ -63870,7 +63903,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + D1BF2BAF-E0DF-456E-A5A3-EB10479A4FBA 预留字段9 Reverse9 @@ -63882,7 +63915,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 8ACEF181-CE51-4220-BABB-2FDDBE45FF2A 预留字段10 Reverse10 @@ -63894,7 +63927,7 @@ Ghra_staff_InsureBase nvarchar(1000) 1000 - + 4A533B78-7F53-4F49-A144-22D7E883C85E 预留字段I1 ReverseI1 @@ -63906,7 +63939,7 @@ Ghra_staff_InsureBase 0 int - + 1D698085-C815-44AB-AA27-42A546054184 预留字段I2 ReverseI2 @@ -63920,7 +63953,7 @@ Ghra_staff_InsureBase - + E41C527C-1E75-484B-8C2C-DC60AE1931E4 Key_1 Key_1 @@ -63934,10 +63967,10 @@ Ghra_staff_InsureBase - + - + @@ -63961,7 +63994,7 @@ Ghra_staff_InsureBase - + 7F0DCA7C-274D-48A8-B3D8-0FD7B707AFC2 1714101292 Administrator @@ -63995,7 +64028,7 @@ Ghra_staff_InsureBase - + D23C452C-4BB6-4C2A-AB2E-E8434D958A77 1714101335 Administrator @@ -64010,7 +64043,7 @@ Ghra_staff_InsureBase - + 55EBFC84-83AC-4EDF-BADD-29FA719652D1 Reference_13 Reference_13 @@ -64029,7 +64062,7 @@ Ghra_staff_InsureBase - + D4016F9D-5631-4F9E-A70D-D42133A4EBB7 1714107872 Administrator @@ -64063,7 +64096,7 @@ Ghra_staff_InsureBase - + BEBA3346-CCC6-41D9-B95B-12B8F81188BF 1714108449 Administrator @@ -64097,7 +64130,7 @@ Ghra_staff_InsureBase - + FC69BEF9-F863-4A65-903E-CB2850197526 1714109221 Administrator @@ -64131,7 +64164,7 @@ Ghra_staff_InsureBase - + ACE0AB02-0D27-4F1C-BF71-738C20DF96C2 1714120556 Administrator @@ -64165,7 +64198,7 @@ Ghra_staff_InsureBase - + B95672ED-9976-4742-9FFC-52B326620682 1715565535 Administrator @@ -64199,7 +64232,7 @@ Ghra_staff_InsureBase - + B6E89235-A6E0-460D-9228-DCA8C58EE2AD 1715570661 Administrator @@ -64233,7 +64266,7 @@ Ghra_staff_InsureBase - + 5D4938F3-7934-4F74-891C-97DC9DC47B1B 1716798640 Administrator @@ -64267,7 +64300,7 @@ Ghra_staff_InsureBase - + 179079CB-7169-4B19-A07A-A61C331F59CD 1716876897 Administrator @@ -64301,7 +64334,7 @@ Ghra_staff_InsureBase - + DD965546-2361-4301-82D7-446B823BDCFD 1717481682 Administrator @@ -64335,7 +64368,7 @@ Ghra_staff_InsureBase - + E78B14FB-C2C3-4DCA-A3B4-CA471817B9FC 1717726229 Administrator @@ -64369,7 +64402,7 @@ Ghra_staff_InsureBase - + 8C71D6B9-780B-4547-ADFD-986E619F4DCD 1719381914 Administrator @@ -64403,7 +64436,7 @@ Ghra_staff_InsureBase - + EB9D1A5A-99AB-44AD-9B1A-D45E66C0CFDE 1719468257 Administrator @@ -64437,7 +64470,7 @@ Ghra_staff_InsureBase - + ACF1454B-2C3F-40E5-ADC5-4A48787EB937 1720488320 Administrator @@ -64471,7 +64504,7 @@ Ghra_staff_InsureBase - + 55351100-6B8C-411A-838F-ADF17D7249C7 1721372650 Administrator @@ -64486,7 +64519,7 @@ Ghra_staff_InsureBase - + 465DBD55-7683-4A4B-91D3-B7019ED619F0 Reference_114 Reference_114 @@ -64505,7 +64538,7 @@ Ghra_staff_InsureBase - + CE1833FA-A783-4FAC-87BF-AA0FF8008532 1721280283 Administrator @@ -64539,7 +64572,7 @@ Ghra_staff_InsureBase - + 18F2EFF3-BD41-4F96-96C8-D8B15C7E2644 1721372603 Administrator @@ -64573,7 +64606,7 @@ Ghra_staff_InsureBase - + F7ECB7BC-BA8B-4606-B521-999C20FD5C43 1722318917 Administrator @@ -64607,7 +64640,7 @@ Ghra_staff_InsureBase - + 6764C448-6B6B-4DD7-AED9-8E74CDD1261A 1727335554 Administrator @@ -64641,7 +64674,7 @@ Ghra_staff_InsureBase - + C8D69BA0-B62F-4A3E-981C-59D5FC0C2A03 1727336760 Administrator @@ -64675,7 +64708,7 @@ Ghra_staff_InsureBase - + 09B3F4FA-149B-4BB2-8D4C-CB9E05153125 1727336895 Administrator @@ -64709,7 +64742,7 @@ Ghra_staff_InsureBase - + D0D47F43-60D2-4012-A1C6-7EE1F23B2B48 1727337857 Administrator @@ -64724,7 +64757,7 @@ Ghra_staff_InsureBase - + E261580B-7706-444D-9E7B-6A1A5968579B Reference_24 Reference_24 @@ -64743,7 +64776,7 @@ Ghra_staff_InsureBase - + A9F8F17E-368A-42BA-B603-19B2CAF61361 1728532955 Administrator @@ -64777,7 +64810,7 @@ Ghra_staff_InsureBase - + 88DE8617-23F2-4075-A9EB-3AEA05F12872 1728532977 Administrator @@ -64811,7 +64844,7 @@ Ghra_staff_InsureBase - + 36AE3FE2-B4E5-4FF7-ADD1-93D1ABD487CD 1728533087 Administrator @@ -64826,7 +64859,7 @@ Ghra_staff_InsureBase - + AB9D9DC4-987C-4E4B-9BD3-35091CDBA380 Reference_27 Reference_27 @@ -64845,7 +64878,7 @@ Ghra_staff_InsureBase - + E2D02611-09C9-42E2-AA43-22E820AF219C 1728626387 Administrator @@ -64879,7 +64912,7 @@ Ghra_staff_InsureBase - + 62F35C8E-87DA-43C4-AAE9-A47D112F8E0A 1728540045 Administrator @@ -64913,7 +64946,7 @@ Ghra_staff_InsureBase - + 3759DC14-1A7D-4121-AAE1-58CE6813A0AA 1728541044 Administrator @@ -64947,7 +64980,7 @@ Ghra_staff_InsureBase - + 1791558D-852F-437C-97F6-7F9D11EE26DB 1729662916 Administrator @@ -64981,7 +65014,7 @@ Ghra_staff_InsureBase - + 00049FDC-8297-463E-9347-A571E3AB9C9E 1729663415 Administrator @@ -65015,7 +65048,7 @@ Ghra_staff_InsureBase - + B7B6FBF6-DC05-4490-8656-A5DEAF831781 1730250294 Administrator @@ -65049,7 +65082,7 @@ Ghra_staff_InsureBase - + A0C97DD9-1C72-4A18-9FEE-EE6A9AEF21F8 1730336852 Administrator @@ -65083,7 +65116,7 @@ Ghra_staff_InsureBase - + 39FD6B5F-C473-44DF-969E-D851D388EBAE 1730340808 Administrator @@ -65117,7 +65150,7 @@ Ghra_staff_InsureBase - + C4EECAD7-F267-4702-A253-CA499692A254 1730346502 Administrator @@ -65151,7 +65184,7 @@ Ghra_staff_InsureBase - + 3EBD04DF-C924-4032-982C-CA9EF3B72E39 1731478017 Administrator @@ -65185,7 +65218,7 @@ Ghra_staff_InsureBase - + DE13B6DD-B49E-4F3E-8AF7-BEB535EE3CC6 1731478076 Administrator @@ -65219,7 +65252,7 @@ Ghra_staff_InsureBase - + 28C77E11-7423-4D63-9053-A5D40E7940AF 1731491451 Administrator @@ -65253,7 +65286,7 @@ Ghra_staff_InsureBase - + 76F5B648-63C3-466C-B313-B38E0519B3BA 1733211832 Administrator @@ -65287,7 +65320,7 @@ Ghra_staff_InsureBase - + D2B7DF8F-ACF7-4237-B814-FA662272F871 1733369860 Administrator @@ -65321,7 +65354,7 @@ Ghra_staff_InsureBase - + F4431A85-1466-4A29-9D1B-A82B70F2F5D5 1733909650 Administrator @@ -65355,7 +65388,7 @@ Ghra_staff_InsureBase - + 3C15C987-A6E8-4FAA-AFB6-1CCBC250460D 1734490374 Administrator @@ -65389,7 +65422,7 @@ Ghra_staff_InsureBase - + 9B53094C-D4A4-4269-A8F0-B03AC9CEA70F 1737080391 Administrator @@ -65404,7 +65437,7 @@ Ghra_staff_InsureBase - + C4514A46-AF20-4937-902F-A02C91F50231 Reference_44 Reference_44 @@ -65423,7 +65456,7 @@ Ghra_staff_InsureBase - + 22844E1B-552F-4914-8997-D9056E9D9574 1737085753 Administrator @@ -65457,7 +65490,7 @@ Ghra_staff_InsureBase - + 0457880B-22F4-48EC-84E0-13C055FDBA46 1737086327 Administrator @@ -65491,7 +65524,7 @@ Ghra_staff_InsureBase - + 5A235CB8-FEFB-41E2-B379-421F28BC171B 1738913762 Administrator @@ -65525,7 +65558,7 @@ Ghra_staff_InsureBase - + 1D7919EA-4B45-4026-8981-20ABBE3392A1 1738915647 Administrator @@ -65559,7 +65592,7 @@ Ghra_staff_InsureBase - + 33416204-3836-40D1-AEA9-BF78C4576311 1738915648 Administrator @@ -65593,7 +65626,7 @@ Ghra_staff_InsureBase - + F631F0DE-0C6E-4534-8868-FFB7A5CE94B9 1738916095 Administrator @@ -65627,7 +65660,7 @@ Ghra_staff_InsureBase - + F5085F08-E406-43D8-A1A8-81A9189C0250 1738916098 Administrator @@ -65642,7 +65675,7 @@ Ghra_staff_InsureBase - + 34714A40-5F9A-4B8C-90C8-33DA4909C40F Reference_51 Reference_51 @@ -65661,7 +65694,7 @@ Ghra_staff_InsureBase - + B20D9464-D8C0-404D-9C55-6A16F6CB04BB 1738977084 Administrator @@ -65695,7 +65728,7 @@ Ghra_staff_InsureBase - + 9F6BE6A1-9284-48FD-8F05-DC3546094F77 1741251133 Administrator @@ -65729,7 +65762,7 @@ Ghra_staff_InsureBase - + 5A50E86B-C2F7-432E-AA0A-168B3DC83497 1741251792 Administrator @@ -65763,7 +65796,7 @@ Ghra_staff_InsureBase - + BDCC811D-F015-4D0F-97D6-F2CACD99D5B1 1741253476 Administrator @@ -65797,7 +65830,7 @@ Ghra_staff_InsureBase - + 4066B1B5-8D07-4014-B0B8-2F993CD903F4 1741253560 Administrator @@ -65831,7 +65864,7 @@ Ghra_staff_InsureBase - + EBCEC5EC-9760-46F6-9FFA-D728FAE18C30 1741255050 Administrator @@ -65865,7 +65898,7 @@ Ghra_staff_InsureBase - + 548119D4-D7F4-4E62-8CDC-AF240857DE94 1741255952 Administrator @@ -65899,7 +65932,7 @@ Ghra_staff_InsureBase - + 3912D397-0BCA-484D-9584-C932F15EEE9B 1745299743 Administrator @@ -65933,7 +65966,7 @@ Ghra_staff_InsureBase - + B13BF71C-9172-41DF-BD1A-F35F2EF5BF33 1747034447 Administrator @@ -65967,7 +66000,7 @@ Ghra_staff_InsureBase - + 3E63BC9B-BA52-4108-8324-3F459D435DC2 1747035168 Administrator @@ -65989,7 +66022,7 @@ Ghra_staff_InsureBase - + A1DD77B6-E48E-4C9D-947D-D42E3C5240C2 dbo dbo @@ -66002,7 +66035,7 @@ Ghra_staff_InsureBase - + C012A467-0031-4F3C-9D9D-13408491E147 DefaultSchema DefaultSchema @@ -66011,12 +66044,12 @@ Ghra_staff_InsureBase 1597196433 ttsoftxch - + - + 41D2B655-5319-49C5-9BA6-133BB8B097CA dbo dbo @@ -66028,7 +66061,7 @@ Ghra_staff_InsureBase - + 2153E033-C4DC-4F90-B2F4-3B0F44BD33D5 文本 TEXT @@ -66038,7 +66071,7 @@ Ghra_staff_InsureBase ttsoftxch text - + AC8799D0-82CA-4B70-ADAC-18D8797720A9 图片 IMAGE @@ -66048,7 +66081,7 @@ Ghra_staff_InsureBase Administrator image - + DEC04470-B84A-413E-9B2A-C265C5506182 加密 ENCRYPT_STRING @@ -66059,7 +66092,7 @@ Ghra_staff_InsureBase nvarchar(256) 256 - + 538C6297-7080-43C1-9455-AD6516B6FBB2 数字 NUMBER @@ -66071,7 +66104,7 @@ Ghra_staff_InsureBase 20 6 - + AF15A9FA-052F-43E5-9102-57F195CBCFDE 类别 TYPE @@ -66082,7 +66115,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + D0936140-81BD-463E-B0ED-FE3F86828A2C 特长字符串 LONG_LONG_STRING @@ -66093,7 +66126,7 @@ Ghra_staff_InsureBase varchar(256) 256 - + 5FBDAFFC-EA04-407B-877F-58752C2E736C 金额 AMOUNT @@ -66105,7 +66138,7 @@ Ghra_staff_InsureBase 20 6 - + F461E3FD-0A64-4712-BC09-C0BA3C248E5B 描述 DESCRIPTION @@ -66116,7 +66149,7 @@ Ghra_staff_InsureBase varchar(4000) 4000 - + 703A2917-B6C4-4BC6-B2CB-6AB8E2B49D30 短字符串 SHORT_STRING @@ -66127,7 +66160,7 @@ Ghra_staff_InsureBase varchar(64) 64 - + 89A476D2-A1C0-428C-9875-26A50B7AFE1A 长字符串 LONG_STRING @@ -66149,7 +66182,7 @@ Ghra_staff_InsureBase varchar(2000) 2000 - + @@ -66163,7 +66196,7 @@ Ghra_staff_InsureBase char(1) 1 - + 82662C91-618F-4022-B9CD-1A431DC84A0A 名称 NAME @@ -66184,7 +66217,7 @@ Ghra_staff_InsureBase Administrator int - + 77F6BD58-5A9D-44F7-988C-76608A3F38B5 代码 CODE @@ -66216,7 +66249,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + DA200725-BFB0-4351-9C3E-DC30C036538E STATUS STATUS @@ -66227,7 +66260,7 @@ Ghra_staff_InsureBase varchar(32) 32 - + CB2F08D6-BE17-4046-B94A-4FD00EDA9015 文件 FILE @@ -66237,7 +66270,7 @@ Ghra_staff_InsureBase feipeng image - + 7CC45A5C-15C8-4CA8-BBEB-66FE3DAB482F 字符串512 STRING_512 @@ -66250,7 +66283,7 @@ Ghra_staff_InsureBase - + B41C21E8-76E9-4031-8EF0-34743E5525C5 PUBLIC PUBLIC @@ -66259,13 +66292,13 @@ Ghra_staff_InsureBase 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 cc028b46..5d0f50c6 100644 --- a/Tiobon.Core.Api/Tiobon.Core.Model.xml +++ b/Tiobon.Core.Api/Tiobon.Core.Model.xml @@ -6720,6 +6720,21 @@ 失效时间 + + + 讲师ID + + + + + 课程开始时间 + + + + + 课程结束时间 + + 备注 @@ -26157,6 +26172,21 @@ 失效时间 + + + 讲师ID + + + + + 课程开始时间 + + + + + 课程结束时间 + + 备注 diff --git a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassFeedback.Dto.Base.cs b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassFeedback.Dto.Base.cs index 63684348..a742d5a7 100644 --- a/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassFeedback.Dto.Base.cs +++ b/Tiobon.Core.Model/Base/Ghre/Ghre_OpenClassFeedback.Dto.Base.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/5/15 15:09:07 SimonHsiao 初版 +*V0.01 2025/5/15 18:02:36 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -59,6 +59,21 @@ public class Ghre_OpenClassFeedbackBase /// public DateTime? ExpiryTime { get; set; } + /// + /// 讲师ID + /// + public long? TeacherId { get; set; } + + /// + /// 课程开始时间 + /// + public DateTime? CourseBeginTime { get; set; } + + /// + /// 课程结束时间 + /// + public DateTime? CourseEndTime { get; set; } + /// /// 备注 /// diff --git a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassFeedback.cs b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassFeedback.cs index e5dcea5c..a3e8c0f2 100644 --- a/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassFeedback.cs +++ b/Tiobon.Core.Model/Models/Ghre/Ghre_OpenClassFeedback.cs @@ -6,7 +6,7 @@ * * Ver 变更日期 负责人 变更内容 * ─────────────────────────────────── -*V0.01 2025/5/15 15:09:07 SimonHsiao 初版 +*V0.01 2025/5/15 18:02:36 SimonHsiao 初版 * * Copyright(c) 2025 Tiobon Corporation. All Rights Reserved. *┌──────────────────────────────────┐ @@ -60,6 +60,21 @@ public class Ghre_OpenClassFeedback : BasePoco /// public DateTime? ExpiryTime { get; set; } + /// + /// 讲师ID + /// + public long? TeacherId { get; set; } + + /// + /// 课程开始时间 + /// + public DateTime? CourseBeginTime { get; set; } + + /// + /// 课程结束时间 + /// + public DateTime? CourseEndTime { get; set; } + /// /// 备注 /// diff --git a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs index 50e591a9..187c3d3d 100644 --- a/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs +++ b/Tiobon.Core.Model/View/Ghre/Ghre_OpenClassFeedback.Dto.View.cs @@ -35,4 +35,6 @@ public class Ghre_OpenClassFeedbackDto : Ghre_OpenClassFeedback public string OpenClassName { get; set; } public string CourseName { get; set; } public string ExpiryTime1 { get; set; } + public string TeacherName { get; set; } + } diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs index 196d6678..937cb941 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassFeedbackServices.cs @@ -18,6 +18,7 @@ public class Ghre_OpenClassFeedbackServices : BaseServices x.StaffId != null).Select(x => x.StaffId.Value).Distinct().ToList(); + var teacherIds = result.result.DT_TableDataT1.Where(x => x.TeacherId != null).Select(x => x.TeacherId.Value).Distinct().ToList(); var openClassIds = result.result.DT_TableDataT1.Where(x => x.OpenClassId != null).Select(x => x.OpenClassId.Value).Distinct().ToList(); //var surveyIds = result.result.DT_TableDataT1.Where(x => x.SurveyId != null).Select(x => x.SurveyId.Value).Distinct().ToList(); var courseIds = result.result.DT_TableDataT1.Where(x => x.CourseId != null).Select(x => x.CourseId.Value).Distinct().ToList(); @@ -32,6 +33,9 @@ public class Ghre_OpenClassFeedbackServices : BaseServices() .Where(x => courseIds.Contains(x.Id)).Select(x => new { x.Id, x.CourseName }).ToListAsync(); + var teachers = await Db.Queryable() + .Where(x => teacherIds.Contains(x.Id)).Select(x => new { x.Id, x.TeacherName }).ToListAsync(); + for (int i = 0; i < result.result.DT_TableDataT1.Count; i++) { @@ -44,6 +48,10 @@ public class Ghre_OpenClassFeedbackServices : BaseServices x.Id == DT_TableDataT1.CourseId).FirstOrDefault()?.CourseName; + + if (DT_TableDataT1.TeacherId != null) + DT_TableDataT1.TeacherName = teachers.Where(x => x.Id == DT_TableDataT1.TeacherId).FirstOrDefault()?.TeacherName; + if (DT_TableDataT1.ExpiryTime != null) { if (DateTimeHelper.ConvertToSecondString(DT_TableDataT1.ExpiryTime) == DateTimeHelper.ConvertToSecondString(DateTime.MaxValue)) diff --git a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs index 64de5242..ee0570f0 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_OpenClassServices.cs @@ -1,8 +1,4 @@ -using Amazon.Auth.AccessControlPolicy; -using MongoDB.Driver.Core.Servers; -using MongoDB.Driver.Linq; -using NPOI.SS.Formula.Functions; -using NPOI.XWPF.UserModel; +using MongoDB.Driver.Linq; namespace Tiobon.Core.Services; @@ -492,7 +488,11 @@ public class Ghre_OpenClassServices : BaseServices().Where(x => x.Id == openClassId).FirstAsync(); var feedback = new Ghre_OpenClassFeedback() { OpenClassId = openClassId, @@ -320,7 +321,11 @@ public class Ghre_SurveyServices : BaseServices + + + 讲师ID + + + + + 课程开始时间 + + + + + 课程结束时间 + + 备注 @@ -26157,6 +26172,21 @@ 失效时间 + + + 讲师ID + + + + + 课程开始时间 + + + + + 课程结束时间 + + 备注