diff --git a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs index 05e6ed2..abaa786 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/BigScreen/product/Product2Controller.cs @@ -126,6 +126,17 @@ namespace DOAN.WebApi.Controllers.MES.BigScreen return SUCCESS(response); } + /// + /// 本月 报工不满原因 top10 + /// + /// + [HttpGet("getMoudle77")] + public IActionResult GetMoudle77() + { + var response = productBigScreenService.GetMoudle77(); + return SUCCESS(response); + } + [HttpGet("getMoudle08")] public IActionResult GetMoudle08() diff --git a/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs b/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs index ace2b7a..c55ccd6 100644 --- a/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/IService/IProduct2BigScreenService.cs @@ -16,5 +16,7 @@ public interface IProduct2BigScreenService : IBaseService List GetMoudle05(); EchartsOptions GetMoudle06(); EchartsOptions GetMoudle07(); + EchartsOptions GetMoudle77(); + EchartsOptions GetMoudle08(); } \ No newline at end of file diff --git a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs index c0bcfaf..5a73ce5 100644 --- a/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs +++ b/DOAN.Service/MES/bigScreen/Product2BigScreenService.cs @@ -387,6 +387,50 @@ namespace DOAN.Service.MES.bigScreen return echartsOptions; } + //本月 报工不满原因 top10 + public EchartsOptions GetMoudle77() + { + // 获取当前日期 + DateTime today = DateTime.Today; + + // 获取当前月的第一天 + DateTime firstDayOfMonth = new DateTime(today.Year, today.Month, 1); + + // 获取当前月的最后一天 + DateTime lastDayOfMonth = + new DateTime(today.Year, today.Month, DateTime.DaysInMonth(today.Year, today.Month)); + EchartsOptions echartsOptions = new EchartsOptions(); + EchartsTitle Title = new EchartsTitle("本月 报工不满原因 top10", "本月 报工不满原因 top10"); + echartsOptions.Title = Title; + + EchartsSeries LineSeries = new EchartsSeries(); + LineSeries.Name = "本月报工不满原因top10"; + LineSeries.Type = "bar"; + + LineSeries.Data = Context.Queryable() + .LeftJoin((it, wr) => it.Workorder == wr.FkWorkorder) + .Where((it, wr) => it.WorkorderDate >= firstDayOfMonth && it.WorkorderDate <= lastDayOfMonth.AddDays(1)) + .GroupBy((it, wr) => wr.UnfinishedReanson) + .Select((it, wr) => new EchartsSeriesData() + { + Name = wr.UnfinishedReanson, + Value = SqlFunc.AggregateCount(wr.UnfinishedReanson) + }) + .MergeTable() + .OrderByDescending(it => it.Value) + .Take(10).ToList(); + ; + + + echartsOptions.Series = new List() { LineSeries }; + + EchartsYAxis YAxis = new EchartsYAxis(); + YAxis.Data = LineSeries.Data.Select(it => it.Name).ToList(); + echartsOptions.YAxis = YAxis; + + return echartsOptions; + } + public EchartsOptions GetMoudle08() { // 获取当前日期