提交代码

This commit is contained in:
2024-10-30 17:15:30 +08:00
parent a2afd22163
commit 254c7ac7c0
24 changed files with 1527 additions and 828 deletions
@@ -86,35 +86,35 @@ namespace FineUIPro.Web.ZHGL.Environmental
var businessCategorys = EnergyreportItemService.GetItems("Template");
//之前月度合计值集合
List<Model.Environmental_EnergyReportItem> reportItems = BLL.EnergyreportItemService.GetItems(report.EnergyReportId);
List<Model.Environmental_EnergyReportItem> newItemList = new List<Model.Environmental_EnergyReportItem>();
foreach (var item in reportItems)
{
Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
newItem.EnergyReportItemId = item.EnergyReportItemId;
newItem.EnergyReportId = item.EnergyReportId;
newItem.SortIndex = item.SortIndex;
newItem.BusinessCategory = item.BusinessCategory;
newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
newItem.Yield_BasePeriod = item.Yield_BasePeriod;
newItem.Yield_LastPeriod = item.Yield_LastPeriod;
newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
newItem.OutputValue_LastYear = item.OutputValue_LastYear;
newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
newItem.OperationScale_LastYear = item.OperationScale_LastYear;
newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
newItemList.Add(item);
}
Grid1.DataSource = newItemList;
//List<Model.Environmental_EnergyReportItem> newItemList = new List<Model.Environmental_EnergyReportItem>();
//foreach (var item in reportItems)
//{
// Model.Environmental_EnergyReportItem newItem = new Model.Environmental_EnergyReportItem();
// newItem.EnergyReportItemId = item.EnergyReportItemId;
// newItem.EnergyReportId = item.EnergyReportId;
// newItem.SortIndex = item.SortIndex;
// newItem.BusinessCategory = item.BusinessCategory;
// newItem.Throughput_BasePeriod = item.Throughput_BasePeriod;
// newItem.Throughput_LastPeriod = item.Throughput_LastPeriod;
// newItem.Throughput_ThisPeriod = item.Throughput_ThisPeriod;
// newItem.Throughput_UnitOfMeasurement = item.Throughput_UnitOfMeasurement;
// newItem.Yield_BasePeriod = item.Yield_BasePeriod;
// newItem.Yield_LastPeriod = item.Yield_LastPeriod;
// newItem.Yield_ThisPeriod = item.Yield_ThisPeriod;
// newItem.Yield_UnitOfMeasurement = item.Yield_UnitOfMeasurement;
// newItem.OutputValue_BasePeriod = item.OutputValue_BasePeriod;
// newItem.OutputValue_LastYear = item.OutputValue_LastYear;
// newItem.OutputValue_ThisYear = item.OutputValue_ThisYear;
// newItem.OperationScale_BasePeriod = item.OperationScale_BasePeriod;
// newItem.OperationScale_LastYear = item.OperationScale_LastYear;
// newItem.OperationScale_ThisYear = item.OperationScale_ThisYear;
// newItem.OperationScale_UnitOfMeasurement = item.OperationScale_UnitOfMeasurement;
// newItem.ServiceOperatingIncome_BasePeriod = item.ServiceOperatingIncome_BasePeriod;
// newItem.ServiceOperatingIncome_LastYear = item.ServiceOperatingIncome_LastYear;
// newItem.ServiceOperatingIncome_ThisYear = item.ServiceOperatingIncome_ThisYear;
// newItemList.Add(item);
//}
Grid1.DataSource = reportItems;
Grid1.DataBind();
}
else
@@ -201,7 +201,7 @@ namespace FineUIPro.Web.ZHGL.Environmental
if (getReport != null)
{
this.btnNew.Hidden = true;
//if (getReport.HandleMan == this.CurrUser.PersonId) //当前人是下一步办理入
//if (getReport.HandleMan == this.CurrUser.UserId) //当前人是下一步办理入
//{
// if (getReport.HandleState == BLL.Const.HandleState_2)
// {