|
|
|
@ -145,13 +145,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
|
|
|
|
|
//如果大于当天8点 就展示当天的白班 否则展示上一个白班
|
|
|
|
|
if (nowTime >= DateTime.Now.Date.AddHours(8))
|
|
|
|
|
{
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(8);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(20);
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(7).AddMinutes(30);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(19).AddMinutes(30);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(-16);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(-4);
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(-17).AddMinutes(30);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(-5).AddMinutes(30);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list = FreeSqlUnit.Instance.Select<DayWhiteEmbryoEntity>().Where(x => (x.CreateTime >= starttime && x.CreateTime <= endtime)).ToList();
|
|
|
|
@ -171,13 +171,13 @@ namespace Mesnac.Action.ChemicalWeighing.LjReport.DayWhiteEmbryo
|
|
|
|
|
//如果小于当天20点 就展示当天的前一个晚班
|
|
|
|
|
if (nowTime <= DateTime.Now.Date.AddHours(20))
|
|
|
|
|
{
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(-4);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(8);
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(-5).AddMinutes(30);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(7).AddMinutes(30);
|
|
|
|
|
}
|
|
|
|
|
else
|
|
|
|
|
{
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(20);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(32);
|
|
|
|
|
starttime = DateTime.Now.Date.AddHours(19).AddMinutes(30);
|
|
|
|
|
endtime = DateTime.Now.Date.AddHours(31).AddMinutes(30);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
list = FreeSqlUnit.Instance.Select<DayWhiteEmbryoEntity>().Where(x => (x.CreateTime >= starttime && x.CreateTime <= endtime)).ToList();
|
|
|
|
|