diff --git a/Tiobon.Core.Services/BASE/BaseServices.cs b/Tiobon.Core.Services/BASE/BaseServices.cs index ed09c770..45d71c1b 100644 --- a/Tiobon.Core.Services/BASE/BaseServices.cs +++ b/Tiobon.Core.Services/BASE/BaseServices.cs @@ -222,21 +222,21 @@ public class BaseServices : IBaseServ for (int i = 0; i < dt.Rows.Count; i++) { JObject item = - [ - 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("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 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("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) + }; tableColumn.Add(item); } JM_TableColumnT1.TableColumn = tableColumn; @@ -245,14 +245,13 @@ public class BaseServices : 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 @@ -985,10 +984,10 @@ public class BaseServices : IBaseServ var dt = await Db.Ado.GetDataTableAsync("SELECT TOP 1 * FROM " + entityType.GetEntityTableName() + " WHERE IsEnable=1"); - var MenuName = await Db.Ado.GetStringAsync($"SELECT MenuName FROM Ghrs_Menu WHERE MenuNo = '{menuName}'"); + var MenuName = await Db.Ado.GetStringAsync($"SELECT MenuName FROM Ghrs_Menu WHERE MenuNo = '{menuName}'"); //columns = columns.WhereIF(param.exportSet.ExFields.Any(), x => param.exportSet.ExFields.Contains(x.field)).ToList(); - - var path = await ReportHelper.ImportTemplate(Db, columns, dt, menuName); + + var path = await ReportHelper.ImportTemplate(Db, columns, dt, menuName); //var physicsPath = $"{Environment.CurrentDirectory}{Path.DirectorySeparatorChar}wwwroot"; diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs index 7f96760f..2f01b98a 100644 --- a/Tiobon.Core.Services/CommonServices.cs +++ b/Tiobon.Core.Services/CommonServices.cs @@ -1153,7 +1153,7 @@ public partial class CommonServices : BaseServices>, ICommon { if (x.searchOperator != null && x.searchOperator.Where(o => o.@operator == "Range").Any()) x.IsRange = 1; - }); + }); return new ServiceResult() { Success = true, Message = "查询成功", Data = result, }; } #endregion @@ -1177,16 +1177,18 @@ public partial class CommonServices : BaseServices>, ICommon switch (type) { case "Ghre_Course": - searchItem = [ - new JProperty("defaultHidden", true), - new JProperty("field","value"), - new JProperty("label","课程ID"), - ]; + 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","课程编号"), - ]; + 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>, 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 = [ - new JProperty("defaultHidden", true), - new JProperty("field","value"), - new JProperty("label","场景ID"), - ]; + 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","场景"), - ]; + 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>, 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; } diff --git a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs index 09f3aee8..c0460b99 100644 --- a/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs +++ b/Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs @@ -198,16 +198,16 @@ public class Ghre_CourseServices : BaseServices