提交代码
This commit is contained in:
@@ -629,10 +629,11 @@ namespace BLL
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int GetTotalWorkingHour(string projectid)
|
public static int GetTotalWorkingHour(string projectid)
|
||||||
{
|
{
|
||||||
var result = (from x in Funs.DB.SitePerson_DayReportDetail
|
var result = (from x in Funs.DB.SeDin_MonthReport2
|
||||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
join y in Funs.DB.SeDin_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
where y.ProjectId == projectid
|
||||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
orderby y.ReporMonth descending
|
||||||
|
select x.ProjectWorkTime ?? 0).FirstOrDefault();
|
||||||
var q = Funs.GetNewIntOrZero(result.ToString().Split('.')[0]);
|
var q = Funs.GetNewIntOrZero(result.ToString().Split('.')[0]);
|
||||||
|
|
||||||
return q;
|
return q;
|
||||||
@@ -664,10 +665,11 @@ namespace BLL
|
|||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
public static int GetSafeWorkingHour(string projectid)
|
public static int GetSafeWorkingHour(string projectid)
|
||||||
{
|
{
|
||||||
var result1 = (from x in Funs.DB.SitePerson_DayReportDetail
|
var result1 = (from x in Funs.DB.SeDin_MonthReport2
|
||||||
join y in Funs.DB.SitePerson_DayReport on x.DayReportId equals y.DayReportId
|
join y in Funs.DB.SeDin_MonthReport on x.MonthReportId equals y.MonthReportId
|
||||||
where y.ProjectId == projectid && y.CompileDate > Const.DtmarkTime
|
where y.ProjectId == projectid
|
||||||
select x.PersonWorkTime ?? 0).ToList().Sum();
|
orderby y.ReporMonth descending
|
||||||
|
select x.ProjectWorkTime ?? 0).FirstOrDefault();
|
||||||
var result2 =
|
var result2 =
|
||||||
(from x in Funs.DB.Accident_AccidentHandle
|
(from x in Funs.DB.Accident_AccidentHandle
|
||||||
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
where x.ProjectId == projectid && x.CompileDate > Const.DtmarkTime
|
||||||
|
|||||||
Reference in New Issue
Block a user