修改博盛接口和进度录入

This commit is contained in:
2023-07-25 17:32:36 +08:00
parent 22b400ec20
commit 9838978a8c
6 changed files with 95 additions and 35 deletions
+27 -8
View File
@@ -2829,7 +2829,7 @@ namespace BLL
/// 获取模拟树表格
/// </summary>
/// <returns></returns>
public static DataTable GetAllTreeDataTable(string projectId, string IsOut)
public static DataTable GetAllTreeDataTable(string projectId, string IsOut, string Id)
{
using (var db = new Model.SGGLDB(Funs.ConnString))
{
@@ -2897,17 +2897,36 @@ namespace BLL
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)
if (string.IsNullOrEmpty(Id)) //加载全项目记录
{
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
var installationList = CostControlDetailStatisticsList.Where(x => x.WBSType == "Installation" && x.SupId == "0");
foreach (var item in installationList)
{
AddDetail(newList, CostControlDetailStatisticsList, item.Id);
newList.Add(item);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail(newList, CostControlDetailStatisticsList, item.Id);
}
else
{
AddDetailOut(newList, CostControlDetailStatisticsList, item.Id, string.Empty);
}
}
else
}
else //加载选择节点及其子级
{
var node = CostControlDetailStatisticsList.FirstOrDefault(x => x.Id == Id);
if (node != null)
{
AddDetailOut(newList, CostControlDetailStatisticsList, item.Id, string.Empty);
newList.Add(node);
if (string.IsNullOrEmpty(IsOut))
{
AddDetail(newList, CostControlDetailStatisticsList, node.Id);
}
else
{
AddDetailOut(newList, CostControlDetailStatisticsList, node.Id, string.Empty);
}
}
}
DataRow row;