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-02 10:36:17 +08:00
commit d9952d0707
1 changed files with 7586 additions and 7586 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4198,10 +4198,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);
newFilter.SelectField = new List<string> { "ID","CODE", "NAME" }; newFilter.SelectField = new List<string> { "ID","CODE", "NAME" };
var formInfo = this.GetEntities<T_PF_FORM>(t => t.ENABLE_STATUS == 0, newFilter); var formInfo = this.GetEntities<T_PF_FORM>(t => t.ENABLE_STATUS == 0, newFilter);
@ -4211,7 +4211,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 result = GetEntities<T_BI_NOTIFICATION_TASK_NEW>(s => !s.IS_DELETED && s.CREATE_DATE >= startTime && s.CREATE_DATE <= endTime && s.DEPT_DEPARTMENT_ID == Guid.Parse(pageFilter.Keyword), pageFilter); var result = GetEntities<T_BI_NOTIFICATION_TASK_NEW>(s => !s.IS_DELETED && s.CREATE_DATE >= startTime && s.CREATE_DATE <= endTime, pageFilter);// && s.DEPT_DEPARTMENT_ID == Guid.Parse(pageFilter.Keyword)
var userIds = result.Select(t => t.USER_ID).Distinct().ToList(); var userIds = result.Select(t => t.USER_ID).Distinct().ToList();
var userInfos= GetEntities<T_FM_USER>(s => userIds.Contains(s.ID) && s.ENABLE_STATUS == 0, newFilter); var userInfos= GetEntities<T_FM_USER>(s => userIds.Contains(s.ID) && s.ENABLE_STATUS == 0, newFilter);
//pageFilter.Sort = "CREATE_TIME"; //pageFilter.Sort = "CREATE_TIME";