2023-11-11

This commit is contained in:
2023-11-11 16:02:42 +08:00
parent b2ffd4b8d0
commit 48dd589a7f
66 changed files with 2334 additions and 1232 deletions
@@ -1,10 +1,8 @@
using BLL;
using Model;
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.Linq;
namespace FineUIPro.Web.DataShow
{
@@ -43,7 +41,8 @@ namespace FineUIPro.Web.DataShow
,0 AS IncomeComprehensiveEnergyConsumption
,(SELECT ThisYearValue FROM Environmental_ChemicalReportItem WHERE SortIndex='70'
AND ChemicalReportId=Report.ChemicalReportId) AS CO2
FROM Environmental_ChemicalReport AS Report";
FROM Environmental_ChemicalReport AS Report
WHERE Report.FillingDate >'2023-01-01' ";
}
else
{
@@ -55,7 +54,7 @@ namespace FineUIPro.Web.DataShow
,(SELECT ThisYearValue FROM Environmental_ArchitectureReportItem WHERE SortIndex='38'
AND ArchitectureReportId=Report.ArchitectureReportId) AS CO2
FROM Environmental_ArchitectureReport AS Report
WHERE 1=1 ";
WHERE Report.FillingDate >'2023-01-01' ";
}
if (!string.IsNullOrEmpty(this.txtStartTime.Text))
{