20230506fineui.dll升级

This commit is contained in:
2023-05-06 15:27:27 +08:00
parent 63973e8c95
commit 3c1ec01cda
12 changed files with 42 additions and 29 deletions
+29 -12
View File
@@ -7,6 +7,8 @@ namespace BLL
{
public static class WorkloadStatisticsService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取模拟树表格
/// </summary>
@@ -2554,6 +2556,19 @@ namespace BLL
}
}
private static IQueryable<Model.WBS_CostControl> getCostControls = from x in db.WBS_CostControl select x;
private static IQueryable<Model.View_WBS_CostControlDetail> getDetails = from x in db.View_WBS_CostControlDetail select x;
private static IQueryable<Model.View_WBS_CostControlParentDetail> getParentDetails = from x in db.View_WBS_CostControlParentDetail select x;
private static IQueryable<Model.Wbs_WbsSet> getWbsSets = from x in db.Wbs_WbsSet select x;
private static IQueryable<Model.WBS_WbsSetInit> getWbsSetInits = from x in db.WBS_WbsSetInit select x;
private static IQueryable<Model.Wbs_UnitProject> getUnitProjects = from x in db.Wbs_UnitProject select x;
private static IQueryable<Model.Wbs_UnitProjectInit> getUnitProjectInits = from x in db.Wbs_UnitProjectInit select x;
private static IQueryable<Model.WBS_CnProfession> getCnProfessions = from x in db.WBS_CnProfession select x;
private static IQueryable<Model.WBS_CnProfessionInit> getCnProfessionInits = from x in db.WBS_CnProfessionInit select x;
private static IQueryable<Model.Project_Installation> getInstallations = from x in db.Project_Installation select x;
private static IQueryable<Model.View_WBS_CostControlDetailStatistics> getCostControlDetailStatisticss = from x in db.View_WBS_CostControlDetailStatistics select x;
/// <summary>
/// 获取模拟树表格
/// </summary>
@@ -2598,18 +2613,20 @@ namespace BLL
table.Columns.Add(new DataColumn("ThisNum" + (i + 1).ToString(), typeof(String)));
}
table.Columns.Add(new DataColumn("ShowId", typeof(String)));
Model.SGGLDB db = Funs.DB;
var costControls = from x in db.WBS_CostControl where x.ProjectId == projectId select x;
var details = from x in db.View_WBS_CostControlDetail where x.ProjectId == projectId select x;
var parentDetails = from x in db.View_WBS_CostControlParentDetail select x;
var wbsSets = from x in db.Wbs_WbsSet where x.ProjectId == projectId select x;
var wbsSetInits = from x in db.WBS_WbsSetInit select x;
var unitProjects = from x in db.Wbs_UnitProject where x.ProjectId == projectId select x;
var unitProjectInits = from x in db.Wbs_UnitProjectInit select x;
var cnProfessions = from x in db.WBS_CnProfession where x.ProjectId == projectId select x;
var cnProfessionInits = from x in db.WBS_CnProfessionInit select x;
var installations = from x in db.Project_Installation where x.ProjectId == projectId select x;
CostControlDetailStatisticsList = (from x in db.View_WBS_CostControlDetailStatistics where x.ProjectId == projectId select x).Distinct().ToList();
var costControls = getCostControls.Where(x => x.ProjectId == projectId);
var details = getDetails.Where(x => x.ProjectId == projectId);
var parentDetails = getParentDetails;
var wbsSets = getWbsSets.Where(x => x.ProjectId == projectId);
var wbsSetInits = getWbsSetInits;
var unitProjects = getUnitProjects.Where(x => x.ProjectId == projectId);
var unitProjectInits = getUnitProjectInits;
var cnProfessions = getCnProfessions.Where(x => x.ProjectId == projectId);
var cnProfessionInits = getCnProfessionInits;
var installations = getInstallations.Where(x => x.ProjectId == projectId);
CostControlDetailStatisticsList = getCostControlDetailStatisticss.Where(x=> x.ProjectId == projectId).Distinct().ToList();
List<Model.View_WBS_CostControlDetailStatistics> newList = new List<Model.View_WBS_CostControlDetailStatistics>();
var installationList = CostControlDetailStatisticsList.Where(x => x.WBSType == "Installation" && x.SupId == "0");
foreach (var item in installationList)