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/SpotCheckApproveService.cs
+16 -14
View File
@@ -2,13 +2,12 @@
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Model;
namespace BLL
{
public class SpotCheckApproveService
{
public static Model.SGGLDB db = Funs.DB;
public static Model.Check_SpotCheckApprove GetSpotApproveBySpotCheckDetailId(string spotCheckDetailId)
{
return (from x in Funs.DB.Check_SpotCheckApprove where x.SpotCheckDetailId == spotCheckDetailId && x.ApproveType != "S" && x.Sign == "2" && x.ApproveDate == null select x).FirstOrDefault();
@@ -34,14 +33,15 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getListData(string SpotCheckCode)
{
return from x in db.Check_SpotCheckApprove
var db1 = Funs.DB;
return from x in db1.Check_SpotCheckApprove
where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "1"
orderby x.ApproveDate
select new
{
x.SpotCheckApproveId,
x.SpotCheckCode,
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,
@@ -57,14 +57,15 @@ namespace BLL
/// <returns></returns>
public static IEnumerable getList(string SpotCheckCode)
{
return from x in db.Check_SpotCheckApprove
var db1 = Funs.DB;
return from x in db1.Check_SpotCheckApprove
where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "2"
orderby x.ApproveDate
select new
{
x.SpotCheckApproveId,
x.SpotCheckCode,
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,
@@ -89,12 +90,12 @@ namespace BLL
/// <returns>一个实体验收审批实体</returns>
public static Model.Check_SpotCheckApprove GetSpotCheckApproveByApproveId(string approveId)
{
return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckApproveId == approveId);
return Funs.DB.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckApproveId == approveId);
}
public static Model.Check_SpotCheckApprove GetComplie(string SpotCheckCode)
{
return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Compile);
return Funs.DB.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Compile);
}
public static Model.Check_SpotCheckApprove GetComplieForApi(string SpotCheckCode)
{
@@ -106,7 +107,7 @@ namespace BLL
public static Model.Check_SpotCheckApprove GetSee(string SpotCheckCode, string userId)
{
return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
return Funs.DB.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
}
public static void See(string SpotCheckCode, string userId)
{
@@ -122,12 +123,12 @@ namespace BLL
}
public static Model.Check_SpotCheckApprove GetAudit2(string SpotCheckCode)
{
return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Audit2);
return Funs.DB.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_Audit2);
}
public static Model.Check_SpotCheckApprove GetReCompile(string SpotCheckCode)
{
return db.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_ReCompile);
return Funs.DB.Check_SpotCheckApprove.FirstOrDefault(x => x.SpotCheckCode == SpotCheckCode && x.ApproveType == BLL.Const.SpotCheck_ReCompile);
}
/// <summary>
@@ -137,7 +138,7 @@ namespace BLL
/// <returns>实体验收审批集合</returns>
public static List<Model.Check_SpotCheckApprove> GetSpotCheckApprovesBySpotCheckCode(string SpotCheckCode)
{
return (from x in db.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode select x).ToList();
return (from x in Funs.DB.Check_SpotCheckApprove where x.SpotCheckCode == SpotCheckCode select x).ToList();
}
/// <summary>
@@ -233,14 +234,15 @@ namespace BLL
}
public static List<Model.Check_SpotCheckApprove> getListDataBySpotCheckCodeForApi(string SpotCheckCode)
{
var q = from x in db.Check_SpotCheckApprove
var db1 = Funs.DB;
var q = from x in db1.Check_SpotCheckApprove
where x.SpotCheckCode == SpotCheckCode && x.ApproveDate != null && x.ApproveType != "S" && x.Sign == "1"
orderby x.ApproveDate
select new
{
x.SpotCheckApproveId,
x.SpotCheckCode,
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,