缺陷修复

Tiobon.Core.Api/Controllers/Base/BaseController.cs

@@ -176,13 +176,13 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
     [HttpPost("Delete/{Id}")]
     public virtual async Task<ServiceResult> Delete(long Id)
     {
-        var data = Success("删除成功");
+        var data = Success("作废成功");
         var isExist = Convert.ToBoolean(await InvokeServiceAsync("AnyAsync", [Id]));
         if (!isExist)
-            return Failed("删除失败");
+            return Failed("作废失败");
         data.Success = Convert.ToBoolean(await InvokeServiceAsync("DeleteById1", [Id]));
         if (!data.Success)
-            return Failed("删除失败");
+            return Failed("作废失败");
         return data;
     }
 
@@ -194,10 +194,10 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
     [HttpPost, Route("BulkDelete")]
     public virtual async Task<ServiceResult> BulkDelete([FromBody] long[] Ids)
     {
-        var data = Success("删除成功");
+        var data = Success($"成功作废({Ids.Count()}笔数据)");
         data.Success = Convert.ToBoolean(await InvokeServiceAsync("DeleteByIds1", [Ids]));
         if (!data.Success)
-            return Failed("删除失败");
+            return Failed("作废失败");
         return data;
     }
     #endregion

Tiobon.Core.Model/Base/Ghre/Ghre_Course.Dto.Base.cs

@@ -73,12 +73,12 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// 课程负责人
         /// </summary>
-        public long? ManagerId { get; set; }
+        public int? ManagerId { get; set; }
 
         /// <summary>
         /// 课程负责人部门ID
         /// </summary>
-        public long? ManagerDeptId { get; set; }
+        public int? ManagerDeptId { get; set; }
 
         /// <summary>
         /// 内/外训
@@ -89,12 +89,12 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// 讲师ID
         /// </summary>
-        public long? TeacherId { get; set; }
+        public int? TeacherId { get; set; }
 
         /// <summary>
         /// 讲师部门ID
         /// </summary>
-        public long? TeacherDeptId { get; set; }
+        public int? TeacherDeptId { get; set; }
 
         /// <summary>
         /// 培训机构ID

Tiobon.Core.Model/Models/Ghre/Ghre_Course.cs

@@ -75,12 +75,12 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// 课程负责人
         /// </summary>
-        public long? ManagerId { get; set; }
+        public int? ManagerId { get; set; }
 
         /// <summary>
         /// 课程负责人部门ID
         /// </summary>
-        public long? ManagerDeptId { get; set; }
+        public int? ManagerDeptId { get; set; }
 
         /// <summary>
         /// 内/外训
@@ -91,12 +91,12 @@ namespace Tiobon.Core.Model.Models
         /// <summary>
         /// 讲师ID
         /// </summary>
-        public long? TeacherId { get; set; }
+        public int? TeacherId { get; set; }
 
         /// <summary>
         /// 讲师部门ID
         /// </summary>
-        public long? TeacherDeptId { get; set; }
+        public int? TeacherDeptId { get; set; }
 
         /// <summary>
         /// 培训机构ID

Tiobon.Core.Services/CommonServices.cs

@@ -944,7 +944,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "CopyYN").FirstOrDefault();
                 if (toolbar != null) { toolbar.fnKey = "TBD3YN"; }
                 toolbar = result.JM_PageControlT1.Toolbar.Where(x => x.fnKey == "DetailYN").FirstOrDefault();
-                if (toolbar != null) { toolbar.fnKey = "TBD4YN"; }
+                if (toolbar != null) { toolbar.fnKey = "TBD5YN"; }
                 break;
             case "F_Training_Course_Released":
 

Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs

@@ -210,7 +210,7 @@ namespace Tiobon.Core.Services
                 },
                 new DefaultGhre_ExamPaperColumn()
                 {
-                    label = "答题时间",
+                    label = "答题时间（分钟）",
                     field = "AnswerTime",
                     elementType = "InputNumber",
                     required = true,

Tiobon.Core.Services/Ghre/Ghre_QuestionServices.cs

@@ -175,7 +175,7 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
         if (string.IsNullOrWhiteSpace(filter.orderBy))
             filter.orderBy = "CreateTime DESC";
 
-        string conditions = "1=1";
+        string conditions = " WHERE 1=1";
         if (filter.jsonParam != null)
             foreach (JProperty jProperty in filter.jsonParam.Properties())
             {
@@ -215,10 +215,10 @@ public class Ghre_QuestionServices : BaseServices<Ghre_Question, Ghre_QuestionDt
             }
         if (filter.pageSize == 0)
             filter.pageSize = 10000;
+        sql += conditions;
         var data = await Db.SqlQueryable<Ghre_QuestionDto>(sql)
             .OrderBy(filter.orderBy)
             .ToPageListAsync(filter.pageNum, filter.pageSize, totalCount);
-
         data.ForEach(async x =>
         {
             x.DifficultyLevelLabel = await GetParaLabel("DifficultyLevel", x.DifficultyLevel);