From 04ebf78ba9dd5bd1967b74f9f4b8f20ce26f9917 Mon Sep 17 00:00:00 2001 From: xiaochanghai Date: Fri, 14 Feb 2025 09:57:29 +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 --- .../Ghre/Ghre_ExamRecordController.cs | 2 +- Tiobon.Core.Services/CommonServices.cs | 28 +++++++++++++++++ Tiobon.Core/Tiobon.Core.Model.xml | 30 +++++++++++++++++++ Tiobon.Core/Tiobon.Core.xml | 8 ++++- 4 files changed, 66 insertions(+), 2 deletions(-) diff --git a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs index 359ef37a..5db49a50 100644 --- a/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs +++ b/Tiobon.Core.Api/Controllers/Ghre/Ghre_ExamRecordController.cs @@ -50,7 +50,7 @@ public class Ghre_ExamRecordController : BaseController + /// /// 获取考试记录明细扩展接口 /// /// diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index c21564f2..2ad93128 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1999,6 +1999,14 @@ public partial class CommonServices : BaseServices>, ICommon fnType = "table", icon = "ghr-publish", position = "left" + }); result.JM_PageControlT1.Toolbar.Insert(index + 2, new Toolbar() + { + display = true, + fnKey = "TBD6YN", + fnTitle = "取消发布", + fnType = "table", + icon = "ghr-publish", + position = "left" }); break; case "F_OpenCLassOpening": @@ -2021,6 +2029,15 @@ public partial class CommonServices : BaseServices>, ICommon icon = "ghr-publish", position = "left" }); + result.JM_PageControlT1.Toolbar.Insert(index + 2, new Toolbar() + { + display = true, + fnKey = "TBD6YN", + fnTitle = "取消开课", + fnType = "table", + icon = "ghr-publish", + position = "left" + }); break; case "F_OpenCLassClose": toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "NewYN").FirstOrDefault(); @@ -2031,6 +2048,17 @@ public partial class CommonServices : BaseServices>, ICommon if (toolbar != null) toolbar.fnKey = "TBD3YN"; toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault(); if (toolbar != null) toolbar.fnKey = "TBD4YN"; + + index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "TBD1YN"); + result.JM_PageControlT1.Toolbar.Insert(index + 1, new Toolbar() + { + display = true, + fnKey = "TBD5YN", + fnTitle = "取消结案", + fnType = "table", + icon = "ghr-publish", + position = "left" + }); break; } diff --git a/Tiobon.Core/Tiobon.Core.Model.xml b/Tiobon.Core/Tiobon.Core.Model.xml index 035422cc..989b50fc 100644 --- a/Tiobon.Core/Tiobon.Core.Model.xml +++ b/Tiobon.Core/Tiobon.Core.Model.xml @@ -5375,6 +5375,16 @@ 打卡时间 + + + 课程快照ID + + + + + 课程ID + + 学习ID @@ -5385,6 +5395,11 @@ 考试ID + + + 考试记录ID + + 备注 @@ -20136,6 +20151,16 @@ 打卡时间 + + + 课程快照ID + + + + + 课程ID + + 学习ID @@ -20146,6 +20171,11 @@ 考试ID + + + 考试记录ID + + 备注 diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml index 9fc6f950..cd868e55 100644 --- a/Tiobon.Core/Tiobon.Core.xml +++ b/Tiobon.Core/Tiobon.Core.xml @@ -995,7 +995,13 @@ 条件 - + + + 获取考试记录明细扩展接口 + + + + 提交评语接口