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)' }