diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
index bc41103..7a77816 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
@@ -221,8 +221,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
///
/// 分页过滤实体
///
- [HttpPost, Route("FullOrderPaged")]
- public PagedActionResult FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
+ [HttpPost, Route("OrderPaged")]
+ public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
var result = new PagedActionResult();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
index 5342875..5b3898c 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
@@ -612,8 +612,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
///
/// 分页过滤实体
///
- [HttpPost, Route("FullOrderPaged")]
- public PagedActionResult FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
+ [HttpPost, Route("OrderPaged")]
+ public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team");
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
index fc02826c..6a7402a 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
@@ -836,8 +836,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
///
/// 分页过滤实体
///
- [HttpPost, Route("FullOrderPaged")]
- public PagedActionResult FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
+ [HttpPost, Route("OrderPaged")]
+ public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team");
diff --git a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
index 5f6504b..5e97a26 100644
--- a/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
+++ b/APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
@@ -252,8 +252,8 @@ namespace APT.FO.WebApi.Controllers.Api.FO
///
/// 分页过滤实体
///
- [HttpPost, Route("FullOrderPaged")]
- public PagedActionResult FullOrderPaged([FromBody] KeywordPageFilter pageFilter)
+ [HttpPost, Route("OrderPaged")]
+ public PagedActionResult OrderPaged([FromBody] KeywordPageFilter pageFilter)
{
pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Taem");
diff --git a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
index 485ed93..303a4f9 100644
--- a/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
+++ b/APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIStatiscialAnalysisController.cs
@@ -175,6 +175,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
public DateTime? TASK_DT { get; set; }
public string NOTICE_STATUS { get; set; }
public string USER_NAME { get; set; }
+
+ public int? NUM { get; set; }
}
///
///
@@ -11237,6 +11239,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
var taskGroup = listAddNew.GroupBy(t => new { t.COMPANY_NAME, t.MOULD_NAME, t.FORM_NAME }).ToList();
if (taskGroup != null && taskGroup.Any())
{
+ var forms = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
+ var menus = this.GetEntities(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId));
foreach (var item in taskGroup)
{
var details = listAddNew.Where(t => t.COMPANY_NAME == item.Key.COMPANY_NAME && t.MOULD_NAME == item.Key.MOULD_NAME && t.FORM_NAME == item.Key.FORM_NAME).ToList();
@@ -11257,6 +11261,8 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
info.details = new List();
foreach (var de in details)
{
+ var formInfo = forms.FirstOrDefault(t=>t.NAME == de.FORM_NAME);
+ var menuInfo = menus.FirstOrDefault(t => t.FORM_ID == formInfo?.ID);
TaskViewInfoDetail dd = new TaskViewInfoDetail();
dd.COMPANY_NAME = de.COMPANY_NAME;
dd.MOULD_NAME = de.MOULD_NAME;
@@ -11267,6 +11273,7 @@ namespace APT.SC.WebApi.Controllers.Api.BIController
dd.TASK_STARTDT = de.TASK_STARTDT;
dd.TASK_ENDDT = de.TASK_ENDDT;
dd.USER_NAME = de.USER_NAME;
+ dd.NUM = menuInfo?.NUM;
info.details.Add(dd);
}
}