1
This commit is contained in:
@@ -84,6 +84,10 @@ namespace FineUIPro.Web.InformationProject
|
||||
{
|
||||
this.txtTotalWorkNum.Text = Convert.ToString(millionsMonthlyReport.TotalWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.OutSideUnitWorkNum != null)
|
||||
{
|
||||
this.txtOutSideUnitWorkNum.Text = Convert.ToString(millionsMonthlyReport.OutSideUnitWorkNum);
|
||||
}
|
||||
if (millionsMonthlyReport.PostPersonNum != null)
|
||||
{
|
||||
this.txtPostPersonNum.Text = Convert.ToString(millionsMonthlyReport.PostPersonNum);
|
||||
@@ -363,6 +367,7 @@ namespace FineUIPro.Web.InformationProject
|
||||
millionsMonthlyReport.ContractorNum = Funs.GetNewIntOrZero(this.txtContractorNum.Text.Trim());
|
||||
millionsMonthlyReport.SumPersonNum = millionsMonthlyReport.PostPersonNum + millionsMonthlyReport.SnapPersonNum + millionsMonthlyReport.ContractorNum;
|
||||
millionsMonthlyReport.TotalWorkNum = Funs.GetNewDecimalOrZero(this.txtTotalWorkNum.Text.Trim());
|
||||
millionsMonthlyReport.OutSideUnitWorkNum = Funs.GetNewDecimalOrZero(this.txtOutSideUnitWorkNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesNum = Funs.GetNewInt(this.txtSeriousInjuriesNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesPersonNum = Funs.GetNewInt(this.txtSeriousInjuriesPersonNum.Text.Trim());
|
||||
millionsMonthlyReport.SeriousInjuriesLossHour = Funs.GetNewInt(this.txtSeriousInjuriesLossHour.Text.Trim());
|
||||
@@ -471,7 +476,18 @@ namespace FineUIPro.Web.InformationProject
|
||||
using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
int? sumTotalPanhours = 0;
|
||||
|
||||
int? sumOutSideTotalPanhours = 0;
|
||||
List<string> outSideUnitIds = new List<string>();
|
||||
var projectUnits = from x in db.Project_ProjectUnit
|
||||
where x.ProjectId == this.ProjectId
|
||||
select x;
|
||||
foreach (var projectUnit in projectUnits)
|
||||
{
|
||||
if (projectUnit.UnitType == BLL.Const.ProjectUnitType_1 || projectUnit.IsOutSideUnit == true)
|
||||
{
|
||||
outSideUnitIds.Add(projectUnit.UnitId);
|
||||
}
|
||||
}
|
||||
//获取当期人工时日报
|
||||
List<Model.SitePerson_DayReport> dayReports = BLL.SitePerson_DayReportService.GetDayReportsByCompileDate(startTime, endTime, this.ProjectId);
|
||||
if (dayReports.Count > 0)
|
||||
@@ -479,10 +495,15 @@ namespace FineUIPro.Web.InformationProject
|
||||
foreach (var dayReport in dayReports)
|
||||
{
|
||||
sumTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail where y.DayReportId == dayReport.DayReportId select y.PersonWorkTime as decimal?).Sum());
|
||||
sumOutSideTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail
|
||||
where y.DayReportId == dayReport.DayReportId && outSideUnitIds.Contains(y.UnitId)
|
||||
select y.PersonWorkTime as decimal?).Sum());
|
||||
}
|
||||
|
||||
//总工时数(万)
|
||||
this.txtTotalWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumTotalPanhours), 4) / 10000, 4).ToString();
|
||||
//去除系统内单位的总工时数(万)
|
||||
this.txtOutSideUnitWorkNum.Text = decimal.Round(decimal.Round(Convert.ToDecimal(sumOutSideTotalPanhours), 4) / 10000, 4).ToString();
|
||||
//在岗员工
|
||||
//获取单位集合
|
||||
var unitIds = (from x in dayReports
|
||||
|
||||
Reference in New Issue
Block a user