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

Merge branch 'master' of https://toscode.gitee.com/frane-yang/sggl_cd

Browse Source
This commit is contained in:
李超
2023-07-13 10:09:58 +08:00
parent e4b7694e42 83407432a9
commit dc33ea0366
20 changed files with 271 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReport.aspx
+9 -6
View File
@@ -28,11 +28,14 @@
<f:DropDownList ID="drpYear" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
LabelWidth="50px" Label="年度" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:Button ID="BtnBulletLeft" ToolTip="前一年度" Text ="前一年度" Icon="BulletLeft" runat="server" EnablePostBack="true"
<f:DropDownList ID="drpQuarter" AutoPostBack="true" EnableSimulateTree="true" runat="server" Width="150px"
LabelWidth="50px" Label="季度" OnSelectedIndexChanged="drpUnit_SelectedIndexChanged">
</f:DropDownList>
<f:Button ID="BtnBulletLeft" ToolTip="前一季度" Text ="前一季度" Icon="BulletLeft" runat="server" EnablePostBack="true"
OnClick="BtnBulletLeft_Click">
</f:Button>
<f:Button ID="BtnBulletRight" ToolTip="后一年度" Text ="后一年度" Icon="BulletRight" runat="server" EnablePostBack="true"
OnClick="BtnBulletRight_Click">
<f:Button ID="BtnBulletRight" ToolTip="后一季度" Text="后一季度" Icon="BulletRight" runat="server" EnablePostBack="true"
OnClick="BulletRight_Click">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
<f:Button ID="btnNew" ToolTip="新增" Text ="新增" Icon="Add" Hidden="true" runat="server" OnClick="btnNew_Click">
@@ -53,10 +56,10 @@
<Rows>
<f:FormRow>
<Items>
<f:Label ID="lblUnitName" runat="server" Label="单位" Hidden="true">
</f:Label>
<f:Label ID="lblYearId" runat="server" Label="年度">
</f:Label>
</f:Label>
<f:Label ID="lblQuarter" runat="server" Label="季度">
</f:Label>
<f:Label ID="lblResponsiblePerson" runat="server" Label="负责人">
</f:Label>
<f:Label ID="lblResponsiblePersonTel" runat="server" Label="负责人电话">
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReport.aspx.cs
+51 -25
View File
@@ -40,12 +40,15 @@ namespace FineUIPro.Web.ZHGL.Information
drpYear.DataValueField = "ConstValue";
drpYear.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0008);
drpYear.DataBind();
BLL.ConstValue.InitConstValueDropDownList(this.drpQuarter, ConstValue.Group_0011, false);
this.drpUnit.DataTextField = "UnitName";
drpUnit.DataValueField = "UnitId";
drpUnit.DataSource = BLL.UnitService.GetThisUnitDropDownList();
drpUnit.DataBind();
this.drpUnit.Readonly = true;
drpYear.SelectedValue = System.DateTime.Now.Year.ToString();
DateTime showDate = System.DateTime.Now.AddMonths(-3);
this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
this.drpYear.SelectedValue = showDate.Year.ToString();
GetValue();
}
}
@@ -58,8 +61,8 @@ namespace FineUIPro.Web.ZHGL.Information
private void SetEmpty()
{
this.SimpleForm1.Title = string.Empty;
lblUnitName.Text = string.Empty;
lblYearId.Text = string.Empty;
lblQuarter.Text = string.Empty;
lblResponsiblePerson.Text = string.Empty;
lblResponsiblePersonTel.Text = string.Empty;
lblContactPerson.Text = string.Empty;
@@ -75,7 +78,8 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.SetEmpty();
int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
Model.Information_EPSummaryReport report = Funs.DB.Information_EPSummaryReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.YearId == year);
int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
Model.Information_EPSummaryReport report = Funs.DB.Information_EPSummaryReport.FirstOrDefault(e => e.UnitId == drpUnit.SelectedValue && e.YearId == year && e.Quarter == quarter);
if (report != null)
{
string upState = string.Empty;
@@ -88,12 +92,8 @@ namespace FineUIPro.Web.ZHGL.Information
upState = "(未上报)";
}
this.SimpleForm1.Title = "生态环保工作总结报告" + upState;
if (!string.IsNullOrEmpty(report.UnitId))
{
this.lblUnitName.Text = BLL.UnitService.GetUnitNameByUnitId(report.UnitId);
}
this.lblYearId.Text = report.YearId.ToString();
this.lblYearId.Text = drpYear.SelectedItem.Text;
this.lblQuarter.Text = drpQuarter.SelectedItem.Text;
this.GetTxetValue(report);
}
else
@@ -163,7 +163,7 @@ namespace FineUIPro.Web.ZHGL.Information
/// <param name="e"></param>
protected void btnNew_Click(object sender, EventArgs e)
{
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EPSummaryReportEdit.aspx?UnitId={0}&&Year={1}", this.CurrUser.UnitId, this.drpYear.SelectedValue, "编辑 - ")));
PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("EPSummaryReportEdit.aspx?UnitId={0}&Year={1}&Quarter={2}", this.CurrUser.UnitId, this.drpYear.SelectedValue, this.drpQuarter.SelectedValue, "编辑 - ")));
}
/// <summary>
@@ -171,7 +171,8 @@ namespace FineUIPro.Web.ZHGL.Information
/// </summary>
private void ShowEdit()
{
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearId(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue));
int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearIdAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), quarter);
if (report == null)
{
Alert.ShowInTop("所选时间无报表记录！", MessageBoxIcon.Warning);
@@ -207,7 +208,8 @@ namespace FineUIPro.Web.ZHGL.Information
/// <param name="e"></param>
protected void btnDelete_Click(object sender, EventArgs e)
{
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearId(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue));
int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearIdAndQuarters(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), quarter);
if (report != null)
{
BLL.LogService.AddSys_Log(this.CurrUser, this.lblYearId.Text, report.EPSummaryReportId, BLL.Const.EPSummaryReportMenuId, BLL.Const.BtnDelete);
@@ -274,8 +276,8 @@ namespace FineUIPro.Web.ZHGL.Information
// this.btnPrint.Hidden = false;
//}
int year = Funs.GetNewIntOrZero(drpYear.SelectedValue);
//int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
var report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearId(this.drpUnit.SelectedValue, year);
int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
var report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearIdAndQuarters(this.drpUnit.SelectedValue, year, quarter);
//this.btnAudit1.Hidden = true;
//this.btnAudit2.Hidden = true;
//this.btnUpdata.Hidden = true;
@@ -300,29 +302,51 @@ namespace FineUIPro.Web.ZHGL.Information
#endregion
#region 上一年度、下一年度
#region 季度向前/向后
/// <summary>
/// 上一年度
/// 前一季度
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnBulletLeft_Click(object sender, EventArgs e)
{
int y = Convert.ToInt32(drpYear.SelectedValue) - 1;
drpYear.SelectedValue = y.ToString();
GetValue();
SetMonthChange("-");
}
/// <summary>
/// 下一年度
/// 后一季度
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
protected void BtnBulletRight_Click(object sender, EventArgs e)
protected void BulletRight_Click(object sender, EventArgs e)
{
int y = Convert.ToInt32(drpYear.SelectedValue) + 1;
drpYear.SelectedValue = y.ToString();
GetValue();
SetMonthChange("+");
}
/// <summary>
/// 季度加减变化
/// </summary>
/// <param name="type"></param>
private void SetMonthChange(string type)
{
DateTime? nowDate = Funs.GetNewDateTime(this.drpYear.SelectedValue + "-" + (Funs.GetNewIntOrZero(this.drpQuarter.SelectedValue) * 3).ToString());
if (nowDate.HasValue)
{
DateTime showDate = new DateTime();
if (type == "+")
{
showDate = nowDate.Value.AddMonths(3);
}
else
{
showDate = nowDate.Value.AddMonths(-3);
}
this.drpYear.SelectedValue = showDate.Year.ToString();
this.drpQuarter.SelectedValue = Funs.GetNowQuarterlyByTime(showDate).ToString();
///值变化
GetValue();
}
}
#endregion
@@ -336,13 +360,15 @@ namespace FineUIPro.Web.ZHGL.Information
{
string info = string.Empty;
int date = Convert.ToInt32(this.drpYear.SelectedValue);
int quarter = Funs.GetNewIntOrZero(drpQuarter.SelectedValue);
var projects = (from x in Funs.DB.Base_Project
where (x.ProjectState == BLL.Const.ProjectState_1 || x.ProjectState == null)
&& x.ProjectAttribute == "GONGCHENG"
&& x.StartDate.Value.Year <= date
select x).ToList();
foreach (var item in projects)
{
var report = Funs.DB.InformationProject_EPSummaryReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.YearId == date);
var report = Funs.DB.InformationProject_EPSummaryReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.YearId == date && x.Quarter == quarter);
if (report == null)
{
info += item.ProjectCode + ":" + item.ProjectName + "，未填写报表；</br>";
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReport.aspx.designer.cs
Generated
+18 -9
View File
@@ -84,6 +84,15 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.DropDownList drpYear;
/// <summary>
/// drpQuarter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList drpQuarter;
/// <summary>
/// BtnBulletLeft 控件。
/// </summary>
@@ -147,15 +156,6 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.Button btnView;
/// <summary>
/// lblUnitName 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblUnitName;
/// <summary>
/// lblYearId 控件。
/// </summary>
@@ -165,6 +165,15 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.Label lblYearId;
/// <summary>
/// lblQuarter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.Label lblQuarter;
/// <summary>
/// lblResponsiblePerson 控件。
/// </summary>
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReportEdit.aspx
+4 -2
View File
@@ -14,12 +14,14 @@
<f:Form ID="SimpleForm1" ShowBorder="false" ShowHeader="false" AutoScroll="true"
BodyPadding="10px" runat="server" RedStarPosition="BeforeText" LabelAlign="Right">
<Rows>
<f:FormRow ColumnWidths="50% 25% 25%">
<f:FormRow>
<Items>
<f:DropDownList ID="ddlUnitId" runat="server" Label="单位" Required="True" ShowRedStar="True" FocusOnPageLoad="true">
</f:DropDownList>
<f:DropDownList ID="ddlYearId" runat="server" Label="年度" Required="True" ShowRedStar="True">
</f:DropDownList>
<f:DropDownList ID="ddlQuarter" runat="server" Label="季度" Required="True" ShowRedStar="True">
</f:DropDownList>
<f:DatePicker ID="txtReportDate" runat="server" Label="报告时间" Required="true" ShowRedStar="true"></f:DatePicker>
</Items>
</f:FormRow>
@@ -125,7 +127,7 @@
<Toolbars>
<f:Toolbar ID="Toolbar1" Position="Bottom" ToolbarAlign="Right" runat="server" Margin="0 50 30 50">
<Items>
<f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="复制上年度数据" Text="复制上年度数据"
<f:Button ID="btnCopy" Icon="Database" runat="server" ToolTip="复制上季度数据" Text="复制上季度数据"
ValidateForms="SimpleForm1" OnClick="btnCopy_Click" Hidden="true">
</f:Button>
<f:ToolbarFill runat="server"></f:ToolbarFill>
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReportEdit.aspx.cs
+38 -9
View File
@@ -45,9 +45,15 @@ namespace FineUIPro.Web.ZHGL.Information
ddlYearId.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0008);
ddlYearId.DataBind();
this.ddlQuarter.DataTextField = "ConstText";
ddlQuarter.DataValueField = "ConstValue";
ddlQuarter.DataSource = BLL.ConstValue.drpConstItemList(ConstValue.Group_0011);
ddlQuarter.DataBind();
this.ddlUnitId.Readonly = true;
string unitId = Request.Params["UnitId"];
string year = Request.QueryString["Year"];
string quarter = Request.QueryString["Quarter"];
this.EPSummaryReportId = Request.Params["EPSummaryReportId"];
if (!string.IsNullOrEmpty(this.EPSummaryReportId))
{
@@ -66,6 +72,10 @@ namespace FineUIPro.Web.ZHGL.Information
this.ddlUnitId.SelectedValue = report.UnitId;
}
this.ddlYearId.SelectedValue = report.YearId.ToString();
if (report.Quarter.HasValue)
{
this.ddlQuarter.SelectedValue = report.Quarter.ToString();
}
this.txtReportDate.Text = report.ReportDate.HasValue ? string.Format("{0:yyyy-MM-dd}", report.ReportDate) : "";
this.txtResponsiblePerson.Text = report.ResponsiblePerson;
this.txtResponsiblePersonTel.Text = report.ResponsiblePersonTel;
@@ -88,6 +98,7 @@ namespace FineUIPro.Web.ZHGL.Information
this.btnCopy.Hidden = false;
this.ddlUnitId.SelectedValue = unitId;
this.ddlYearId.SelectedValue = year;
this.ddlQuarter.SelectedValue = quarter;
this.txtReportDate.Text = string.Format("{0:yyyy-MM-dd}", DateTime.Now);
#region 获取项目上报数据
@@ -97,19 +108,19 @@ namespace FineUIPro.Web.ZHGL.Information
string description4 = string.Empty;
string description5 = string.Empty;
string description6 = string.Empty;
string description7= string.Empty;
string description7 = string.Empty;
string description8 = string.Empty;
string description9 = string.Empty;
int date = Convert.ToInt32(this.ddlYearId.SelectedValue);
var projects = (from x in Funs.DB.Base_Project
where (x.ProjectState == BLL.Const.ProjectState_1 || x.ProjectState == null)
&& x.ProjectAttribute == "GONGCHENG"
&& x.StartDate.Value.Year <= date
select x).ToList();
foreach (var item in projects)
{
var report = Funs.DB.InformationProject_EPSummaryReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.YearId == date);
var report = Funs.DB.InformationProject_EPSummaryReport.FirstOrDefault(x => x.ProjectId == item.ProjectId && x.YearId == date && x.Quarter.ToString() == quarter);
if (report != null)
{
description1 += item.ProjectName + "：\r\n" + report.Description1 + "\r\n";
@@ -160,6 +171,15 @@ namespace FineUIPro.Web.ZHGL.Information
ShowNotify("请选择年度！", MessageBoxIcon.Warning);
return;
}
if (this.ddlQuarter.SelectedValue != BLL.Const._Null)
{
report.Quarter = Funs.GetNewIntOrZero(this.ddlQuarter.SelectedValue);
}
else
{
ShowNotify("请选择年度！", MessageBoxIcon.Warning);
return;
}
report.ResponsiblePerson = this.txtResponsiblePerson.Text.Trim();
report.ResponsiblePersonTel = this.txtResponsiblePersonTel.Text.Trim();
report.ContactPerson = this.txtContactPerson.Text.Trim();
@@ -174,9 +194,10 @@ namespace FineUIPro.Web.ZHGL.Information
report.Description7 = this.txtDescription7.Text.Trim();
report.Description8 = this.txtDescription8.Text.Trim();
report.Description9 = this.txtDescription9.Text.Trim();
int quarter = Funs.GetNewIntOrZero(ddlQuarter.SelectedValue);
if (string.IsNullOrEmpty(this.EPSummaryReportId))
{
var s = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearId(this.ddlUnitId.SelectedValue, Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue));
var s = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearIdAndQuarters(this.ddlUnitId.SelectedValue, Funs.GetNewIntOrZero(this.ddlYearId.SelectedValue), quarter);
if (s != null)
{
ShowNotify("该单位的该年度的该生态环保工作总结报告已经存在，不能重复编制！", MessageBoxIcon.Warning);
@@ -247,12 +268,20 @@ namespace FineUIPro.Web.ZHGL.Information
/// <param name="e"></param>
protected void btnCopy_Click(object sender, EventArgs e)
{
int lastYear = 0;
int lastYear = 0, lastQuarter = 0;
int year = Convert.ToInt32(this.ddlYearId.SelectedValue);
lastYear = year - 1;
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearId(this.ddlUnitId.SelectedValue, lastYear);
int quarter = Convert.ToInt32(this.ddlQuarter.SelectedValue);
if (quarter == 1)
{
lastYear = year - 1;
lastQuarter = 4;
}
else
{
lastYear = year;
lastQuarter = quarter - 1;
}
Model.Information_EPSummaryReport report = BLL.EPSummaryReportService.GetEPSummaryReportByUnitIdAndYearIdAndQuarters(this.ddlUnitId.SelectedValue, lastYear, lastQuarter);
if (report != null)
{
Model.Information_EPSummaryReport newReport = new Model.Information_EPSummaryReport();
SGGL/FineUIPro.Web/ZHGL/Information/EPSummaryReportEdit.aspx.designer.cs
Generated
+9
View File
@@ -57,6 +57,15 @@ namespace FineUIPro.Web.ZHGL.Information {
/// </remarks>
protected global::FineUIPro.DropDownList ddlYearId;
/// <summary>
/// ddlQuarter 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.DropDownList ddlQuarter;
/// <summary>
/// txtReportDate 控件。
/// </summary>