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/ZHGL/Environmental/ArchitectureReport.aspx.cs
+3 -3
View File
@@ -1,9 +1,9 @@
using System;
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
SGGL/FineUIPro.Web/ZHGL/Environmental/ArchitectureReportSave.aspx.cs
+21 -21
View File
@@ -1370,7 +1370,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
return;
}
else if (code=="3")
else if (code == "3")
{
Alert.ShowInParent("集团当前季度数据已锁定，无法上传！", MessageBoxIcon.Error);
}
@@ -1389,26 +1389,26 @@ namespace FineUIPro.Web.ZHGL.Environmental
protected void btnSave_Click(object sender, EventArgs e)
{
/* bool isEmpty = false;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int rowIndex = mergedRow.Value<int>("index");
string sortIndex = values.Value<string>("SortIndex");
if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
{
if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
{
isEmpty = true;
break;
}
}
}
if (isEmpty)
{
ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
return;
}*/
/* bool isEmpty = false;
foreach (JObject mergedRow in Grid1.GetMergedData())
{
JObject values = mergedRow.Value<JObject>("values");
int rowIndex = mergedRow.Value<int>("index");
string sortIndex = values.Value<string>("SortIndex");
if (sortIndex == "18" || sortIndex == "37" || sortIndex == "38")
{
if (Funs.GetNewDecimalOrZero(System.Web.HttpUtility.HtmlDecode(values.Value<string>("ThisYearValue"))) == 0)
{
isEmpty = true;
break;
}
}
}
if (isEmpty)
{
ShowNotify("营业收入(可比价)、万元收入二氧化碳排放(可比价)和二氧化碳排放量不能为空，必须填报数据！", MessageBoxIcon.Warning);
return;
}*/
Save("add");
ShowNotify("保存成功！", MessageBoxIcon.Success);
PageContext.RegisterStartupScript(ActiveWindow.GetHidePostBackReference());
SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReport.aspx.cs
+5 -5
View File
@@ -1,9 +1,9 @@
using System;
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
using Newtonsoft.Json.Linq;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -211,7 +211,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
if (buttonList.Contains(BLL.Const.BtnDelete))
{
this.btnDelete.Hidden = false;
}
}
}
var getReport = BLL.ChemicalReportService.GetChemicalReportByUnitIdAndYearAndMonth(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
@@ -234,7 +234,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
// }
// else if (getReport.HandleState == BLL.Const.HandleState_4)
// {
this.btnUpdata.Hidden = false;
this.btnUpdata.Hidden = false;
// }
//}
}
SGGL/FineUIPro.Web/ZHGL/Environmental/ChemicalReportSave.aspx.cs
-1
View File
@@ -1,7 +1,6 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReport.aspx.cs
-3
View File
@@ -3,9 +3,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
SGGL/FineUIPro.Web/ZHGL/Environmental/EnergyReportSave.aspx.cs
+7 -7
View File
@@ -1,11 +1,9 @@
using BLL;
using Model;
using Newtonsoft.Json.Linq;
using Org.BouncyCastle.Asn1.Ocsp;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web.UI.WebControls;
@@ -468,7 +466,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
var model = new Environmental_EnergyReportItem
{
EnergyReportItemId = SQLHelper.GetNewID(typeof(Model.Environmental_EnergyReportItem)),
BusinessCategory = getLenthSpace(indexName.SortIndex) +isthisUnit.UnitName,
BusinessCategory = getLenthSpace(indexName.SortIndex) + isthisUnit.UnitName,
SortIndex = item.SortIndex,
SortUnit = 2,
};
@@ -481,7 +479,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
model = new Environmental_EnergyReportItem
{
EnergyReportItemId = SQLHelper.GetNewID(typeof(Model.Environmental_EnergyReportItem)),
BusinessCategory = getLenthSpace(indexName.SortIndex) +unitItem.UnitName,
BusinessCategory = getLenthSpace(indexName.SortIndex) + unitItem.UnitName,
SortIndex = item.SortIndex,
SortUnit = j,
};
@@ -654,16 +652,18 @@ namespace FineUIPro.Web.ZHGL.Environmental
#endregion
#region 取具体数量的空格
private string getLenthSpace(string SortIndex) {
private string getLenthSpace(string SortIndex)
{
string returnVal = "";
if (SortIndex == "02" || SortIndex == "16" || SortIndex == "44")
{
returnVal += "A";
}
else {
else
{
returnVal += "B";
}
return returnVal;
}
#endregion
SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReport.aspx.cs
+3 -4
View File
@@ -5,8 +5,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -97,7 +95,8 @@ namespace FineUIPro.Web.ZHGL.Environmental
}
this.Grid1.Title = "中央企业节能环保和经营状况季报" + this.drpQuarters.SelectedItem.Text + this.drpYear.SelectedItem.Text + upState;
}
else {
else
{
var upState = "(未上报)";
@@ -232,7 +231,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
Model.Environmental_OperationReport report = Funs.DB.Environmental_OperationReport.Where(s => s.UnitId == currUnitId && s.Year.ToString() == year && s.Quarters.ToString() == quarter).FirstOrDefault();
if (report != null)
{
if (report.UpState=="3")
if (report.UpState == "3")
{
ShowNotify("当前报表已经上报！不能重复上报。", MessageBoxIcon.Warning);
return;
SGGL/FineUIPro.Web/ZHGL/Environmental/OperationReportEdit.aspx.cs
+24 -21
View File
@@ -66,7 +66,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
ddlUnitId.SelectedValue = BLL.Const.UnitId_SEDIN;
BindGrid(year, quarter, unitId);
}
}
@@ -170,19 +170,20 @@ namespace FineUIPro.Web.ZHGL.Environmental
var reportItemlist = new List<Model.Environmental_OperationReportItem>();
//第一个本单位
var isthisUnit = CommonService.GetIsThisUnit();
var reportItemModel = new Model.Environmental_OperationReportItem() {
var reportItemModel = new Model.Environmental_OperationReportItem()
{
BusinessReportItemId = Guid.NewGuid().ToString(),
SortIndex = 1,
UnitName = isthisUnit.UnitName,
SortUnitName= isthisUnit.UnitName,
SortUnitName = isthisUnit.UnitName,
Code = isthisUnit.UnitCode,
UnitLevel = "",
CreateDate=null,
Place= isthisUnit.Address,
PersonNum=0,
TotalAssets=0,
TotalValue=0,
NewInvestment=0,
CreateDate = null,
Place = isthisUnit.Address,
PersonNum = 0,
TotalAssets = 0,
TotalValue = 0,
NewInvestment = 0,
};
reportItemlist.Add(reportItemModel);
//加载分单位
@@ -363,10 +364,11 @@ namespace FineUIPro.Web.ZHGL.Environmental
#endregion
#region 保存子表
private void saveReportItem(string BusinessReportId) {
private void saveReportItem(string BusinessReportId)
{
var list = Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == BusinessReportId).ToList();
//先删除
if (list.Count>0)
if (list.Count > 0)
{
Funs.DB.Environmental_OperationReportItem.DeleteAllOnSubmit(list);
Funs.DB.SubmitChanges();
@@ -379,17 +381,18 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
JObject values = item.Value<JObject>("values");
int i = item.Value<int>("index");
var model = new Model.Environmental_OperationReportItem() {
BusinessReportItemId= Grid1.Rows[i].DataKeys[0].ToString(),
BusinessReportId= BusinessReportId,
SortIndex= i+1,
var model = new Model.Environmental_OperationReportItem()
{
BusinessReportItemId = Grid1.Rows[i].DataKeys[0].ToString(),
BusinessReportId = BusinessReportId,
SortIndex = i + 1,
UnitName = values.Value<string>("UnitName").ToString(),
SortUnitName= isthisUnit.UnitName,
Code= values.Value<string>("Code").ToString(),
UnitLevel= values.Value<string>("UnitLevel").ToString(),
Place= values.Value<string>("Place").ToString(),
PersonNum= values.Value<int>("PersonNum"),
TotalAssets= values.Value<decimal>("TotalAssets"),
SortUnitName = isthisUnit.UnitName,
Code = values.Value<string>("Code").ToString(),
UnitLevel = values.Value<string>("UnitLevel").ToString(),
Place = values.Value<string>("Place").ToString(),
PersonNum = values.Value<int>("PersonNum"),
TotalAssets = values.Value<decimal>("TotalAssets"),
TotalValue = values.Value<decimal>("TotalValue"),
NewInvestment = values.Value<decimal>("NewInvestment"),
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReport.aspx.cs
+4 -4
View File
@@ -1,8 +1,8 @@
using System;
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -39,9 +39,9 @@ namespace FineUIPro.Web.ZHGL.Environmental
this.InitDropDownList();
this.ucTree.UnitId = this.CurrUser.UnitId;
this.ucTree.ProjectId = this.ProjectId;
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId) )
if (!string.IsNullOrEmpty(this.CurrUser.LoginProjectId))
{
this.panelLeftRegion.Hidden = true;
this.panelLeftRegion.Hidden = true;
////权限按钮方法
this.GetButtonPower();
}
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectArchitectureReportSave.aspx.cs
+1 -3
View File
@@ -3,9 +3,7 @@ using Model;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
{
@@ -51,7 +49,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
drpUnit.DataValueField = "UnitId";
drpUnit.DataSource = BLL.UnitService.GetThisUnitDropDownList();
drpUnit.DataBind();
this.drpUnit.Readonly = true;
this.drpUnit.Readonly = true;
string year = Request.QueryString["Year"];
string months = Request.QueryString["Months"];
ArchitectureReportId = Request.QueryString["ArchitectureReportId"];
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReport.aspx.cs
+2 -2
View File
@@ -1,8 +1,8 @@
using System;
using BLL;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using BLL;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectChemicalReportSave.aspx.cs
-1
View File
@@ -5,7 +5,6 @@ using System;
using System.Collections.Generic;
using System.Data;
using System.Linq;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
{
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReport.aspx.cs
+1 -4
View File
@@ -3,9 +3,6 @@ using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
using AspNet = System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
@@ -63,7 +60,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
{
upState = "(未上报)";
}
this.SimpleForm1.Title = "中央企业节能环保产业企业生产和服务业务情况报表" + report.QuartersStr + report.YearStr ;
this.SimpleForm1.Title = "中央企业节能环保产业企业生产和服务业务情况报表" + report.QuartersStr + report.YearStr;
lbUnitName.Text = "填报企业：" + report.ProjectName;
if (report.FillingDate != null)
{
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectEnergyReportSave.aspx.cs
+1 -4
View File
@@ -4,9 +4,6 @@ using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
{
@@ -243,7 +240,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
//string EnergyReportId = Request.QueryString["EnergyReportId"];
Model.Environmental_ProjectEnergyReport report = new Environmental_ProjectEnergyReport
{
ProjectId=this.CurrUser.LoginProjectId,
ProjectId = this.CurrUser.LoginProjectId,
Year = Funs.GetNewIntOrZero(drpYear.SelectedValue),
Quarters = Funs.GetNewIntOrZero(drpQuarters.SelectedValue)
};
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReport.aspx.cs
-3
View File
@@ -5,9 +5,6 @@ using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
{
SGGL/FineUIPro.Web/ZHGL/Environmental/ProjectOperationReportEdit.aspx.cs
-7
View File
@@ -1,14 +1,7 @@
using BLL;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Reflection;
using System.Web;
using System.Web.UI;
using System.Web.UI.WebControls;
namespace FineUIPro.Web.ZHGL.Environmental
{