ccy/mh_sms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of http://47.122.43.22:3000/wjn/mh_sms

Browse Source
This commit is contained in:
wjn 2024-08-15 09:46:07 +08:00
commit 07ca088399
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6143,10 +6143,10 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
{ {
throw new Exception("请先选择时间开始时间和结束时间"); throw new Exception("请先选择时间开始时间和结束时间");
} }
if (string.IsNullOrEmpty(pageFilter.Keyword)) //if (string.IsNullOrEmpty(pageFilter.Keyword))
{ //{
throw new Exception("部门未传入，请联系管理员"); // throw new Exception("部门未传入，请联系管理员");
} //}
var newFilter = new BaseFilter(pageFilter.OrgId); var newFilter = new BaseFilter(pageFilter.OrgId);
DateTime year = DateTime.Parse(pageFilter.Parameter1); DateTime year = DateTime.Parse(pageFilter.Parameter1);
DateTime yearEnd = DateTime.Parse(pageFilter.Parameter2); DateTime yearEnd = DateTime.Parse(pageFilter.Parameter2);
@ -6156,7 +6156,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
int dayDidd = span.Days + 1; int dayDidd = span.Days + 1;
if (dayDidd >= 180) if (dayDidd >= 180)
throw new Exception("查询时间不能超过6个月!"); throw new Exception("查询时间不能超过6个月!");
var departmentId = Guid.Parse(pageFilter.Keyword); //var departmentId = Guid.Parse(pageFilter.Keyword);
List<T_BI_SYSTEM_RUN_SUMMARY> departSummary = new List<T_BI_SYSTEM_RUN_SUMMARY>(); List<T_BI_SYSTEM_RUN_SUMMARY> departSummary = new List<T_BI_SYSTEM_RUN_SUMMARY>();
var taskYear = this.GetEntities<T_BI_NOTIFICATION_TASK_NEW>(t =>!t.IS_DELETED && t.CREATE_DATE >= year && t.CREATE_DATE <= yearEnd, new BaseFilter(pageFilter.OrgId)).ToList(); var taskYear = this.GetEntities<T_BI_NOTIFICATION_TASK_NEW>(t =>!t.IS_DELETED && t.CREATE_DATE >= year && t.CREATE_DATE <= yearEnd, new BaseFilter(pageFilter.OrgId)).ToList();
newFilter.SelectField = new List<string> { "ID", "PARENT_ID", "NAME", "Nav_Parent", "DEPARTMENT_TYPE" }; newFilter.SelectField = new List<string> { "ID", "PARENT_ID", "NAME", "Nav_Parent", "DEPARTMENT_TYPE" };
@ -6164,11 +6164,11 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
//newFilter.SelectField = new List<string> { "ID", "DEPARTMENT_ID", "NAME" }; //newFilter.SelectField = new List<string> { "ID", "DEPARTMENT_ID", "NAME" };
//var userInfos = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, newFilter).ToList(); //var userInfos = this.GetEntities<T_FM_USER>(t => !t.IS_DELETED, newFilter).ToList();
//部门级 //部门级
var departGroupYear = taskYear.Where(t => t.DEPT_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList(); var departGroupYear = taskYear.Where(t => t.DEPT_DEPARTMENT_ID != null).ToList();
//车间级 //车间级
var shopGroupYear = taskYear.Where(t => t.SHOP_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList(); var shopGroupYear = taskYear.Where(t => t.SHOP_DEPARTMENT_ID != null).ToList();
//班组级 //班组级
var classGroupYear = taskYear.Where(t => t.CLASS_DEPARTMENT_ID != null && t.DEPT_DEPARTMENT_ID == departmentId).ToList(); var classGroupYear = taskYear.Where(t => t.CLASS_DEPARTMENT_ID != null).ToList();
//分组 //分组
if (departGroupYear.Any()) if (departGroupYear.Any())
{ {