From a92df1a6826cda26b2334c4c0b291ad373163aea Mon Sep 17 00:00:00 2001 From: xiaju <1784803958@qq.com> Date: Sun, 4 May 2025 13:12:51 +0800 Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=A0=A1=E6=AD=A3=E5=87=BA?= =?UTF-8?q?=E5=85=A5=E5=9C=BA=E4=BA=BA=E6=95=B0=E5=8F=8A=E5=B7=A5=E6=97=B6?= =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/OpenService/GetDataService.cs | 7 ++++--- SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/SGGL/BLL/OpenService/GetDataService.cs b/SGGL/BLL/OpenService/GetDataService.cs index 49e5a7f1..8f774c7c 100644 --- a/SGGL/BLL/OpenService/GetDataService.cs +++ b/SGGL/BLL/OpenService/GetDataService.cs @@ -272,8 +272,8 @@ namespace BLL { try { - DateTime dateS = DateTime.Now.AddMonths(-3); - dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-3).Year + "-" + DateTime.Now.AddMonths(-3).Month + "-01"); + DateTime dateS = DateTime.Now.AddMonths(-12); + dateS = Funs.GetNewDateTimeOrNow(DateTime.Now.AddMonths(-12).Year + "-" + DateTime.Now.AddMonths(-12).Month + "-01"); var getNums = from x in db.SitePerson_PersonInOutNumber where x.ProjectId == projectId && x.InOutDate >= dateS orderby x.InOutDate @@ -281,7 +281,8 @@ namespace BLL var getInouts = from x in db.SitePerson_PersonInOut where x.ProjectId == projectId && x.ChangeTime.Value >= dateS select x; - int SafeHours = 0; + //int SafeHours = 0; + int SafeHours = db.SitePerson_PersonInOutNumber.Where(x => x.ProjectId == projectId && x.InOutDate < dateS).Max(x => x.WorkHours) ?? 0; foreach (var itemNum in getNums) { DateTime date = Funs.GetNewDateTimeOrNow(itemNum.InOutDate.ToShortDateString()); diff --git a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx index 857b35b7..3e651ad4 100644 --- a/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx +++ b/SGGL/FineUIPro.Web/common/mainMenu_PDigData.aspx @@ -327,7 +327,7 @@ }, axisLabel: { show: true, - interval: 0, + /*interval: 0,*/ textStyle: { color: 'rgba(255, 255, 255, 0.8)' }