lpf/CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

增加集团报表

Browse Source
This commit is contained in:
潘鸿锋
2024-10-25 18:17:05 +08:00
parent 6ca0a319b1
commit d02a7a1abc
22 changed files with 2251 additions and 2062 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/WebService/CNCECHSSEWebService.cs
+38 -12
View File
@@ -893,6 +893,27 @@
#endregion
#region 中央企业环保产业企业基本情况和经营情况汇总表
private static List<Model.reportItemListDto> getreportItemList(string BusinessReportId)
{
return Funs.DB.Environmental_OperationReportItem.Where(x => x.BusinessReportId == BusinessReportId)
.OrderBy(x => x.SortIndex).OrderBy(x => x.SortUnitName).Select(x => new Model.reportItemListDto()
{
BusinessReportItemId = x.BusinessReportItemId,
BusinessReportId = x.BusinessReportId,
SortIndex = x.SortIndex,
Code = x.Code,
UnitLevel = x.UnitLevel,
CreateDate = x.CreateDate,
Place = x.Place,
PersonNum = x.PersonNum,
TotalAssets = x.TotalAssets,
TotalValue = x.TotalValue,
NewInvestment = x.NewInvestment,
UnitName = x.UnitName,
SortUnitName = x.SortUnitName
}).ToList();
}
public static string UpOperationReport(string businessReportId, Model.Sys_User CurrUser)
{
@@ -903,29 +924,22 @@
{
var upReport = from x in db.Environmental_OperationReport
where x.BusinessReportId == businessReportId
select new Model.OperationReportDto
select new Model.Environmental_OperationReportDto
{
BusinessReportId = x.BusinessReportId,
UnitId = x.UnitId,
Year = x.Year,
Quarters = x.Quarters,
Code = x.Code,
UnitLevel = x.UnitLevel,
CreateDate = x.CreateDate,
Place = x.Place,
PersonNum = x.PersonNum,
TotalAssets = x.TotalAssets,
TotalValue = x.TotalValue,
NewInvestment = x.NewInvestment,
FillingMan = x.FillingMan,
FillingDate = x.FillingDate,
StatisticsDutyPerson = x.StatisticsDutyPerson,
UnitDutyPerson = x.UnitDutyPerson,
Remark = x.Remark
Remark = x.Remark,
reportItemList = getreportItemList(x.BusinessReportId)
};
//新接口Api
code = UpApiOperationReport(upReport).ToString();
code = UpApiOperationReportNew(upReport).ToString();
if (code == "1")
{
var report = db.Environmental_OperationReport.FirstOrDefault(e => e.BusinessReportId == businessReportId);
@@ -951,6 +965,7 @@
}
#region 上报中央企业环保产业企业基本情况和经营情况季表
private static int UpApiOperationReport(IQueryable<Model.OperationReportDto> upReport)
{
string baseurl = "/api/InformationData/SaveOperationReport";
@@ -959,6 +974,16 @@
return responeData.code;
}
private static int UpApiOperationReportNew(IQueryable<Model.Environmental_OperationReportDto> upReport)
{
string baseurl = "/api/InformationData/SaveOperationReportNew";
var resultJsonReport = JsonConvert.SerializeObject(upReport.FirstOrDefault());
var responeData = BLL.ServerService.PushCNCEC(resultJsonReport, baseurl);
return responeData.code;
}
#endregion
#endregion
@@ -973,7 +998,7 @@
{
try
{
CNCECHSSEService.HSSEServiceClient hsseC = new CNCECHSSEService.HSSEServiceClient();
var upReport = from x in db.Environmental_EnergyReport
where x.EnergyReportId == energyReportId
select new Model.EnergyReport
@@ -1014,6 +1039,7 @@
ServiceOperatingIncome_BasePeriod = x.ServiceOperatingIncome_BasePeriod,
ServiceOperatingIncome_LastYear = x.ServiceOperatingIncome_LastYear,
ServiceOperatingIncome_ThisYear = x.ServiceOperatingIncome_ThisYear,
SortUnit = x.SortUnit
};
//老接口Serveice