wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
何美荣 2026-06-16 09:22:36 +08:00
parent a7a29bc41d
commit 825a183818
1 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -664,6 +664,7 @@ namespace APT.SK.WebApi.Controllers.Api
[HttpPost, Route("SKOrderPaged")] [HttpPost, Route("SKOrderPaged")]
public PagedActionResult<T_SK_ENTERPRISE_LIBRARY> SKOrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_SK_ENTERPRISE_LIBRARY> SKOrderPaged([FromBody] KeywordPageFilter pageFilter)
{ {
var result = new PagedActionResult<T_SK_ENTERPRISE_LIBRARY>();
var mintype = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType"); var mintype = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "MineType");
if (mintype != null && mintype.Value.ToString() == "0") if (mintype != null && mintype.Value.ToString() == "0")
pageFilter.FilterGroup.Rules.Remove(mintype); pageFilter.FilterGroup.Rules.Remove(mintype);
@ -672,18 +673,30 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
nullRules.ForEach(t => pageFilter.FilterGroup.Rules.Remove(t)); nullRules.ForEach(t => pageFilter.FilterGroup.Rules.Remove(t));
} }
pageFilter.Include.Add("Nav_RiskName"); //pageFilter.Include.Add("Nav_RiskName");
pageFilter.Include.Add("Nav_Details"); //pageFilter.Include.Add("Nav_Details");
pageFilter.Include.Add("Nav_ProductionUnit"); pageFilter.Include.Add("Nav_ProductionUnit");
pageFilter.Include.Add("Nav_Posts"); //pageFilter.Include.Add("Nav_Posts");
pageFilter.SelectField.Add("Nav_ProductionUnit.NAME"); pageFilter.SelectField.Add("Nav_ProductionUnit.NAME");
pageFilter.SelectField.Add("Nav_Details.NUM"); //pageFilter.SelectField.Add("Nav_Details.NUM");
pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME"); //pageFilter.SelectField.Add("Nav_Details.MEASURES_NAME");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person"); var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_Person");
var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId)); var userPosts = this.GetEntities<T_FM_USER_POST>(t => !t.IS_DELETED, new BaseFilter(pageFilter.OrgId));
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)); var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
var result = this.GetOrderPageEntities<T_SK_ENTERPRISE_LIBRARY>(null, pageFilter); var lib = this.GetEntities<T_SK_ENTERPRISE_LIBRARY>(t => t.ENABLE_STATUS == 0, pageFilter);
var libDetails = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
var libPosts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_POST>(t => t.IS_DELETED == false, new BaseFilter(pageFilter.OrgId));
//var result = this.GetOrderPageEntities<T_SK_ENTERPRISE_LIBRARY>(null, pageFilter);
//var result = WitOrderPaged(null, pageFilter); //var result = WitOrderPaged(null, pageFilter);
if (lib != null && lib.Any())
{
foreach (var item in lib)
{
item.Nav_Details = libDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
item.Nav_Posts = libPosts.Where(t => t.ENTERPRISE_LIBRARY_ID == item.ID).ToList();
}
result.Data = lib;
}
if (result != null && result.Data != null) if (result != null && result.Data != null)
{ {
if (result.Data != null && result.Data.Any()) if (result.Data != null && result.Data.Any())