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

Compare commits

base: wyw:68543a387ea44c4d6da5391d4ab87e3c4361c848
Branches Tags
wyw:master
..
compare: wyw:f2a7c1b8816cf03ce7046f06f663719acf186c03
Branches Tags
wyw:master

No commits in common. "68543a387ea44c4d6da5391d4ab87e3c4361c848" and "f2a7c1b8816cf03ce7046f06f663719acf186c03" have entirely different histories.
68543a387e ... f2a7c1b881

1 changed files with 10 additions and 12 deletions
Show Stats Expand all files Collapse all files

18
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
View File

@ -9617,14 +9617,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
return SafeExecute<List<T_FM_DEPARTMENT_COMPLETION_SORT>>(() =>
{
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
//var mineType = 30;
var mineType = 30;
var departmentIds = new List<Guid>();
List<GroupbyDepartmentId> completionLists = new List<GroupbyDepartmentId>();
List<T_FM_DEPARTMENT_COMPLETION_SORT> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION_SORT>();
//if (string.IsNullOrEmpty(filter.Keyword))
// return completionSorts;
//var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(orgId));
if (string.IsNullOrEmpty(filter.Keyword))
return completionSorts;
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
if (departmentInfo == null || !departmentInfo.Any())
return completionSorts;
else
@ -9709,14 +9708,13 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{
dynamic ret = new System.Dynamic.ExpandoObject();
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId.Value;
//var mineType = 30;
var mineType = 30;
var departmentIds = new List<Guid>();
List<GroupbyDepartmentCompletion> completionLists = new List<GroupbyDepartmentCompletion>();
List<T_FM_DEPARTMENT_COMPLETION> completionSorts = new List<T_FM_DEPARTMENT_COMPLETION>();
//if (string.IsNullOrEmpty(filter.Keyword))
// return ret;
//var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.PRODUCTION_UNIT_ID == Guid.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.CATEGORY == FMCATEGORY.ACTURE, new BaseFilter(orgId));
if (string.IsNullOrEmpty(filter.Keyword))
return ret;
var departmentInfo = this.GetEntities<T_FM_DEPARTMENT>(t => t.MineType == int.Parse(filter.Keyword.ToString()), new BaseFilter(orgId));
if (departmentInfo == null || !departmentInfo.Any())
return ret;
else