去除静态变量Funs.DB
This commit is contained in:
@@ -5,6 +5,7 @@ using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Web.Util;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -13,8 +14,6 @@ namespace BLL
|
||||
/// </summary>
|
||||
public static class ProjectWBSAnalysisService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
#region WBS分析
|
||||
/// <summary>
|
||||
/// 记录数
|
||||
@@ -28,7 +27,7 @@ namespace BLL
|
||||
/// <summary>
|
||||
/// 定义变量
|
||||
/// </summary>
|
||||
private static IQueryable<Model.WBS_WorkPackage> getDataLists = from x in db.WBS_WorkPackage
|
||||
private static IQueryable<Model.WBS_WorkPackage> getDataLists = from x in Funs.DB.WBS_WorkPackage
|
||||
where x.IsApprove == true
|
||||
select x;
|
||||
|
||||
@@ -64,9 +63,10 @@ namespace BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
var db1 = Funs.DB;
|
||||
if (workPackageId != "1" && workPackageId != "2")
|
||||
{
|
||||
var getUnitWork = db.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == projectId && x.UnitWorkId == workPackageId);
|
||||
var getUnitWork = db1.WBS_UnitWork.FirstOrDefault(x => x.ProjectId == projectId && x.UnitWorkId == workPackageId);
|
||||
if (getUnitWork != null)
|
||||
{
|
||||
getDataList = getDataList.Where(x => x.UnitWorkId == workPackageId && x.SuperWorkPack == null);
|
||||
@@ -82,7 +82,7 @@ namespace BLL
|
||||
}
|
||||
else
|
||||
{
|
||||
var getUnitWork = from x in db.WBS_UnitWork
|
||||
var getUnitWork = from x in db1.WBS_UnitWork
|
||||
where x.ProjectId == projectId && x.SuperUnitWork == null && x.ProjectType == workPackageId
|
||||
select x;
|
||||
List<Model.WBS_WorkPackage> listWork = new List<Model.WBS_WorkPackage>();
|
||||
|
||||
Reference in New Issue
Block a user