2023-03-30 报表升级

SGGL/FineUIPro.Web/HSSE/InformationProject/MillionsMonthlyReport.aspx.cs

@@ -44,13 +44,15 @@ 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);
 
                 this.btnNew.OnClientClick = Window1.GetShowReference("MillionsMonthlyReportEdit.aspx") + "return false;";
+                Grid1.PageSize = 10;
 
+                this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
             }
@@ -75,6 +77,9 @@ namespace FineUIPro.Web.InformationProject
                           + @"MillionsMonthlyReport.ContractorNum,"
                           + @"MillionsMonthlyReport.SumPersonNum,"
                           + @"MillionsMonthlyReport.TotalWorkNum,"
+                          + @"MillionsMonthlyReport.DeathAccidentNum,"
+                          + @"MillionsMonthlyReport.DeathAccidentPersonNum,"
+                          + @"MillionsMonthlyReport.DeathAccidentLossHour,"
                           + @"MillionsMonthlyReport.SeriousInjuriesNum,"
                           + @"MillionsMonthlyReport.SeriousInjuriesPersonNum,"
                           + @"MillionsMonthlyReport.SeriousInjuriesLossHour,"
@@ -90,6 +95,7 @@ namespace FineUIPro.Web.InformationProject
                           + @"MillionsMonthlyReport.MedicalTreatmentLossHour,"
                           + @"MillionsMonthlyReport.FireNum,"
                           + @"MillionsMonthlyReport.ExplosionNum,"
+                          + @"MillionsMonthlyReport.EnvironmenNum,"
                           + @"MillionsMonthlyReport.TrafficNum,"
                           + @"MillionsMonthlyReport.EquipmentNum,"
                           + @"MillionsMonthlyReport.QualityNum,"
@@ -105,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));
             }
@@ -114,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)));