代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -2,7 +2,6 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Linq;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -25,7 +24,7 @@ namespace BLL
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.Base_Project> getDataLists = from x in Funs.DB.Base_Project
|
||||
select x;
|
||||
select x;
|
||||
|
||||
/// <summary>
|
||||
/// 合同管理数据仓库
|
||||
@@ -35,7 +34,7 @@ namespace BLL
|
||||
/// <param name="endTime"></param>
|
||||
/// <param name="Grid1"></param>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getDataDWList( string projectId, Grid Grid1)
|
||||
public static IEnumerable getDataDWList(string projectId, Grid Grid1)
|
||||
{
|
||||
var getDataList = from x in Funs.DB.Base_Project select x;
|
||||
if (!string.IsNullOrEmpty(projectId) && projectId != Const._Null)
|
||||
@@ -55,7 +54,7 @@ namespace BLL
|
||||
x.ProjectId,
|
||||
x.ProjectName,
|
||||
x.ProjectCode,
|
||||
Count1= getTotalProfit(x.ProjectId),
|
||||
Count1 = getTotalProfit(x.ProjectId),
|
||||
};
|
||||
}
|
||||
#endregion
|
||||
@@ -67,16 +66,16 @@ namespace BLL
|
||||
if (getContract.Count() > 0)
|
||||
{
|
||||
contractAmount = getContract.Sum(x => x.ContractAmount ?? 0);
|
||||
}
|
||||
}
|
||||
|
||||
decimal estimatedAmount = 0;
|
||||
var getContractTrack = Funs.DB.PHTGL_ContractTrack.Where(x => x.ProjectId == projectId);
|
||||
if (getContractTrack.Count() > 0)
|
||||
{
|
||||
estimatedAmount = getContractTrack.Sum(x => x.EstimatedAmount ?? 0);
|
||||
}
|
||||
}
|
||||
|
||||
return estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount).ToString() + "%" : "0%";
|
||||
return estimatedAmount > 0 ? Math.Round(contractAmount / estimatedAmount).ToString() + "%" : "0%";
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user