lpf/SGGL_SHJ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

去除静态变量Funs.DB

Browse Source
This commit is contained in:
李鹏飞
2025-01-07 19:00:48 +08:00
parent 188974fadc
commit 2c1a328bc1
290 changed files with 1205 additions and 1242 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Check/CheckEquipmentApproveService.cs
+12 -11
View File
@@ -1,13 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public class CheckEquipmentApproveService
{
public static Model.SGGLDB db = Funs.DB;
/// <summary>
/// 获取设计变更模板列表
/// </summary>
@@ -16,14 +15,15 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string CheckEquipmentId)
{
return from x in db.Check_CheckEquipmentApprove
var db1 = Funs.DB;
return from x in db1.Check_CheckEquipmentApprove
where x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate != null
orderby x.ApproveDate
select new
{
x.CheckEquipmentApproveId,
x.CheckEquipmentId,
ApproveMan = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
ApproveMan = (from y in db1.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,
@@ -38,7 +38,7 @@ namespace BLL
/// <returns>一个设计变更审批实体</returns>
public static Model.Check_CheckEquipmentApprove GetCheckEquipmentApproveByCheckEquipmentId(string CheckEquipmentId)
{
return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate == null);
return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate == null);
}
/// <summary>
@@ -48,17 +48,17 @@ namespace BLL
/// <returns>一个设计变更审批实体</returns>
public static Model.Check_CheckEquipmentApprove GetCheckEquipmentApproveByApproveId(string approveId)
{
return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentApproveId == approveId);
return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentApproveId == approveId);
}
public static Model.Check_CheckEquipmentApprove GetComplie(string CheckEquipmentId)
{
return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Compile);
return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Compile);
}
public static Model.Check_CheckEquipmentApprove GetApprove(string CheckEquipmentId)
{
return db.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Approve);
return Funs.DB.Check_CheckEquipmentApprove.FirstOrDefault(x => x.CheckEquipmentId == CheckEquipmentId && x.ApproveType == BLL.Const.CheckEquipment_Approve);
}
/// <summary>
@@ -68,7 +68,7 @@ namespace BLL
/// <returns>设计变更审批集合</returns>
public static List<Model.Check_CheckEquipmentApprove> GetCheckEquipmentApprovesByCheckEquipmentId(string CheckEquipmentId)
{
return (from x in db.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId select x).ToList();
return (from x in Funs.DB.Check_CheckEquipmentApprove where x.CheckEquipmentId == CheckEquipmentId select x).ToList();
}
/// <summary>
@@ -187,14 +187,15 @@ namespace BLL
}
public static List<Model.Check_CheckEquipmentApprove> getListDataByEid(string CheckEquipmentId)
{
var q = from x in db.Check_CheckEquipmentApprove
var db1 = Funs.DB;
var q = from x in db1.Check_CheckEquipmentApprove
where x.CheckEquipmentId == CheckEquipmentId && x.ApproveDate != null && x.ApproveType != "S"
orderby x.ApproveDate
select new
{
x.CheckEquipmentApproveId,
x.CheckEquipmentId,
ApproveMan = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
ApproveMan = (from y in db1.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
x.ApproveDate,
x.IsAgree,
x.ApproveIdea,