新增通用查询菜单表单信息接口

master
xiaochanghai 1 year ago
parent f6bfe094c9
commit c01727934c
  1. 11
      Tiobon.Core.Api/Controllers/Base/BaseController.cs
  2. 15
      Tiobon.Core.Api/Tiobon.Core.Model.xml
  3. 7
      Tiobon.Core.Api/Tiobon.Core.xml
  4. 28
      Tiobon.Core.Common/Attribute/QueryFilter.cs
  5. 2
      Tiobon.Core.IServices/BASE/IBaseServices.cs
  6. 15
      Tiobon.Core.Model/View/Ghre/Ghre_Course.Dto.View.cs
  7. 12
      Tiobon.Core.Model/ViewModels/Extend/ServiceFormResult.cs
  8. 169
      Tiobon.Core.Services/BASE/BaseServices.cs
  9. 37
      Tiobon.Core.Services/Ghre/Ghre_CourseServices.cs
  10. 15
      Tiobon.Core/Tiobon.Core.Model.xml
  11. 7
      Tiobon.Core/Tiobon.Core.xml

@ -83,6 +83,17 @@ public class BaseController<IServiceBase, TEntity, TEntityDto, TInsertDto, TEdit
else
return Success<TEntityDto>(entity, "获取成功");
}
/// <summary>
/// 查询菜单表单信息
/// </summary>
/// <param name="body">body</param>
/// <returns></returns>
[HttpPost("QueryForm")]
public virtual async Task<ServiceFormResult> QueryForm([FromBody] QueryForm body)
{
var entity = await InvokeServiceAsync("QueryForm", [body]) as ServiceFormResult;
return entity;
}
#endregion
#region 新增

@ -4019,6 +4019,21 @@
Ghre_Course(Dto.View)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.CourseClassName">
<summary>
课程分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_CourseClassDto">
<summary>
课程分类(Dto.View)

@ -93,6 +93,13 @@
<param name="Id">主键ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.QueryForm(Tiobon.Core.Common.QueryForm)">
<summary>
查询菜单表单信息
</summary>
<param name="body">body</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.Insert(`3)">
<summary>
新增数据

@ -102,3 +102,31 @@ public class JsonParam
public string token { get; set; }
}
/// <summary>
/// 动态查询条件
/// </summary>
public class QueryForm
{
public string doType { get; set; }
public long id { get; set; }
public int langId { get; set; }
public string menuName { get; set; }
public string token { get; set; }
public string procName { get; set; }
public string timestamp { get; set; }
public string userId { get; set; }
private JObject _jsonParam;
/// <summary>
/// 查询条件( 例如:id = 1 and name = 小明)
/// </summary>
public JObject jsonParam
{
get { return _jsonParam; }
set
{
_jsonParam = value;
}
}
}

@ -92,6 +92,8 @@ namespace Tiobon.Core.IServices.BASE
Task<TEntityDto> QueryById(object objId, bool blnUseCache = false);
Task<List<TEntityDto>> QueryByIDs(object[] lstIds);
Task<ServiceFormResult> QueryForm(QueryForm body);
Task<long> Add(TInsertDto model);
Task<List<long>> Add(List<TInsertDto> listEntity);

@ -23,5 +23,20 @@ namespace Tiobon.Core.Model.Models
/// </summary>
public class Ghre_CourseDto : Ghre_Course
{
/// <summary>
/// 课程分类
/// </summary>
public string CourseClassName { get; set; }
/// <summary>
/// 创建信息
/// </summary>
public string CreateDataInfo { get; set; }
/// <summary>
/// 修改信息
/// </summary>
public string UpdateDataInfo { get; set; }
}
}

@ -0,0 +1,12 @@
using System.Dynamic;
namespace Tiobon.Core.Model;
public class ServiceFormResult
{
public int code { get; set; } = 0;
public string message { get; set; }
public dynamic result { get; set; } = new ExpandoObject();
public string type { get; set; } = "success";
}

@ -1,7 +1,10 @@
using System.Data;
using System.Dynamic;
using System.Linq.Expressions;
using AgileObjects.AgileMapper;
using Microsoft.AspNetCore.Http;
using Newtonsoft.Json.Linq;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
using SqlSugar;
using Tiobon.Core.Common;
using Tiobon.Core.Common.Caches;
@ -124,6 +127,172 @@ public class BaseServices<TEntity, TEntityDto, TInsertDto, TEditDto> : IBaseServ
return Mapper.Map(data).ToANew<List<TEntityDto>>();
}
public async Task<ServiceFormResult> QueryForm(QueryForm body)
{
var result = new ServiceFormResult();
var data = await BaseDal.QueryById(body.id);
var dto = Mapper.Map(data).ToANew<TEntityDto>();
string sql = string.Empty;
var dt = new DataTable();
Type entityType = typeof(TEntity);
sql = @$"DECLARE @langId INT = '{body.langId}',@ID BIGINT = '{body.id}';
SELECT *,
isnull
((SELECT CASE WHEN @langId = 1 THEN UserName ELSE UserEname END
FROM Ghrs_User kk
WHERE kk.UserId = a.CreateBy),
'')
+ ' '
+ [dbo].[FLangKeyToValue] ('GHR_Common_000078', @langId, ' ')
+ ' '
+ CONVERT (NVARCHAR (16), CreateTime, 121)
+ ' '
+ [dbo].[FLangKeyToValue] ('GHR_Common_000079', @langId, ' ')
CreateDataInfo,
isnull
((SELECT CASE WHEN @langId = 1 THEN UserName ELSE UserEname END
FROM Ghrs_User kk
WHERE kk.UserId = a.UpdateBy),
'')
+ ' '
+ [dbo].[FLangKeyToValue] ('GHR_Common_000078', @langId, '于')
+ ' '
+ CONVERT (NVARCHAR (16), UpdateTime, 121)
+ ' '
+ [dbo].[FLangKeyToValue]
('GHR_Common_000080', @langId, ' ')
UpdateDataInfo
FROM {entityType.GetEntityTableName()} a
WHERE a.Id = @ID";
result.result.DT_TableDataT1 = Db.Ado.SqlQuery<TEntityDto>(sql);
#region JM_PageFormActionsT1
dynamic JM_PageFormActionsT1 = new ExpandoObject();
var toolbars = new JArray();
sql = @$"SELECT field fnKey, [dbo].[FLangKeyToValue] (mkey, {body.langId}, label) fnTitle, icon
FROM Ghrs_PageSettingEdit
WHERE IsEnable = 1 AND pageNo = '{body.menuName}' AND elementType = 'FnKey'";
dt = await Db.Ado.GetDataTableAsync(sql);
for (int i = 0; i < dt.Rows.Count; i++)
{
JObject item =
[
new JProperty("fnKey", dt.Rows[i]["fnKey"].ToString()),
new JProperty("fnTitle", dt.Rows[i]["fnTitle"].ToString()),
new JProperty("icon", dt.Rows[i]["icon"].ToString()),
new JProperty("display", true)
];
toolbars.Add(item);
}
JM_PageFormActionsT1.Toolbar = toolbars;
#endregion
#region JM_TableColumnT1
dynamic JM_TableColumnT1 = new ExpandoObject();
var tableColumn = new JArray();
sql = @$"SELECT field,
[dbo].[FLangKeyToValue] (mkey, {body.langId}, label)
label,
required,
editable,
rowNum,
colNum,
elementType,
dbo.FS_GetdataSourceBySet
(dataSource, APIDataSourceType, Ghrs_PageSettingEdit.APIDataSourceID)
dataSource,
defaultHidden,
isPrimaryKey,
isSingleColumn
FROM Ghrs_PageSettingEdit
WHERE IsEnable = 1
AND pageNo = '{body.menuName}'
AND elementType NOT IN ('FnKey', 'PageGroup');";
dt = await Db.Ado.GetDataTableAsync(sql);
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("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", dt.Rows[i]["isPrimaryKey"].ToString()),
new JProperty("isSingleColumn",!string.IsNullOrWhiteSpace(dt.Rows[i]["isSingleColumn"].ToString())? Convert.ToInt32(dt.Rows[i]["isSingleColumn"]):null),
];
tableColumn.Add(item);
}
JM_TableColumnT1.TableColumn = tableColumn;
#endregion
#region JM_PageFormT1
dynamic JM_PageFormT1 = new ExpandoObject();
var pageForm = new JArray();
JObject pageFormItem =
[
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
FROM Ghrs_Menu
WHERE MenuNo = '{body.menuName}' AND IsEnable = 1";
dt = await Db.Ado.GetDataTableAsync(sql);
if (dt.Rows.Count > 0)
{
pageFormItem.Add(new JProperty("pageTitle", dt.Rows[0]["pageTitle"].ToString()));
pageFormItem.Add(new JProperty("apiName", dt.Rows[0]["apiName"].ToString()));
}
pageForm.Add(pageFormItem);
JM_PageFormT1.PageForm = pageForm;
#endregion
#region DT_PageMutiMsg
var DT_PageMutiMsg = new List<DT_PageMutiMsg>();
sql = $@"SELECT Langkey field,
CASE {body.langId}
WHEN 1 THEN isnull (Value01, LangValue)
WHEN 2 THEN isnull (Value02, LangValue)
WHEN 3 THEN isnull (Value03, LangValue)
WHEN 4 THEN isnull (Value04, LangValue)
WHEN 5 THEN isnull (Value05, LangValue)
WHEN 6 THEN isnull (Value06, LangValue)
WHEN 7 THEN isnull (Value07, LangValue)
WHEN 8 THEN isnull (Value08, LangValue)
WHEN 9 THEN isnull (Value09, LangValue)
WHEN 10 THEN isnull (Value10, LangValue)
END label
FROM Ghrs_LangKey
WHERE (LangKey LIKE 'GHR_Page%' OR LangKey LIKE 'GHR_Common%')
AND IsEnable = 1";
DT_PageMutiMsg = Db.Ado.SqlQuery<DT_PageMutiMsg>(sql);
#endregion
result.result.JM_PageFormActionsT1 = JM_PageFormActionsT1;
result.result.JM_TableColumnT1 = JM_TableColumnT1;
result.result.JM_PageFormT1 = JM_PageFormT1;
result.result.DT_PageMutiMsg = DT_PageMutiMsg;
return result;
}
#region 新增
/// <summary>

@ -3,19 +3,42 @@ using Tiobon.Core.IServices;
using Tiobon.Core.Model.Models;
using Tiobon.Core.Services.BASE;
using Tiobon.Core.IRepository.Base;
using Tiobon.Core.Common;
using Tiobon.Core.Model;
using AgileObjects.AgileMapper;
namespace Tiobon.Core.Services
namespace Tiobon.Core.Services;
/// <summary>
/// Ghre_Course (服务)
/// </summary>
public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, InsertGhre_CourseInput, EditGhre_CourseInput>, IGhre_CourseServices
{
/// <summary>
/// Ghre_Course (服务)
/// </summary>
public class Ghre_CourseServices : BaseServices<Ghre_Course, Ghre_CourseDto, InsertGhre_CourseInput, EditGhre_CourseInput>, IGhre_CourseServices
{
private readonly IBaseRepository<Ghre_Course> _dal;
public Ghre_CourseServices(IBaseRepository<Ghre_Course> dal)
private IGhre_CourseClassServices _ghre_CourseClassServices;
public Ghre_CourseServices(IBaseRepository<Ghre_Course> dal,
IGhre_CourseClassServices ghre_CourseClassServices)
{
this._dal = dal;
base.BaseDal = dal;
_ghre_CourseClassServices = ghre_CourseClassServices;
}
public override async Task<ServicePageResult<Ghre_CourseDto>> QueryFilterPage(QueryBody body)
{
var data = await BaseDal.QueryFilterPage(body);
var list = Mapper.Map(data.result.DT_TableDataT1).ToANew<List<Ghre_CourseDto>>();
var classIds = list.Select(x => x.CourseClassId).Distinct().ToList();
var classs = await _ghre_CourseClassServices.Query(x => classIds.Contains(x.Id));
list.ForEach(x =>
{
if (x.CourseClassId != null)
x.CourseClassName = classs.FirstOrDefault(o => o.Id == x.CourseClassId)?.ClassName;
});
return new ServicePageResult<Ghre_CourseDto>(body.pageNum, data.result.DT_TablePageInfoT1.TotalCount, body.pageSize, list);
}
}

@ -4019,6 +4019,21 @@
Ghre_Course(Dto.View)
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.CourseClassName">
<summary>
课程分类
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.CreateDataInfo">
<summary>
创建信息
</summary>
</member>
<member name="P:Tiobon.Core.Model.Models.Ghre_CourseDto.UpdateDataInfo">
<summary>
修改信息
</summary>
</member>
<member name="T:Tiobon.Core.Model.Models.Ghre_CourseClassDto">
<summary>
课程分类(Dto.View)

@ -93,6 +93,13 @@
<param name="Id">主键ID</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.QueryForm(Tiobon.Core.Common.QueryForm)">
<summary>
查询菜单表单信息
</summary>
<param name="body">body</param>
<returns></returns>
</member>
<member name="M:Tiobon.Core.Controllers.BaseController`5.Insert(`3)">
<summary>
新增数据

Loading…
Cancel
Save