zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2023-03-31 报表升级

Browse Source
This commit is contained in:
李鹏飞
2023-03-31 10:21:00 +08:00
parent 5acee68633
commit 5ee3b089b7
175 changed files with 68864 additions and 2056 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs
+99 -20
View File
@@ -123,17 +123,17 @@ namespace FineUIPro.Web.InformationProject
{
this.txtMinorAccidentLossHour.Text = Convert.ToString(millionsMonthlyReport.MinorAccidentLossHour);
}
if (millionsMonthlyReport.OtherAccidentNum != null)
if (millionsMonthlyReport.DeathAccidentNum != null)
{
this.txtOtherAccidentNum.Text = Convert.ToString(millionsMonthlyReport.OtherAccidentNum);
this.txtDeathAccidentNum.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentNum);
}
if (millionsMonthlyReport.OtherAccidentPersonNum != null)
if (millionsMonthlyReport.DeathAccidentPersonNum != null)
{
this.txtOtherAccidentPersonNum.Text = Convert.ToString(millionsMonthlyReport.OtherAccidentPersonNum);
this.txtDeathAccidentPersonNum.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentPersonNum);
}
if (millionsMonthlyReport.OtherAccidentLossHour != null)
if (millionsMonthlyReport.DeathAccidentLossHour != null)
{
this.txtOtherAccidentLossHour.Text = Convert.ToString(millionsMonthlyReport.OtherAccidentLossHour);
this.txtDeathAccidentLossHour.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentLossHour);
}
if (millionsMonthlyReport.RestrictedWorkPersonNum != null)
{
@@ -155,9 +155,9 @@ namespace FineUIPro.Web.InformationProject
{
this.txtFireNum.Text = Convert.ToString(millionsMonthlyReport.FireNum);
}
if (millionsMonthlyReport.ExplosionNum != null)
if (millionsMonthlyReport.EnvironmenNum != null)
{
this.txtExplosionNum.Text = Convert.ToString(millionsMonthlyReport.ExplosionNum);
this.txtEnvironmenNum.Text = Convert.ToString(millionsMonthlyReport.EnvironmenNum);
}
if (millionsMonthlyReport.TrafficNum != null)
{
@@ -195,6 +195,70 @@ namespace FineUIPro.Web.InformationProject
{
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", millionsMonthlyReport.CompileDate);
}
if (millionsMonthlyReport.InputCosts != null)
{
this.txtInputCosts.Text = Convert.ToString(millionsMonthlyReport.InputCosts);
}
if (millionsMonthlyReport.TrainNum != null)
{
this.txtTrainNum.Text = Convert.ToString(millionsMonthlyReport.TrainNum);
}
if (millionsMonthlyReport.GeneralHazardNum != null)
{
this.txtGeneralHazardNum.Text = Convert.ToString(millionsMonthlyReport.GeneralHazardNum);
}
if (millionsMonthlyReport.MajorHazardNum != null)
{
this.txtMajorHazardNum.Text = Convert.ToString(millionsMonthlyReport.MajorHazardNum);
}
if (millionsMonthlyReport.NotProofLargeProjectNum != null)
{
this.txtNotProofLargeProjectNum.Text = Convert.ToString(millionsMonthlyReport.NotProofLargeProjectNum);
}
if (millionsMonthlyReport.ProofLargeProjectNum != null)
{
this.txtProofLargeProjectNum.Text = Convert.ToString(millionsMonthlyReport.ProofLargeProjectNum);
}
if (millionsMonthlyReport.FireLicenseNum != null)
{
this.txtFireLicenseNum.Text = Convert.ToString(millionsMonthlyReport.FireLicenseNum);
}
if (millionsMonthlyReport.LimitLicenseNum != null)
{
this.txtLimitLicenseNum.Text = Convert.ToString(millionsMonthlyReport.LimitLicenseNum);
}
if (millionsMonthlyReport.HighLicenseNum != null)
{
this.txtHighLicenseNum.Text = Convert.ToString(millionsMonthlyReport.HighLicenseNum);
}
if (millionsMonthlyReport.HoistingLicenseNum != null)
{
this.txtHoistingLicenseNum.Text = Convert.ToString(millionsMonthlyReport.HoistingLicenseNum);
}
if (millionsMonthlyReport.BreakGroundLicenseNum != null)
{
this.txtBreakGroundLicenseNum.Text = Convert.ToString(millionsMonthlyReport.BreakGroundLicenseNum);
}
if (millionsMonthlyReport.ElectricityLicenseNum != null)
{
this.txtElectricityLicenseNum.Text = Convert.ToString(millionsMonthlyReport.ElectricityLicenseNum);
}
if (millionsMonthlyReport.RTLicenseNum != null)
{
this.txtRTLicenseNum.Text = Convert.ToString(millionsMonthlyReport.RTLicenseNum);
}
if (millionsMonthlyReport.NightLicenseNum != null)
{
this.txtNightLicenseNum.Text = Convert.ToString(millionsMonthlyReport.NightLicenseNum);
}
if (millionsMonthlyReport.CommissionerNum != null)
{
this.txtCommissionerNum.Text = Convert.ToString(millionsMonthlyReport.CommissionerNum);
}
if (millionsMonthlyReport.SoleDutyNum != null)
{
this.txtSoleDutyNum.Text = Convert.ToString(millionsMonthlyReport.SoleDutyNum);
}
}
}
else
@@ -206,7 +270,6 @@ namespace FineUIPro.Web.InformationProject
GetData(startTime, endTime);
this.drpCompileMan.SelectedValue = this.CurrUser.UserId;
this.txtCompileDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
this.txtSnapPersonNum.Text = "0";
}
///初始化审核菜单
this.ctlAuditFlow.MenuId = BLL.Const.ProjectMillionsMonthlyReportMenuId;
@@ -309,22 +372,38 @@ namespace FineUIPro.Web.InformationProject
millionsMonthlyReport.MinorAccidentNum = Funs.GetNewInt(this.txtMinorAccidentNum.Text.Trim());
millionsMonthlyReport.MinorAccidentPersonNum = Funs.GetNewInt(this.txtMinorAccidentPersonNum.Text.Trim());
millionsMonthlyReport.MinorAccidentLossHour = Funs.GetNewInt(this.txtMinorAccidentLossHour.Text.Trim());
millionsMonthlyReport.OtherAccidentNum = Funs.GetNewInt(this.txtOtherAccidentNum.Text.Trim());
millionsMonthlyReport.OtherAccidentPersonNum = Funs.GetNewInt(this.txtOtherAccidentPersonNum.Text.Trim());
millionsMonthlyReport.OtherAccidentLossHour = Funs.GetNewInt(this.txtOtherAccidentLossHour.Text.Trim());
millionsMonthlyReport.DeathAccidentNum = Funs.GetNewInt(this.txtDeathAccidentNum.Text.Trim());
millionsMonthlyReport.DeathAccidentPersonNum = Funs.GetNewInt(this.txtDeathAccidentPersonNum.Text.Trim());
millionsMonthlyReport.DeathAccidentLossHour = Funs.GetNewInt(this.txtDeathAccidentLossHour.Text.Trim());
millionsMonthlyReport.RestrictedWorkPersonNum = Funs.GetNewInt(this.txtRestrictedWorkPersonNum.Text.Trim());
millionsMonthlyReport.RestrictedWorkLossHour = Funs.GetNewInt(this.txtRestrictedWorkLossHour.Text.Trim());
millionsMonthlyReport.MedicalTreatmentPersonNum = Funs.GetNewInt(this.txtMedicalTreatmentPersonNum.Text.Trim());
millionsMonthlyReport.MedicalTreatmentLossHour = Funs.GetNewInt(this.txtMedicalTreatmentLossHour.Text.Trim());
millionsMonthlyReport.FireNum = Funs.GetNewInt(this.txtFireNum.Text.Trim());
millionsMonthlyReport.ExplosionNum = Funs.GetNewInt(this.txtExplosionNum.Text.Trim());
millionsMonthlyReport.TrafficNum = Funs.GetNewInt(this.txtTrafficNum.Text.Trim());
millionsMonthlyReport.EnvironmenNum = Funs.GetNewInt(this.txtEnvironmenNum.Text.Trim());
millionsMonthlyReport.TrafficNum = Funs.GetNewInt(this.txtTrafficNum.Text.Trim());
millionsMonthlyReport.EquipmentNum = Funs.GetNewInt(this.txtEquipmentNum.Text.Trim());
millionsMonthlyReport.QualityNum = Funs.GetNewInt(this.txtQualityNum.Text.Trim());
millionsMonthlyReport.OtherNum = Funs.GetNewInt(this.txtOtherNum.Text.Trim());
millionsMonthlyReport.FirstAidDressingsNum = Funs.GetNewInt(this.txtFirstAidDressingsNum.Text.Trim());
millionsMonthlyReport.AttemptedEventNum = Funs.GetNewInt(this.txtAttemptedEventNum.Text.Trim());
millionsMonthlyReport.LossDayNum = Funs.GetNewInt(this.txtLossDayNum.Text.Trim());
millionsMonthlyReport.InputCosts = Funs.GetNewDecimalOrZero(this.txtInputCosts.Text.Trim());
millionsMonthlyReport.TrainNum = Funs.GetNewInt(this.txtTrainNum.Text.Trim());
millionsMonthlyReport.GeneralHazardNum = Funs.GetNewInt(this.txtGeneralHazardNum.Text.Trim());
millionsMonthlyReport.MajorHazardNum = Funs.GetNewInt(this.txtMajorHazardNum.Text.Trim());
millionsMonthlyReport.NotProofLargeProjectNum = Funs.GetNewInt(this.txtNotProofLargeProjectNum.Text.Trim());
millionsMonthlyReport.ProofLargeProjectNum = Funs.GetNewInt(this.txtProofLargeProjectNum.Text.Trim());
millionsMonthlyReport.FireLicenseNum = Funs.GetNewInt(this.txtFireLicenseNum.Text.Trim());
millionsMonthlyReport.LimitLicenseNum = Funs.GetNewInt(this.txtLimitLicenseNum.Text.Trim());
millionsMonthlyReport.HighLicenseNum = Funs.GetNewInt(this.txtHighLicenseNum.Text.Trim());
millionsMonthlyReport.HoistingLicenseNum = Funs.GetNewInt(this.txtHoistingLicenseNum.Text.Trim());
millionsMonthlyReport.BreakGroundLicenseNum = Funs.GetNewInt(this.txtBreakGroundLicenseNum.Text.Trim());
millionsMonthlyReport.ElectricityLicenseNum = Funs.GetNewInt(this.txtElectricityLicenseNum.Text.Trim());
millionsMonthlyReport.RTLicenseNum = Funs.GetNewInt(this.txtRTLicenseNum.Text.Trim());
millionsMonthlyReport.NightLicenseNum = Funs.GetNewInt(this.txtNightLicenseNum.Text.Trim());
millionsMonthlyReport.CommissionerNum = Funs.GetNewInt(this.txtCommissionerNum.Text.Trim());
millionsMonthlyReport.SoleDutyNum = Funs.GetNewInt(this.txtSoleDutyNum.Text.Trim());
if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
{
millionsMonthlyReport.MillionsMonthlyReportId = this.MillionsMonthlyReportId;
@@ -345,7 +424,7 @@ namespace FineUIPro.Web.InformationProject
BLL.LogService.AddSys_Log(this.CurrUser, millionsMonthlyReport.Year.ToString() + "-" + millionsMonthlyReport.Month.ToString(), millionsMonthlyReport.MillionsMonthlyReportId, BLL.Const.ProjectMillionsMonthlyReportMenuId, BLL.Const.BtnAdd);
////删除未上报月报信息
//Model.ManagementReport_ReportRemind reportRemind = (from x in Funs.DB.ManagementReport_ReportRemind
// where x.ProjectId == this.ProjectId && x.Year == millionsMonthlyReport.Year && x.Month == millionsMonthlyReport.Month && x.ReportName == "百万工时安全统计月报"
// where x.ProjectId == this.ProjectId && x.Year == millionsMonthlyReport.Year && x.Month == millionsMonthlyReport.Month && x.ReportName == "企业安全数据统计月报"
// select x).FirstOrDefault();
//if (reportRemind != null)
//{
@@ -402,7 +481,7 @@ 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 ?? 0).Sum());
sumTotalPanhours += Convert.ToInt32((from y in db.SitePerson_DayReportDetail where y.DayReportId == dayReport.DayReportId select y.PersonWorkTime as decimal?).Sum());
}
//总工时数（万）
@@ -584,9 +663,9 @@ namespace FineUIPro.Web.InformationProject
this.txtMinorAccidentPersonNum.Text = accidentReports2.Sum(x => x.PeopleNum ?? 0).ToString();
this.txtMinorAccidentLossHour.Text = accidentReports2.Sum(x => x.WorkingHoursLoss ?? 0).ToString();
List<Model.Accident_AccidentReport> accidentReports3 = BLL.AccidentReportService.GetAccidentReportsByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "1");
this.txtOtherAccidentNum.Text = accidentReports3.Count().ToString();
this.txtOtherAccidentPersonNum.Text = accidentReports3.Sum(x => x.PeopleNum ?? 0).ToString();
this.txtOtherAccidentLossHour.Text = accidentReports3.Sum(x => x.WorkingHoursLoss ?? 0).ToString();
this.txtDeathAccidentNum.Text = accidentReports3.Count().ToString();
this.txtDeathAccidentPersonNum.Text = accidentReports3.Sum(x => x.PeopleNum ?? 0).ToString();
this.txtDeathAccidentLossHour.Text = accidentReports3.Sum(x => x.WorkingHoursLoss ?? 0).ToString();
List<Model.Accident_AccidentReportOther> accidentReports4 = BLL.AccidentReportOtherService.GetAccidentReportOthersByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "1");
this.txtRestrictedWorkPersonNum.Text = accidentReports4.Sum(x => x.PeopleNum ?? 0).ToString();
this.txtRestrictedWorkLossHour.Text = accidentReports4.Sum(x => x.WorkingHoursLoss ?? 0).ToString();
@@ -596,7 +675,7 @@ namespace FineUIPro.Web.InformationProject
List<Model.Accident_AccidentReport> accidentReports6 = BLL.AccidentReportService.GetAccidentReportsByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "4");
this.txtFireNum.Text = accidentReports6.Count().ToString();
List<Model.Accident_AccidentReport> accidentReports7 = BLL.AccidentReportService.GetAccidentReportsByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "5");
this.txtExplosionNum.Text = accidentReports7.Count().ToString();
this.txtEnvironmenNum.Text = accidentReports7.Count().ToString();
List<Model.Accident_AccidentReport> accidentReports8 = BLL.AccidentReportService.GetAccidentReportsByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "6");
this.txtTrafficNum.Text = accidentReports8.Count().ToString();
List<Model.Accident_AccidentReport> accidentReports9 = BLL.AccidentReportService.GetAccidentReportsByTimeAndAccidentTypeId(startTime, endTime, this.ProjectId, "7");