@@ -400,7 +400,7 @@ namespace YhCore.Service.Impl
|
|||||||
|
|
||||||
#region 审核角色流程
|
#region 审核角色流程
|
||||||
|
|
||||||
public async Task<List<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit)
|
public async Task<PageVO<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit)
|
||||||
{
|
{
|
||||||
var resultList = (await _flowinfo.FindAsync(m => m.flowType == flowType && m.schSerID == schSerId)).ToList();
|
var resultList = (await _flowinfo.FindAsync(m => m.flowType == flowType && m.schSerID == schSerId)).ToList();
|
||||||
|
|
||||||
@@ -422,8 +422,8 @@ namespace YhCore.Service.Impl
|
|||||||
if (!string.IsNullOrEmpty(name))
|
if (!string.IsNullOrEmpty(name))
|
||||||
resultList = resultList.Where(m => m.flowname != null && m.flowname.IndexOf(name) >= 0).ToList();
|
resultList = resultList.Where(m => m.flowname != null && m.flowname.IndexOf(name) >= 0).ToList();
|
||||||
|
|
||||||
// 旧 ListFlow 的 Data 是纯数组(字段 SerID/flowname/deptid/typeid/enable/enablename/miaoshu/deitdate/ChaoSend/StepSend/WYPageGG 原样大小写),无总数包装
|
var ordered = resultList.OrderBy(m => m.SerID).ToList();
|
||||||
return resultList.OrderBy(m => m.SerID).Skip(pageSize * pageIndex).Take(pageSize)
|
var items = ordered.Skip(pageSize * pageIndex).Take(pageSize)
|
||||||
.Select(item => new SHRoleFlowListItem
|
.Select(item => new SHRoleFlowListItem
|
||||||
{
|
{
|
||||||
SerID = item.SerID.ToString(),
|
SerID = item.SerID.ToString(),
|
||||||
@@ -439,6 +439,8 @@ namespace YhCore.Service.Impl
|
|||||||
WYPageGG = item.WYPageGG,
|
WYPageGG = item.WYPageGG,
|
||||||
})
|
})
|
||||||
.ToList();
|
.ToList();
|
||||||
|
|
||||||
|
return PageVO<SHRoleFlowListItem>.Of(items, ordered.Count, pageIndex, pageSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task<string> EditFlowAsync(Common_flowinfo model)
|
public async Task<string> EditFlowAsync(Common_flowinfo model)
|
||||||
|
|||||||
@@ -31,8 +31,7 @@ namespace YhCore.Service.Interfaces
|
|||||||
Task<string> DelSHRoleAsync(string schSerId, List<decimal?> listSHRoleId);
|
Task<string> DelSHRoleAsync(string schSerId, List<decimal?> listSHRoleId);
|
||||||
|
|
||||||
// ---- 审核角色流程 ----
|
// ---- 审核角色流程 ----
|
||||||
/// <summary>旧 ListFlow 的 Data 为纯数组(非分页对象),此处保持裸 List 对齐旧 data 内容。</summary>
|
Task<PageVO<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit);
|
||||||
Task<List<SHRoleFlowListItem>> ListFlowAsync(string name, int pageSize, int pageIndex, string schSerId, int flowType, bool edit);
|
|
||||||
Task<string> EditFlowAsync(Common_flowinfo model);
|
Task<string> EditFlowAsync(Common_flowinfo model);
|
||||||
Task<string> StepCreateOfSHRoleAsync(Common_flowstep model);
|
Task<string> StepCreateOfSHRoleAsync(Common_flowstep model);
|
||||||
Task<SHRoleStepInfo> GetStepInfoAsync(string schSerId, decimal flowid);
|
Task<SHRoleStepInfo> GetStepInfoAsync(string schSerId, decimal flowid);
|
||||||
|
|||||||
@@ -118,9 +118,9 @@ namespace YhCore.WebApi.Controllers.Api.DocPrint
|
|||||||
|
|
||||||
#region 审核角色流程
|
#region 审核角色流程
|
||||||
|
|
||||||
/// <summary>审核流程列表(旧 ListFlow;data 与旧 Data 一致为纯数组,字段大小写原样)。</summary>
|
/// <summary>审核流程列表(旧 ListFlow;分页返回 PageVO,Content 内对象字段与旧 Data 对齐)。</summary>
|
||||||
[HttpGet("ListFlow")]
|
[HttpGet("ListFlow")]
|
||||||
public async Task<List<SHRoleFlowListItem>> ListFlow(
|
public async Task<PageVO<SHRoleFlowListItem>> ListFlow(
|
||||||
[FromQuery] string name = null,
|
[FromQuery] string name = null,
|
||||||
[FromQuery] int pageSize = 10,
|
[FromQuery] int pageSize = 10,
|
||||||
[FromQuery] int pageIndex = 0,
|
[FromQuery] int pageIndex = 0,
|
||||||
|
|||||||
Reference in New Issue
Block a user