master
xiaochanghai 5 months ago
parent 243761c16e
commit 4520a040ed
  1. 4
      Tiobon.Core.Api/appsettings.json
  2. 10
      Tiobon.Core.Services/CommonServices.cs
  3. 2
      Tiobon.Core.Services/Ghre/Ghre_CourseWareServices.cs
  4. 2
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs

@ -107,8 +107,8 @@
"ConnId": "WMTiobon_MSSQL_Main", "ConnId": "WMTiobon_MSSQL_Main",
"DBType": 1, "DBType": 1,
"Enabled": true, "Enabled": true,
"Connection1": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;", "Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR30;Encrypt=True;TrustServerCertificate=True;",
"Connection": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR5_TY;Encrypt=True;TrustServerCertificate=True;", "Connection1": "Data Source=47.99.54.186;User ID=GHR;Password=Tiobon20190101;Database=GHR5_TY;Encrypt=True;TrustServerCertificate=True;",
"ProviderName": "System.Data.SqlClient" "ProviderName": "System.Data.SqlClient"
}, },
{ {

@ -1052,6 +1052,16 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
case "F_CourseScene": case "F_CourseScene":
index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "BatchUpdateYN"); index = result.JM_PageControlT1.Toolbar.FindIndex(x => x.fnKey == "BatchUpdateYN");
result.JM_PageControlT1.Toolbar.RemoveAt(index); result.JM_PageControlT1.Toolbar.RemoveAt(index);
result.JM_PageControlT1.Toolbar.Insert(0, new Toolbar()
{
display = true,
fnKey = "TBD4YN",
fnTitle = "课程顺序",
fnType = "row",
icon = "ghr-publish",
position = "left"
});
break; break;
case "F_SchoolManage": case "F_SchoolManage":
case "F_WorkLicenseManage": case "F_WorkLicenseManage":

@ -180,7 +180,7 @@ public class Ghre_CourseWareServices : BaseServices<Ghre_CourseWare, Ghre_Course
x.StudyDuration = $"{x.Hours}小时{x.Minutes}分钟"; x.StudyDuration = $"{x.Hours}小时{x.Minutes}分钟";
x.SourceLabel = await GetParaLabel("CourseWareSource", x.Source); x.SourceLabel = await GetParaLabel("CourseWareSource", x.Source);
x.Attachments = attachments.Where(a => a.CourseWareId == x.Id && a.AttachFileExtension != "http").OrderBy(x => x.SortNo).ToList(); x.Attachments = attachments.Where(a => a.CourseWareId == x.Id && a.AttachFileExtension != "http").OrderBy(x => x.SortNo).ToList();
x.Links = attachments.Where(x => x.AttachFileExtension == "http") x.Links = attachments.Where(a => a.CourseWareId == x.Id && a.AttachFileExtension == "http").OrderBy(x => x.SortNo)
.Select(x => new Ghre_CourseWareLink() .Select(x => new Ghre_CourseWareLink()
{ {
LinkName = x.AttachmentName, LinkName = x.AttachmentName,

@ -869,7 +869,7 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';");
{ {
if (model.baseData.PassScore == 0) if (model.baseData.PassScore == 0)
throw new Exception("及格分需大于0!"); throw new Exception("及格分需大于0!");
if (model.baseData.PassScore >= model.baseData.TotalScore) if (model.baseData.PassScore > model.baseData.TotalScore)
throw new Exception("及格分需小于卷面总分!"); throw new Exception("及格分需小于卷面总分!");
if (model.baseData.AnswerTime <= 0) if (model.baseData.AnswerTime <= 0)

Loading…
Cancel
Save