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:
wyw 2024-04-07 17:24:41 +08:00
commit 6e28820597
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4225,7 +4225,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
ret.TotalCount = newData.Count();
ret.doneCount = newData.Where(t => t.NOTICE_STATUS == 1).Count();
ret.timeOverCount = newData.Where(t => t.NOTICE_STATUS == 2).Count();
var groupDataTemp = newData.GroupBy(t =>t.MOUDLE_NAME).Select(m => new GroupbyMouldName
var groupDataTemp = newData.GroupBy(t => t.MOUDLE_NAME).Select(m => new GroupbyMouldName
{
mouldName = m.Key,
totalCount = m.Count(p => p.MOUDLE_NAME == m.Key),
@ -4234,6 +4234,16 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
}).ToList();
ret.groupData = groupDataTemp;
}
else
{
ret.formData = formInfo.ToList();
ret.userData = userInfos.ToList();
ret.newData = new List<T_BI_NOTIFICATION_TASK_NEW>();
ret.TotalCount = 0;
ret.doneCount = 0;
ret.timeOverCount = 0;
ret.groupData = new List<GroupbyMouldName>();
}
return ret;
});
}