diff --git a/Tiobon.Core.Api/Controllers/CommonController.cs b/Tiobon.Core.Api/Controllers/CommonController.cs
index 7b022355..e39c1c05 100644
--- a/Tiobon.Core.Api/Controllers/CommonController.cs
+++ b/Tiobon.Core.Api/Controllers/CommonController.cs
@@ -46,6 +46,17 @@ public class CommonController : BaseApiController
{
return await _commonServices.GetModuleInfoAsync(param);
}
+
+ ///
+ /// 获取模块信息接口
+ ///
+ ///
+ ///
+ [HttpPost, Route("GetESSModuleInfo")]
+ public async Task> GetESSModuleInfoAsync([FromBody] ModuleParam param)
+ {
+ return await _commonServices.GetESSModuleInfoAsync(param);
+ }
#endregion
#region 获取模块信息接口
diff --git a/Tiobon.Core.Api/Tiobon.Core.xml b/Tiobon.Core.Api/Tiobon.Core.xml
index 54df935d..2680aa80 100644
--- a/Tiobon.Core.Api/Tiobon.Core.xml
+++ b/Tiobon.Core.Api/Tiobon.Core.xml
@@ -259,6 +259,13 @@
+
+
+ 获取模块信息接口
+
+
+
+
获取模块信息接口
diff --git a/Tiobon.Core.IServices/ICommonServices.cs b/Tiobon.Core.IServices/ICommonServices.cs
index 1ead0442..06073c27 100644
--- a/Tiobon.Core.IServices/ICommonServices.cs
+++ b/Tiobon.Core.IServices/ICommonServices.cs
@@ -22,6 +22,8 @@ public interface ICommonServices : IBaseServices>
Task> GetModuleInfoAsync([FromBody] ModuleParam param);
+ Task> GetESSModuleInfoAsync([FromBody] ModuleParam param);
+
Task> GetSelectAsync(string type, string keyWords);
Task> ExportExcelAsync(QueryExport param);
diff --git a/Tiobon.Core.Model/ViewModels/Menu.cs b/Tiobon.Core.Model/ViewModels/Menu.cs
index 36566a3b..56a1e101 100644
--- a/Tiobon.Core.Model/ViewModels/Menu.cs
+++ b/Tiobon.Core.Model/ViewModels/Menu.cs
@@ -53,6 +53,16 @@ public class ModuleReturn
public DT_Procedure DT_Procedure { get; set; } = new DT_Procedure();
}
+public class ModuleESSReturn
+{
+ public JM_PageControlT1 JM_PageControlT1 { get; set; } = new JM_PageControlT1();
+ public JM_TableColumnT1 DT_TableColumnT1 { get; set; } = new JM_TableColumnT1();
+ public JM_TableColumnT1 DT_TableDataSearchT1 { get; set; } = new JM_TableColumnT1();
+ public List DT_PageMutiMsg { get; set; }
+
+ public DT_Procedure DT_Procedure { get; set; } = new DT_Procedure();
+}
+
public class JM_PageControlT1
{
public List Toolbar { get; set; }
diff --git a/Tiobon.Core.Services/CommonServices.cs b/Tiobon.Core.Services/CommonServices.cs
index 6feb3e30..7575d38a 100644
--- a/Tiobon.Core.Services/CommonServices.cs
+++ b/Tiobon.Core.Services/CommonServices.cs
@@ -279,14 +279,14 @@ public partial class CommonServices : BaseServices>, ICommon
AND b.elementType = 'FnKey') order by fnKeySeq";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- result.JM_PageControlT1.Toolbar = DbAccess.QueryList(sql);
+ result.JM_PageControlT1.Toolbar = await Db.Ado.SqlQueryAsync(sql);
#endregion
#region 定义表格页面的栏位, 含 表格栏位, 常用查询栏位, 高级查询栏位,可编辑栏位
- Db.Ado.BeginTran();
+ await Db.Ado.BeginTranAsync();
sql = @"IF OBJECT_ID('tempdb.[dbo].[#TmpInitPageSettingQuery]') IS NOT NULL DROP TABLE [dbo].[#TmpInitPageSettingQuery]
CREATE TABLE [dbo].[#TmpInitPageSettingQuery](pageColumnID int) alter TABLE [dbo].[#TmpInitPageSettingQuery]
add [elementType] [nvarchar](1000) , [field] [nvarchar](1000) ,[label] [nvarchar](1000) ,
@@ -300,7 +300,7 @@ public partial class CommonServices : BaseServices>, ICommon
[selfDefine] [nvarchar](2000) , [selectUI] [nvarchar](1000) , [isPrimaryKey] [nvarchar](1000) ,
isSorted nvarchar(10),isHidden nvarchar(10),isSearched nvarchar(10),sortNo int,
[searchOperator] nvarchar(max),searchColumnDefaultValue nvarchar(1000),AppColumnType nvarchar(100)";
- int count = Db.Ado.ExecuteCommand(sql);
+ int count = await Db.Ado.ExecuteCommandAsync(sql);
sql = @"SELECT count (1) UserHasSetting
@@ -312,7 +312,7 @@ public partial class CommonServices : BaseServices>, ICommon
AND a.IsEnable = 1
AND a.PageSettingQueryId = b.PageSettingQueryId";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- int UserHasSetting = Db.Ado.GetInt(sql);
+ int UserHasSetting = await Db.Ado.GetIntAsync(sql);
if (UserHasSetting == 0)
{
sql = @"INSERT INTO [dbo].[#TmpInitPageSettingQuery]
@@ -367,7 +367,7 @@ public partial class CommonServices : BaseServices>, ICommon
AND IsEnable = 1
ORDER BY SortNo";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- count = Db.Ado.ExecuteCommand(sql);
+ count = await Db.Ado.ExecuteCommandAsync(sql);
}
else
{
@@ -491,7 +491,7 @@ public partial class CommonServices : BaseServices>, ICommon
AND kk.elementtype = Ghrs_PageSettingQuery.elementtype)
ORDER BY SortNo ";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- count = Db.Ado.ExecuteCommand(sql);
+ count = await Db.Ado.ExecuteCommandAsync(sql);
}
@@ -791,7 +791,7 @@ public partial class CommonServices : BaseServices>, ICommon
SET width = 50
WHERE elementType = 'FnKey' OR field = 'Muti';";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- count = Db.Ado.ExecuteCommand(sql);
+ count = await Db.Ado.ExecuteCommandAsync(sql);
sql = @"select pageColumnID,elementType, field,label,meky, multipleSelect, dataType,
required, palceholder, dataSourceType,dataSource, sortable, sortOrder,
@@ -811,7 +811,7 @@ public partial class CommonServices : BaseServices>, ICommon
from [dbo].[#TmpInitPageSettingQuery]
order by sortno asc";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- var TableColumn = Db.Ado.SqlQuery(sql);
+ var TableColumn = await Db.Ado.SqlQueryAsync(sql);
result.JM_TableColumnT1.TableColumn = Mapper.Map(TableColumn).ToANew>();
result.JM_TableColumnT1.TableColumn = result.JM_TableColumnT1.TableColumn.Where(x => x.field != "DetailYN" && x.field != "Muti").ToList();
result.JM_TableColumnT1.TableColumn.ForEach(x =>
@@ -823,7 +823,7 @@ public partial class CommonServices : BaseServices>, ICommon
if (x.multipleSearchValue == "true")
x.searchColumnDefaultValue = new List();
});
- Db.Ado.CommitTran();
+ await Db.Ado.CommitTranAsync();
sql = @"SELECT Langkey field,
CASE {2}
@@ -842,11 +842,11 @@ public partial class CommonServices : BaseServices>, ICommon
WHERE IsEnable = 1
AND (LangKey LIKE 'GHR_Page%' OR LangKey LIKE 'GHR_Common%')";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- result.DT_PageMutiMsg = Db.Ado.SqlQuery(sql);
+ result.DT_PageMutiMsg = await Db.Ado.SqlQueryAsync(sql);
sql = "select QueryProcedure, EditProcedure, IUDProcedure from Ghrs_Menu where MenuNo='{0}'";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
- DataTable dt = Db.Ado.GetDataTable(sql);
+ DataTable dt = await Db.Ado.GetDataTableAsync(sql);
if (dt.Rows.Count > 0)
{
result.DT_Procedure.QueryProcedure = dt.Rows[0]["QueryProcedure"].ToString();
@@ -1085,7 +1085,7 @@ public partial class CommonServices : BaseServices>, ICommon
AND A.IsEnable = 1
AND B.IsEnable = 1
AND B.RoleNo = 'TrainingExamScore'";
- var toolbarRoles = DbAccess.QueryList(sql);
+ var toolbarRoles = await Db.Ado.SqlQueryAsync(sql);
if (toolbarRoles != null && toolbarRoles.Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@@ -1126,6 +1126,26 @@ public partial class CommonServices : BaseServices>, ICommon
#endregion
return new ServiceResult() { Success = true, Message = "查询成功", Data = result, };
}
+
+ ///
+ /// 获取模块信息
+ ///
+ ///
+ ///
+ public async Task> GetESSModuleInfoAsync([FromBody] ModuleParam param)
+ {
+ var result = new ModuleESSReturn();
+
+ var result1 = await GetModuleInfoAsync(param);
+ result.JM_PageControlT1 = result1.Data.JM_PageControlT1;
+ result.DT_TableColumnT1 = result1.Data.JM_TableColumnT1;
+ result.DT_PageMutiMsg = result1.Data.DT_PageMutiMsg;
+ result.DT_Procedure = result1.Data.DT_Procedure;
+ result.DT_TableDataSearchT1 = result.DT_TableColumnT1;
+
+ result.DT_TableDataSearchT1.TableColumn = result.DT_TableDataSearchT1.TableColumn.Where(x => x.searchable == true).ToList();
+ return new ServiceResult() { Success = true, Message = "查询成功", Data = result, };
+ }
#endregion
#region 获取通用列表下拉
diff --git a/Tiobon.Core/Tiobon.Core.xml b/Tiobon.Core/Tiobon.Core.xml
index 54df935d..2680aa80 100644
--- a/Tiobon.Core/Tiobon.Core.xml
+++ b/Tiobon.Core/Tiobon.Core.xml
@@ -259,6 +259,13 @@
+
+
+ 获取模块信息接口
+
+
+
+
获取模块信息接口