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

新增获取ESS模块信息接口

Browse Source
master
xiaochanghai 10 months ago
parent b8df34006e
commit defb5651f7
6 changed files with 69 additions and 12 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. 11
      Tiobon.Core.Api/Controllers/CommonController.cs
  2. 7
      Tiobon.Core.Api/Tiobon.Core.xml
  3. 2
      Tiobon.Core.IServices/ICommonServices.cs
  4. 10
      Tiobon.Core.Model/ViewModels/Menu.cs
  5. 44
      Tiobon.Core.Services/CommonServices.cs
  6. 7
      Tiobon.Core/Tiobon.Core.xml

11
Tiobon.Core.Api/Controllers/CommonController.cs
Unescape View File

@ -46,6 +46,17 @@ public class CommonController : BaseApiController
{
return await _commonServices.GetModuleInfoAsync(param);
}
/// <summary>
/// 获取模块信息接口
/// </summary>
/// <param name="param"></param>
/// <returns></returns>
[HttpPost, Route("GetESSModuleInfo")]
public async Task<ServiceResult<ModuleESSReturn>> GetESSModuleInfoAsync([FromBody] ModuleParam param)
{
return await _commonServices.GetESSModuleInfoAsync(param);
}
#endregion
#region 获取模块信息接口

7
Tiobon.Core.Api/Tiobon.Core.xml
Unescape View File

@ -259,6 +259,13 @@
<param name="param"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetESSModuleInfoAsync(Tiobon.Core.Model.ModuleParam)">
<summary>
获取模块信息接口
</summary>
<param name="param"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetSelectAsync(System.String,System.String)">
<summary>
获取模块信息接口

2
Tiobon.Core.IServices/ICommonServices.cs
Unescape View File

@ -22,6 +22,8 @@ public interface ICommonServices : IBaseServices<RootEntityTkey<int>>
Task<ServiceResult<ModuleReturn>> GetModuleInfoAsync([FromBody] ModuleParam param);
Task<ServiceResult<ModuleESSReturn>> GetESSModuleInfoAsync([FromBody] ModuleParam param);
Task<ServiceResult<CommonSelect>> GetSelectAsync(string type, string keyWords);
Task<ServiceResult<QueryExportReturn>> ExportExcelAsync(QueryExport param);

10
Tiobon.Core.Model/ViewModels/Menu.cs
Unescape View File

@ -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> DT_PageMutiMsg { get; set; }
public DT_Procedure DT_Procedure { get; set; } = new DT_Procedure();
}
public class JM_PageControlT1
{
public List<Toolbar> Toolbar { get; set; }

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

@ -279,14 +279,14 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, 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<Toolbar>(sql);
result.JM_PageControlT1.Toolbar = await Db.Ado.SqlQueryAsync<Toolbar>(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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, 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<RootEntityTkey<int>>, ICommon
from [dbo].[#TmpInitPageSettingQuery]
order by sortno asc";
sql = string.Format(sql, param.menuName, App.User.ID, param.langId);
var TableColumn = Db.Ado.SqlQuery<TableColumn1>(sql);
var TableColumn = await Db.Ado.SqlQueryAsync<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 =>
@ -823,7 +823,7 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
if (x.multipleSearchValue == "true")
x.searchColumnDefaultValue = new List<string>();
});
Db.Ado.CommitTran();
await Db.Ado.CommitTranAsync();
sql = @"SELECT Langkey field,
CASE {2}
@ -842,11 +842,11 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, 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<DT_PageMutiMsg>(sql);
result.DT_PageMutiMsg = await Db.Ado.SqlQueryAsync<DT_PageMutiMsg>(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<RootEntityTkey<int>>, ICommon
AND A.IsEnable = 1
AND B.IsEnable = 1
AND B.RoleNo = 'TrainingExamScore'";
var toolbarRoles = DbAccess.QueryList<ToolbarRole>(sql);
var toolbarRoles = await Db.Ado.SqlQueryAsync<ToolbarRole>(sql);
if (toolbarRoles != null && toolbarRoles.Any())
result.JM_PageControlT1.Toolbar.Add(new Toolbar()
{
@ -1126,6 +1126,26 @@ public partial class CommonServices : BaseServices<RootEntityTkey<int>>, ICommon
#endregion
return new ServiceResult<ModuleReturn>() { Success = true, Message = "查询成功", Data = result, };
}
/// <summary>
/// 获取模块信息
/// </summary>
/// <param name="param"></param>
/// <returns></returns>
public async Task<ServiceResult<ModuleESSReturn>> 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<ModuleESSReturn>() { Success = true, Message = "查询成功", Data = result, };
}
#endregion
#region 获取通用列表下拉

7
Tiobon.Core/Tiobon.Core.xml
Unescape View File

@ -259,6 +259,13 @@
<param name="param"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetESSModuleInfoAsync(Tiobon.Core.Model.ModuleParam)">
<summary>
获取模块信息接口
</summary>
<param name="param"></param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.CommonController.GetSelectAsync(System.String,System.String)">
<summary>
获取模块信息接口

Write Preview
Loading…
Cancel
Save