缺陷修复

master
xiaochanghai 1 year ago
parent 3b9839c9ef
commit 658db1f10a
  1. 1658
      Model/Tiobon.Web.pdm
  2. 8
      Tiobon.Core.Services/CommonServices.cs
  3. 10
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  4. 2
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs

File diff suppressed because it is too large Load Diff

@ -259,6 +259,13 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
'table' fnType,
'right' position,
'ant-design:setting-outlined' icon
UNION ALL
SELECT 8 fnKeySeq,
'SetDefault' fnKey,
'' fnTitle,
'table' fnType,
'left' position,
'ghr-icon-setDefault' icon
) A
WHERE fnKey NOT IN
(SELECT b.field
@ -806,6 +813,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
var TableColumn = Db.Ado.SqlQuery<TableColumn1>(sql);
result.JM_TableColumnT1.TableColumn = Mapper.Map(TableColumn).ToANew<List<TableColumn>>();
result.JM_TableColumnT1.TableColumn = result.JM_TableColumnT1.TableColumn.Where(x => x.field != "DetailYN" && x.field != "Muti").ToList();
result.JM_TableColumnT1.TableColumn.ForEach(x =>
{
if (!string.IsNullOrWhiteSpace(x.searchOperator1))

@ -487,8 +487,16 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
var entity = await BaseDal.QueryById(id);
if (entity.Status == "Released")
{
string sql = $"SELECT count(0) FROM Ghre_Exam WHERE CourseId='{id}' and IsEnable=1";
if (await Db.Ado.GetIntAsync(sql) > 0)
return ServiceResult.OprateFailed($"课程【{entity.CourseName}】已在考试中关联,不可{(status == "Disabled" ? "" : "")}!");
}
BasePoco ent = entity;
ent.UpdateIP = ip;
ent.UpdateIP = ip;
ent.UpdateProg = api;
if (status == "Released" || status == "Disabled" || status == "Draft")
{

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

Loading…
Cancel
Save