修改生态环保报表

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

@@ -48,10 +48,12 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 this.GetButtonPower();
 
                 BLL.ConstValue.InitConstValueDropDownList(this.drpYear, BLL.ConstValue.Group_0008, true);
-
+                BLL.ConstValue.InitConstValueDropDownList(this.drpQuarters, BLL.ConstValue.Group_0011, true);
                 this.btnNew.OnClientClick = Window1.GetShowReference("EPSummaryReportEdit.aspx") + "return false;";
-                Grid1.PageSize = 10;
-
+                //if (this.CurrUser != null && this.CurrUser.PageSize.HasValue)
+                //{
+                //    Grid1.PageSize = this.CurrUser.PageSize.Value;
+                //}
                 this.ddlPageSize.SelectedValue = Grid1.PageSize.ToString();
                 // 绑定表格
                 this.BindGrid();
@@ -66,6 +68,9 @@ namespace FineUIPro.Web.HSSE.InformationProject
                           + @"report.ProjectId,"
                           + @"report.UnitId,"
                           + @"report.YearId,"
+                          + @"report.Quarter,"
+                          + @"ConstY.ConstText as YearStr,"
+                          + @"ConstQ.ConstText as QuarterStr,"
                           + @"report.ResponsiblePerson,"
                           + @"report.ResponsiblePersonTel,"
                           + @"report.ContactPerson,"
@@ -82,6 +87,8 @@ namespace FineUIPro.Web.HSSE.InformationProject
                           + @"report.Description9,"
                           + @"Unit.UnitName "
                           + @" FROM InformationProject_EPSummaryReport AS report "
+                          + @" LEFT JOIN Sys_Const AS ConstY ON ConstY.ConstValue = report.YearId and ConstY.GroupId='0008' "
+                          + @" LEFT JOIN Sys_Const AS ConstQ ON ConstQ.ConstValue = report.Quarter and ConstQ.GroupId='0011' "
                           + @" LEFT JOIN Base_Unit AS Unit ON Unit.UnitId = report.UnitId WHERE 1=1 ";
 
             List<SqlParameter> listStr = new List<SqlParameter>();
@@ -91,6 +98,11 @@ namespace FineUIPro.Web.HSSE.InformationProject
                 strSql += " AND report.YearId = @Year";
                 listStr.Add(new SqlParameter("@Year", Funs.GetNewInt(this.drpYear.SelectedValue)));
             }
+            if (this.drpQuarters.SelectedValue != BLL.Const._Null)
+            {
+                strSql += " AND report.Quarter = @Quarter";
+                listStr.Add(new SqlParameter("@Quarter", Funs.GetNewInt(this.drpQuarters.SelectedValue)));
+            }
             SqlParameter[] parameter = listStr.ToArray();
             DataTable tb = SQLHelper.GetDataTableRunText(strSql, parameter);