lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://47.104.102.122:3000/lpf/SGGL_SeDin_New

Browse Source
This commit is contained in:
李鹏飞
2025-09-01 10:11:48 +08:00
parent d9740180f2 d779849e8f
commit a209b65dcc
20 changed files with 1058 additions and 771 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/WebService/CNCECHSSEWebService.cs
+2 -2
View File
@@ -910,7 +910,7 @@
ArchitectureReportId = x.ArchitectureReportId,
UnitId = x.UnitId,
Year = x.Year,
Quarters = x.Quarters,
Month = x.Month,
FillingMan = x.FillingMan,
FillingDate = x.FillingDate,
DutyPerson = x.DutyPerson,
@@ -946,7 +946,7 @@
////更新 当前人要处理的意见
ProjectDataFlowSetService.CloseFlowOperate(Const.ArchitectureReportMenuId, item, string.Empty);
// //更新催报信息
UrgeReportService.SetComplete(report.UnitId, Const.ReportType_1, report.Year.ToString(), report.Quarters.ToString());
UrgeReportService.SetComplete(report.UnitId, Const.ReportType_1, report.Year.ToString(), report.Month.ToString());
}
}
LogService.AddSys_Log(CurrUser, "【建筑行业能源节约与生态环境保护汇总表】上传到服务器" + upReport.Count().ToString() + "条数据；", null, BLL.Const.ArchitectureReportMenuId, BLL.Const.BtnUploadResources);
SGGL/BLL/ZHGL/Environmental/ArchitectureReportItemService.cs
+2 -2
View File
@@ -57,12 +57,12 @@ namespace BLL
/// </summary>
/// <param name="ArchitectureReportItemId">建筑行业能源节约与生态环境保护汇总明细表Id</param>
/// <returns>明细记录集合</returns>
public static List<Model.Environmental_ArchitectureReportItem> GetYearSumItems(string unitId, int? year, int? Quarters)
public static List<Model.Environmental_ArchitectureReportItem> GetYearSumItems(string unitId, int? year, int? Month)
{
return (from x in Funs.DB.Environmental_ArchitectureReportItem
join y in Funs.DB.Environmental_ArchitectureReport
on x.ArchitectureReportId equals y.ArchitectureReportId
where y.UnitId == unitId && y.Year == year && y.Quarters == Quarters
where y.UnitId == unitId && y.Year == year && y.Month == Month
orderby x.SortIndex
select x).Distinct().ToList();
}
SGGL/BLL/ZHGL/Environmental/ArchitectureReportService.cs
+7 -7
View File
@@ -25,9 +25,9 @@ namespace BLL
/// <param name = "year" > 年度 </ param >
/// <param name="month">月份</param>
/// <returns>建筑行业能源节约与生态环境保护汇总表</returns>
public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdAndYearAndQuarters(string unitId, int year, int Quarters)
public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdAndYearAndQuarters(string unitId, int year, int month)
{
return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Quarters == Quarters && e.Year == year);
return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Month == month && e.Year == year);
}
/// <summary>
@@ -50,7 +50,7 @@ namespace BLL
{
ArchitectureReportId = ArchitectureReport.ArchitectureReportId,
Year = ArchitectureReport.Year,
Quarters = ArchitectureReport.Quarters,
Month = ArchitectureReport.Month,
UnitId = ArchitectureReport.UnitId,
FillingDate = ArchitectureReport.FillingDate,
DutyPerson = ArchitectureReport.DutyPerson,
@@ -72,7 +72,7 @@ namespace BLL
if (newArchitectureReport != null)
{
newArchitectureReport.Year = ArchitectureReport.Year;
newArchitectureReport.Quarters = ArchitectureReport.Quarters;
newArchitectureReport.Month = ArchitectureReport.Month;
newArchitectureReport.UnitId = ArchitectureReport.UnitId;
newArchitectureReport.FillingDate = ArchitectureReport.FillingDate;
newArchitectureReport.DutyPerson = ArchitectureReport.DutyPerson;
@@ -83,7 +83,7 @@ namespace BLL
}
/// <summary>
/// 根据Id获取数据
/// 根据Id删除数据
/// </summary>
/// <param name="ArchitectureReportId"></param>
public static void DeleteArchitectureReportByArchitectureReportId(string ArchitectureReportId)
@@ -101,9 +101,9 @@ namespace BLL
/// </summary>
/// <param name="Id">Id</param>
/// <returns></returns>
public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdDate(string unitId, int year, int Quarters)
public static Model.Environmental_ArchitectureReport GetArchitectureReportByUnitIdDate(string unitId, int year, int month)
{
return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Year == year && e.Quarters == Quarters);
return Funs.DB.Environmental_ArchitectureReport.FirstOrDefault(e => e.UnitId == unitId && e.Year == year && e.Month == month);
}
/// <summary>
SGGL/BLL/ZHGL/Environmental/ProjectArchitectureReportItemService.cs
+2 -2
View File
@@ -57,12 +57,12 @@ namespace BLL
/// </summary>
/// <param name="ArchitectureReportItemId">建筑行业能源节约与生态环境保护汇总明细表Id</param>
/// <returns>明细记录集合</returns>
public static List<Model.Environmental_ProjectArchitectureReportItem> GetYearSumItems(string projectId, int? year, int? Quarters)
public static List<Model.Environmental_ProjectArchitectureReportItem> GetYearSumItems(string projectId, int? year, int? Month)
{
return (from x in Funs.DB.Environmental_ProjectArchitectureReportItem
join y in Funs.DB.Environmental_ProjectArchitectureReport
on x.ArchitectureReportId equals y.ArchitectureReportId
where y.ProjectId == projectId && y.Year == year && y.Quarters == Quarters
where y.ProjectId == projectId && y.Year == year && y.Month == Month
orderby x.SortIndex
select x).Distinct().ToList();
}
SGGL/BLL/ZHGL/Environmental/ProjectArchitectureReportService.cs
+6 -6
View File
@@ -25,9 +25,9 @@ namespace BLL
/// <param name = "year" > 年度 </ param >
/// <param name="month">月份</param>
/// <returns>建筑行业能源节约与生态环境保护汇总表</returns>
public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdAndYearAndQuarters(string projectId, int year, int Quarters)
public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdAndYearAndQuarters(string projectId, int year, int Month)
{
return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == projectId && e.Quarters == Quarters && e.Year == year);
return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == projectId && e.Month == Month && e.Year == year);
}
/// <summary>
@@ -50,7 +50,7 @@ namespace BLL
{
ArchitectureReportId = ArchitectureReport.ArchitectureReportId,
Year = ArchitectureReport.Year,
Quarters = ArchitectureReport.Quarters,
Month = ArchitectureReport.Month,
ProjectId = ArchitectureReport.ProjectId,
FillingDate = ArchitectureReport.FillingDate,
DutyPerson = ArchitectureReport.DutyPerson,
@@ -72,7 +72,7 @@ namespace BLL
if (newArchitectureReport != null)
{
newArchitectureReport.Year = ArchitectureReport.Year;
newArchitectureReport.Quarters = ArchitectureReport.Quarters;
newArchitectureReport.Month = ArchitectureReport.Month;
newArchitectureReport.ProjectId = ArchitectureReport.ProjectId;
newArchitectureReport.FillingDate = ArchitectureReport.FillingDate;
newArchitectureReport.DutyPerson = ArchitectureReport.DutyPerson;
@@ -101,9 +101,9 @@ namespace BLL
/// </summary>
/// <param name="Id">Id</param>
/// <returns></returns>
public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdDate(string ProjectId, int year, int Quarters)
public static Model.Environmental_ProjectArchitectureReport GetArchitectureReportByProjectIdDate(string ProjectId, int year, int Month)
{
return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == ProjectId && e.Year == year && e.Quarters == Quarters);
return Funs.DB.Environmental_ProjectArchitectureReport.FirstOrDefault(e => e.ProjectId == ProjectId && e.Year == year && e.Month == Month);
}
/// <summary>