diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx
index 98f0cbc8..89cabc03 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx
@@ -65,6 +65,9 @@
+
+
diff --git a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
index 24e04338..99538533 100644
--- a/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
+++ b/SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReport.aspx.cs
@@ -667,5 +667,57 @@ namespace FineUIPro.Web.ZHGL.Environmental
}
#endregion
#endregion
+
+ #region 查看未上报的项目
+ ///
+ /// 查看未上报的项目
+ ///
+ ///
+ ///
+ protected void btnView_Click(object sender, EventArgs e)
+ {
+ string info = string.Empty;
+ int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
+ int Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue);
+ var projects = (from x in Funs.DB.Base_Project
+ where (x.ProjectState == BLL.Const.ProjectState_1 || x.ProjectState == null)
+ && (x.IsDelete == null || x.IsDelete == false)
+ select x).ToList();
+ foreach (var item in projects)
+ {
+ var projectArchitectureReport = Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.Year == year && x.Quarters == Quarters);
+ if (projectArchitectureReport == null)
+ {
+ info += item.ProjectName + ",未填写报表;";
+ }
+ else
+ {
+ if (projectArchitectureReport.UpState != BLL.Const.State_2)
+ {
+ info += item.ProjectName + "报表未报;";
+ var flows = (from x in Funs.DB.Sys_FlowOperate
+ join y in Funs.DB.Sys_User on x.OperaterId equals y.UserId
+ where x.DataId == projectArchitectureReport.ArchitectureReportId && x.IsClosed != false
+ select y).FirstOrDefault();
+ if (flows != null)
+ {
+ info += "待" + flows.UserName + "处理;";
+ }
+ info += "";
+ }
+ }
+ }
+
+ if (!string.IsNullOrEmpty(info))
+ {
+ Alert.ShowInTop(info + "项目报表未上报。", MessageBoxIcon.Warning);
+ }
+ else
+ {
+ ShowNotify("项目报表已上报", MessageBoxIcon.Success);
+ }
+
+ }
+ #endregion
}
}
\ No newline at end of file