Simon
/
Tiobon.Web.Core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1

Browse Source
master
xiaochanghai 10 months ago
parent d6dcf4ef6f
commit feea120763
4 changed files with 130 additions and 120 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 23
      Tiobon.Core.Services/BASE/BaseServices.cs
  2. 117
      Tiobon.Core.Services/CommonServices.cs
  3. 36
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  4. 26
      Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs

23
Tiobon.Core.Services/BASE/BaseServices.cs
Unescape View File

@ -222,21 +222,21 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
for (int i = 0; i < dt.Rows.Count; i++)
{
JObject item =
[
new JObject {
new JProperty("field", dt.Rows[i]["field"].ToString()),
new JProperty("label", dt.Rows[i]["label"].ToString()),
new JProperty("required",!string.IsNullOrWhiteSpace(dt.Rows[i]["required"].ToString())? Convert.ToBoolean(dt.Rows[i]["required"]):null),
new JProperty("editable",!string.IsNullOrWhiteSpace(dt.Rows[i]["editable"].ToString())? Convert.ToBoolean(dt.Rows[i]["editable"]):null),
new JProperty("rowNum",!string.IsNullOrWhiteSpace(dt.Rows[i]["rowNum"].ToString())? Convert.ToInt32(dt.Rows[i]["rowNum"]):null),
new JProperty("colNum",!string.IsNullOrWhiteSpace(dt.Rows[i]["colNum"].ToString())? Convert.ToInt32(dt.Rows[i]["colNum"]):null),
new JProperty("required", !string.IsNullOrWhiteSpace(dt.Rows[i]["required"].ToString()) ? Convert.ToBoolean(dt.Rows[i]["required"]) : null),
new JProperty("editable", !string.IsNullOrWhiteSpace(dt.Rows[i]["editable"].ToString()) ? Convert.ToBoolean(dt.Rows[i]["editable"]) : null),
new JProperty("rowNum", !string.IsNullOrWhiteSpace(dt.Rows[i]["rowNum"].ToString()) ? Convert.ToInt32(dt.Rows[i]["rowNum"]) : null),
new JProperty("colNum", !string.IsNullOrWhiteSpace(dt.Rows[i]["colNum"].ToString()) ? Convert.ToInt32(dt.Rows[i]["colNum"]) : null),
new JProperty("dataType", dt.Rows[i]["dataType"].ToString()),
new JProperty("elementType", dt.Rows[i]["elementType"].ToString()),
new JProperty("dataSource", dt.Rows[i]["dataSource"].ToString()),
new JProperty("defaultHidden", dt.Rows[i]["defaultHidden"].ToString()),
new JProperty("isPrimaryKey", !string.IsNullOrWhiteSpace(dt.Rows[i]["isPrimaryKey"].ToString())? Convert.ToBoolean(dt.Rows[i]["isPrimaryKey"]):null),
new JProperty("isSingleColumn",!string.IsNullOrWhiteSpace(dt.Rows[i]["isSingleColumn"].ToString())? Convert.ToInt32(dt.Rows[i]["isSingleColumn"]):null),
new JProperty("multipleSelect",!string.IsNullOrWhiteSpace(dt.Rows[i]["multipleSelect"].ToString())? Convert.ToBoolean(dt.Rows[i]["multipleSelect"]):null),
];
new JProperty("isPrimaryKey", !string.IsNullOrWhiteSpace(dt.Rows[i]["isPrimaryKey"].ToString()) ? Convert.ToBoolean(dt.Rows[i]["isPrimaryKey"]) : null),
new JProperty("isSingleColumn", !string.IsNullOrWhiteSpace(dt.Rows[i]["isSingleColumn"].ToString()) ? Convert.ToInt32(dt.Rows[i]["isSingleColumn"]) : null),
new JProperty("multipleSelect", !string.IsNullOrWhiteSpace(dt.Rows[i]["multipleSelect"].ToString()) ? Convert.ToBoolean(dt.Rows[i]["multipleSelect"]) : null)
};
tableColumn.Add(item);
}
JM_TableColumnT1.TableColumn = tableColumn;
@ -245,14 +245,13 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
#region JM_PageFormT1
dynamic JM_PageFormT1 = new ExpandoObject();
var pageForm = new JArray();
JObject pageFormItem =
[
JObject pageFormItem = new JObject {
new JProperty("disabled", false),
new JProperty("labelAlign", "right"),
new JProperty("labelCol", "{span: 6}"),
new JProperty("labelWidth",120),
new JProperty("layout", "horizontal")
];
};
sql = $@"SELECT [dbo].[FLangKeyToValue] (MKey, {body.langId}, MenuName) pageTitle,
IUDProcedure apiName

117
Tiobon.Core.Services/CommonServices.cs
Unescape View File

@ -1177,16 +1177,18 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
switch (type)
{
case "Ghre_Course":
searchItem = [
searchItem = new JObject
{
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","课程ID"),
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject
{
new JProperty("field","label"),
new JProperty("label","课程编号"),
];
};
TableColumn.Add(searchItem);
sql = "SELECT Id, CourseNo, CourseName FROM Ghre_Course WHERE IsEnable=1 AND Status='Released'";
@ -1196,34 +1198,37 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
for (int i = 0; i < dt.Rows.Count; i++)
{
item = [
item = new JObject {
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())),
new JProperty("label",dt.Rows[i]["CourseNo"].ToString()+"-"+dt.Rows[i]["CourseName"].ToString())
];
};
DT_TableDataT1.Add(item);
}
item = [
item = new JObject
{
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
break;
case "Ghre_CourseScene":
searchItem = [
searchItem = new JObject
{
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","场景ID"),
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject
{
new JProperty("field","label"),
new JProperty("label","场景"),
];
};
TableColumn.Add(searchItem);
sql = "SELECT Id, SceneNo, SceneName FROM Ghre_CourseScene WHERE IsEnable=1";
@ -1233,140 +1238,144 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
for (int i = 0; i < dt.Rows.Count; i++)
{
item = [
item = new JObject
{
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())),
new JProperty("label",dt.Rows[i]["SceneNo"].ToString()+"-"+dt.Rows[i]["SceneName"].ToString())
];
};
DT_TableDataT1.Add(item);
}
item = [
item = new JObject
{
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
break;
case "ScoreMethod":
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","value")
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject
{
new JProperty("field","label"),
new JProperty("label","label")
];
};
TableColumn.Add(searchItem);
item = [
item = new JObject {
new JProperty("value","Manual"),
new JProperty("label","人工评分")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","System"),
new JProperty("label","系统评分")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject
{
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",2),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
break;
case "DifficultyLevel":
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","value")
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject {
new JProperty("field","label"),
new JProperty("label","label")
];
};
TableColumn.Add(searchItem);
item = [
item = new JObject {
new JProperty("value","Easy"),
new JProperty("label","简单")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","Normal"),
new JProperty("label","普通")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","Hard"),
new JProperty("label","困难")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",3),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
break;
case "QuestionType":
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","value")
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject {
new JProperty("field","label"),
new JProperty("label","label")
];
};
TableColumn.Add(searchItem);
item = [
item = new JObject {
new JProperty("value","Single"),
new JProperty("label","单选题")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","Multiple"),
new JProperty("label","多选题")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","TrueOrFalse"),
new JProperty("label","判断题")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","Completion"),
new JProperty("label","填空题")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("value","ShortAnswer"),
new JProperty("label","简答题")
];
};
DT_TableDataT1.Add(item);
item = [
item = new JObject {
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",5),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
break;
}

36
Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
Unescape View File

@ -198,16 +198,16 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
DataTable dt;
string sql;
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","讲师ID"),
];
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject {
new JProperty("field","label"),
new JProperty("label","讲师名称"),
];
};
TableColumn.Add(searchItem);
sql = "SELECT Id, TeacherNo , TeacherName FROM Ghre_Teacher WHERE IsEnable=1 ";
@ -218,21 +218,21 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
for (int i = 0; i < dt.Rows.Count; i++)
{
item = [
item = new JObject {
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())),
new JProperty("label",dt.Rows[i]["TeacherNo"].ToString()+"-"+dt.Rows[i]["TeacherName"].ToString())
];
};
DT_TableDataT1.Add(item);
}
item = [
item = new JObject {
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
result.JM_TableColumnT1.TableColumn = TableColumn;
@ -483,16 +483,16 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
JObject item;
DataTable dt;
string sql;
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","课程ID"),
];
new JProperty("label","课程ID")
};
TableColumn.Add(searchItem);
searchItem = [
searchItem = new JObject {
new JProperty("field","label"),
new JProperty("label","课程名称"),
];
new JProperty("label","课程名称")
};
TableColumn.Add(searchItem);
sql = $"SELECT Id, CourseNo , CourseName FROM Ghre_Course WHERE Status ='{Consts.DIC_COURSE_STATUS.RELEASED}' AND IsEnable=1";
@ -506,21 +506,21 @@ public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, Ins
for (int i = 0; i < dt.Rows.Count; i++)
{
item = [
item = new JObject {
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())),
new JProperty("label", dt.Rows[i]["CourseName"].ToString() + "("+dt.Rows[i]["CourseNo"].ToString()+")")
];
};
DT_TableDataT1.Add(item);
}
item = [
item = new JObject {
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
result.JM_TableColumnT1.TableColumn = TableColumn;
result.DT_TableDataT1 = DT_TableDataT1;

26
Tiobon.Core.Services/Ghre/Ghre_ExamPaperServices.cs
Unescape View File

@ -907,16 +907,16 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';");
JObject item;
DataTable dt;
string sql;
searchItem = [
searchItem = new JObject {
new JProperty("defaultHidden", true),
new JProperty("field","value"),
new JProperty("label","试卷ID"),
];
new JProperty("field", "value"),
new JProperty("label", "试卷ID"),
};
TableColumn.Add(searchItem);
searchItem = [
new JProperty("field","label"),
new JProperty("label","试卷名称"),
];
searchItem = new JObject{
new JProperty("field", "label"),
new JProperty("label", "试卷名称"),
};
TableColumn.Add(searchItem);
sql = $"SELECT Id, PaperNo, PaperName FROM Ghre_ExamPaper WHERE LinkId='{linkId}' AND Status ='Released' AND IsEnable=1";
@ -927,21 +927,23 @@ delete from Ghre_ExamPaperQuestion WHERE ExamPaperId='{id}';");
for (int i = 0; i < dt.Rows.Count; i++)
{
item = [
item = new JObject
{
new JProperty("value",long.Parse(dt.Rows[i]["Id"].ToString())),
new JProperty("label", dt.Rows[i]["PaperName"].ToString() + "("+dt.Rows[i]["PaperNo"].ToString()+")")
];
};
DT_TableDataT1.Add(item);
}
item = [
item = new JObject
{
new JProperty("ListMax",100),
new JProperty("ListMin",10),
new JProperty("PageNum",1),
new JProperty("PageSize",99999),
new JProperty("TotalCount",dt.Rows.Count),
new JProperty("UIType","Auto")
];
};
DT_TablePageInfoT1.Add(item);
result.JM_TableColumnT1.TableColumn = TableColumn;
result.DT_TableDataT1 = DT_TableDataT1;

Write Preview
Loading…
Cancel
Save