diff --git a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs index a8670bb..9583973 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/SmartScreen/Site/SiteSafeGreenCrossSmartController.cs @@ -1,18 +1,29 @@ using DOAN.Admin.WebApi.Filters; - +using DOAN.Service.MES.SmartScreen.Site.IService; using Microsoft.AspNetCore.Mvc; namespace DOAN.Admin.WebApi.Controllers.MES.SmartScreen.Site { /// - /// 质量大屏 + /// 绿色安全十字架生产 /// [Verify] [Route("mes/qualityManagement/QualitySmart")] public class SiteSafeGreenCrossSmartController : BaseController { - public SiteSafeGreenCrossSmartController() { } + private readonly ISiteSafeGreenCrossSmartService siteSafeGreenCrossSmartService; + public SiteSafeGreenCrossSmartController(ISiteSafeGreenCrossSmartService siteSafeGreenCrossSmartService) { + siteSafeGreenCrossSmartService = siteSafeGreenCrossSmartService; + } + + + //TODO 获取本月安全生产数据 + public IActionResult GetGeenCrossSmartScreenForMonth() + { + var response = siteSafeGreenCrossSmartService.GetGeenCrossSmartScreenForMonth(); + return SUCCESS(response); + } } } \ No newline at end of file diff --git a/DOAN.Service/MES/SmartScreen/Site/IService/ISiteSafeGreenCrossSmartService.cs b/DOAN.Service/MES/SmartScreen/Site/IService/ISiteSafeGreenCrossSmartService.cs new file mode 100644 index 0000000..469cd93 --- /dev/null +++ b/DOAN.Service/MES/SmartScreen/Site/IService/ISiteSafeGreenCrossSmartService.cs @@ -0,0 +1,15 @@ +using DOAN.Model.MES.Andon.Dto; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.SmartScreen.Site.IService +{ + public interface ISiteSafeGreenCrossSmartService + { + + public List GetGeenCrossSmartScreenForMonth(); + } +} diff --git a/DOAN.Service/MES/SmartScreen/Site/SiteSafeGreenCrossSmartService.cs b/DOAN.Service/MES/SmartScreen/Site/SiteSafeGreenCrossSmartService.cs new file mode 100644 index 0000000..8cf9460 --- /dev/null +++ b/DOAN.Service/MES/SmartScreen/Site/SiteSafeGreenCrossSmartService.cs @@ -0,0 +1,55 @@ +using DOAN.Model.MES.Andon; +using DOAN.Model.MES.Andon.Dto; +using DOAN.Model.MES.quality.FQC; +using DOAN.Service.MES.SmartScreen.Quality.IService; +using DOAN.Service.MES.SmartScreen.Site.IService; +using Infrastructure.Attribute; +using Mapster; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.SmartScreen.Site +{ + + + [AppService(ServiceType = typeof(ISiteSafeGreenCrossSmartService), ServiceLifetime = LifeTime.Transient)] + public class SiteSafeGreenCrossSmartService : BaseService, ISiteSafeGreenCrossSmartService + { + public List GetGeenCrossSmartScreenForMonth() + { + UseTran2(() => + { + DateTime nowDate = DateTime.Now.Date; + bool TodayExist = Context.Queryable().Where(it => it.SafeDate == nowDate).Any(); + if (!TodayExist) + { + + Context.Insertable(new SiteSafeGreenCross() + { + SafeDate = nowDate, + SafeNum = 1, + CreatedBy = "auto", + CreatedTime = DateTime.Now, + UpdatedBy = "auto", + UpdatedTime = DateTime.Now + }).ExecuteCommand(); + } + + }); + + // 获取本月第一天 + DateTime firstDayOfMonth = new DateTime(DateTime.Now.Year, DateTime.Now.Month, 1); + + // 获取本月最后一天 + DateTime lastDayOfMonth = firstDayOfMonth.AddMonths(1).AddDays(-1); + var list = Context.Queryable().Where(it => it.SafeDate >= firstDayOfMonth && it.SafeDate <= lastDayOfMonth) + .ToList().Adapt>(); + + + return list; + } + } +}