xiaju/SGGL_JT
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

建筑行业报表

Browse Source
This commit is contained in:
geh
2025-09-02 10:13:15 +08:00
parent 1cce9ee9e2
commit 5c2ca7b809
26 changed files with 1013 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SUBQHSE/BLL/Common/Const.cs
+3 -3
View File
@@ -6740,15 +6740,15 @@ namespace BLL
/// <summary>
/// 施工技术交底管理
/// </summary>
public const string ConTechnologyDisclosureMenuId = "A16CFA9D-2783-4573-95F9-EBA2B682B7EA";
public const string ConTechnologyDisclosureMenuId = "C2BBE0BC-C75A-4EEB-A893-8CDBD2DE2A74";
/// <summary>
/// 特设质保体系
/// </summary>
public const string CQMS_QualityAssuranceMenuId = "2C49EC5E-BF6F-4C44-BA02-9BD183CF68C6";
public const string CQMS_QualityAssuranceMenuId = "D9BE2C06-E757-4611-A73D-91D2A8FD0DEA";
/// <summary>
/// 图纸会审管理
/// </summary>
public const string ReviewDrawingsMenuId = "856D53B3-C5FB-443F-917B-39E83BE685DB";
public const string ReviewDrawingsMenuId = "C2BBE0BC-C75A-4EEB-A893-8CDBD2DE2A74";
/// <summary>
/// 图纸会审记录导入模板文件原始虚拟路径
/// </summary>
SUBQHSE/BLL/Customization/ZJ/API/APIUnitHazardRegisterService.cs
+3 -3
View File
@@ -29,14 +29,14 @@ namespace BLL
/// <param name="projectId"></param>
/// <param name="states"></param>
/// <returns></returns>
public static List<Model.HazardRegisterItem> getHazardRegisterByProjectIdStates(string projectId, string states, int pageIndex)
public static List<Model.HazardRegisterItem> getHazardRegisterByProjectIdStates(string projectId, string states, int pageIndex ,int pageSize ,string ProblemTypes)
{
using (Model.SUBQHSEDB db = new Model.SUBQHSEDB(Funs.ConnString))
{
var hazardRegisters = (from x in db.View_Hazard_HazardRegister_Unit
where (x.ProjectId == projectId || projectId == null) && (x.States == states || states == null)
where (x.ProjectId == projectId || projectId == null) && (x.States == states || states == null) && (x.ProblemTypes == ProblemTypes)
orderby x.CheckTime descending
select x).Skip(Funs.PageSize * (pageIndex - 1)).Take(Funs.PageSize).ToList();
select x).Skip(pageSize * (pageIndex - 1)).Take(pageSize).ToList();
return ObjectMapperManager.DefaultInstance.GetMapper<List<Model.View_Hazard_HazardRegister_Unit>, List<Model.HazardRegisterItem>>().Map(hazardRegisters.ToList());
}
}
SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
+2 -2
View File
@@ -1103,7 +1103,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,
@@ -1139,7 +1139,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);
SUBQHSE/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();
}
SUBQHSE/BLL/ZHGL/Environmental/ArchitectureReportService.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_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;
@@ -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>
SUBQHSE/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();
}
SUBQHSE/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>