lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码无效引用清理，试压包资料界面看板修改

Browse Source
This commit is contained in:
李鹏飞
2025-10-10 14:33:21 +08:00
parent 87fb529521
commit 55b798135c
933 changed files with 5897 additions and 7541 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/HSSE/InformationProject/ConstructionStandardIdentifyEdit.aspx.cs
+2 -2
View File
@@ -152,7 +152,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
where x.StandardName != null && z.ProjectId == this.CurrUser.LoginProjectId
select new Model.View_InformationProject_ConstructionStandardSelectedItem
{
ConstructionStandardSelectedItemId =y.ConstructionStandardSelectedItemId,
ConstructionStandardSelectedItemId = y.ConstructionStandardSelectedItemId,
ConstructionStandardIdentifyId = y.ConstructionStandardIdentifyId,
ProjectId = this.CurrUser.LoginProjectId,
StandardId = x.StandardId,
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
where x.ConstructionStandardIdentifyId == this.ConstructionStandardIdentifyId
select x;
}
if (!string.IsNullOrEmpty(this.txtStandardGrade.Text.Trim()))
{
q = q.Where(e => e.StandardGrade.Contains(this.txtStandardGrade.Text.Trim()));
SGGL/FineUIPro.Web/HSSE/InformationProject/EPSummaryReport.aspx.cs
+1 -1
View File
@@ -254,4 +254,4 @@ namespace FineUIPro.Web.HSSE.InformationProject
}
#endregion
}
}
}
SGGL/FineUIPro.Web/HSSE/InformationProject/EPSummaryReportEdit.aspx.cs
-4
View File
@@ -1,10 +1,6 @@
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.HSSE.InformationProject
{
SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs
+3 -3
View File
@@ -44,7 +44,7 @@ namespace FineUIPro.Web.InformationProject
}
////权限按钮方法
this.GetButtonPower();
this.GetButtonPower();
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, BLL.ConstValue.Group_0009, true);
@@ -111,7 +111,7 @@ namespace FineUIPro.Web.InformationProject
List<SqlParameter> listStr = new List<SqlParameter>();
strSql += " AND MillionsMonthlyReport.ProjectId = '" + this.ProjectId + "'";
if (!string.IsNullOrEmpty(Request.Params["projectId"])) ///是否文件柜查看页面传项目值
{
{
strSql += " AND MillionsMonthlyReport.States = @States"; ///状态为已完成
listStr.Add(new SqlParameter("@States", BLL.Const.State_2));
}
@@ -120,7 +120,7 @@ namespace FineUIPro.Web.InformationProject
strSql += " AND MillionsMonthlyReport.Year = @Year";
listStr.Add(new SqlParameter("@Year", Funs.GetNewInt(this.drpYear.SelectedValue)));
}
if (this.drpMonth.SelectedValue!=BLL.Const._Null)
if (this.drpMonth.SelectedValue != BLL.Const._Null)
{
strSql += " AND MillionsMonthlyReport.Month = @Month ";
listStr.Add(new SqlParameter("@Month", Funs.GetNewInt(this.drpMonth.SelectedValue)));
SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportEdit.aspx.cs
+7 -10
View File
@@ -1,10 +1,7 @@
using System;
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using BLL;
namespace FineUIPro.Web.InformationProject
{
@@ -63,7 +60,7 @@ namespace FineUIPro.Web.InformationProject
BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
BLL.ConstValue.InitConstValueDropDownList(this.drpMonth, BLL.ConstValue.Group_0009, true);
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId,"", true);
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId, "", true);
this.MillionsMonthlyReportId = Request.Params["MillionsMonthlyReportId"];
if (!string.IsNullOrEmpty(this.MillionsMonthlyReportId))
@@ -72,7 +69,7 @@ namespace FineUIPro.Web.InformationProject
if (millionsMonthlyReport != null)
{
this.ProjectId = millionsMonthlyReport.ProjectId;
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId,"", true);
BLL.Person_PersonsService.InitFlowOperateControlUserDropDownList(this.drpCompileMan, this.ProjectId, "", true);
if (millionsMonthlyReport.Year != null)
{
this.drpYear.SelectedValue = Convert.ToString(millionsMonthlyReport.Year);
@@ -353,7 +350,7 @@ namespace FineUIPro.Web.InformationProject
if (flowOperate != null)
{
millionsMonthlyReport.States = BLL.Const.State_2;
}
}
else
{
millionsMonthlyReport.States = this.ctlAuditFlow.NextStep;
@@ -381,7 +378,7 @@ namespace FineUIPro.Web.InformationProject
millionsMonthlyReport.MedicalTreatmentLossHour = Funs.GetNewInt(this.txtMedicalTreatmentLossHour.Text.Trim());
millionsMonthlyReport.FireNum = Funs.GetNewInt(this.txtFireNum.Text.Trim());
millionsMonthlyReport.EnvironmenNum = Funs.GetNewInt(this.txtEnvironmenNum.Text.Trim());
millionsMonthlyReport.TrafficNum = Funs.GetNewInt(this.txtTrafficNum.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());
@@ -409,7 +406,7 @@ namespace FineUIPro.Web.InformationProject
millionsMonthlyReport.MillionsMonthlyReportId = this.MillionsMonthlyReportId;
BLL.ProjectMillionsMonthlyReportService.UpdateMillionsMonthlyReport(millionsMonthlyReport);
BLL.LogService.AddSys_Log(this.CurrUser, millionsMonthlyReport.Year.ToString() + "-" + millionsMonthlyReport.Month.ToString(), millionsMonthlyReport.MillionsMonthlyReportId, BLL.Const.ProjectMillionsMonthlyReportMenuId, BLL.Const.BtnModify);
}
else
{
SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReportView.aspx.cs
+4 -9
View File
@@ -1,9 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.InformationProject
{
@@ -68,7 +63,7 @@ namespace FineUIPro.Web.InformationProject
if (millionsMonthlyReport.Year != null)
{
var constValue = BLL.ConstValue.GetConstByConstValueAndGroupId(millionsMonthlyReport.Year.ToString(), BLL.ConstValue.Group_0008);
if (constValue!=null)
if (constValue != null)
{
this.txtYear.Text = constValue.ConstText;
}
@@ -122,7 +117,7 @@ namespace FineUIPro.Web.InformationProject
if (millionsMonthlyReport.MinorAccidentLossHour != null)
{
this.txtMinorAccidentLossHour.Text = Convert.ToString(millionsMonthlyReport.MinorAccidentLossHour);
}
}
if (millionsMonthlyReport.DeathAccidentNum != null)
{
this.txtDeathAccidentNum.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentNum);
@@ -131,7 +126,7 @@ namespace FineUIPro.Web.InformationProject
{
this.txtDeathAccidentPersonNum.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentPersonNum);
}
if (millionsMonthlyReport.DeathAccidentLossHour!= null)
if (millionsMonthlyReport.DeathAccidentLossHour != null)
{
this.txtDeathAccidentLossHour.Text = Convert.ToString(millionsMonthlyReport.DeathAccidentLossHour);
}
@@ -254,7 +249,7 @@ namespace FineUIPro.Web.InformationProject
if (!string.IsNullOrEmpty(millionsMonthlyReport.CompileMan))
{
var user = BLL.Person_PersonsService.GetPerson_PersonsById(millionsMonthlyReport.CompileMan);
if (user!=null)
if (user != null)
{
this.txtCompileManName.Text = user.PersonName;
}
SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReport.aspx.cs
+1 -1
View File
@@ -192,7 +192,7 @@ namespace FineUIPro.Web.HSSE.InformationProject
//}
//else
//{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkSummaryReportEdit.aspx?workSummaryReportId={0}", id, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("WorkSummaryReportEdit.aspx?workSummaryReportId={0}", id, "编辑 - ")));
//}
}
}
SGGL/FineUIPro.Web/HSSE/InformationProject/WorkSummaryReportEdit.aspx.cs
+3 -3
View File
@@ -183,15 +183,15 @@ namespace FineUIPro.Web.HSSE.InformationProject
else
{
Model.InformationProject_WorkSummaryReport oldReport = (from x in Funs.DB.InformationProject_WorkSummaryReport
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
select x).FirstOrDefault();
where x.ProjectId == report.ProjectId && x.YearId == report.YearId
select x).FirstOrDefault();
if (oldReport == null)
{
this.WorkSummaryReportId = SQLHelper.GetNewID(typeof(Model.InformationProject_WorkSummaryReport));
report.WorkSummaryReportId = this.WorkSummaryReportId;
BLL.ProjectWorkSummaryReportService.AddWorkSummaryReport(report);
BLL.LogService.AddSys_Log(this.CurrUser, report.YearId.ToString(), report.WorkSummaryReportId, BLL.Const.ProjectWorkSummaryReportMenuId, BLL.Const.BtnAdd);
}
else
{