去除静态变量Funs.DB
This commit is contained in:
@@ -2,32 +2,32 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Model;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
public class WorkContactApproveService
|
||||
{
|
||||
public static Model.SGGLDB db = Funs.DB;
|
||||
|
||||
/// <summary>
|
||||
/// 获取分页列表
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static IEnumerable getListData(string workContactId)
|
||||
{
|
||||
return from x in db.Unqualified_WorkContactApprove
|
||||
var db1 = Funs.DB;
|
||||
return from x in db1.Unqualified_WorkContactApprove
|
||||
where x.WorkContactId == workContactId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
orderby x.ApproveDate
|
||||
select new
|
||||
{
|
||||
x.WorkContactApproveId,
|
||||
x.WorkContactId,
|
||||
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.ApproveIdea,
|
||||
x.IsAgree,
|
||||
x.ApproveType,
|
||||
UserName = (from y in db.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
|
||||
UserName = (from y in db1.Person_Persons where y.PersonId == x.ApproveMan select y.PersonName).First(),
|
||||
IsAgreeName = x.IsAgree == true ? "同意" : "不同意"
|
||||
};
|
||||
}
|
||||
@@ -90,7 +90,7 @@ namespace BLL
|
||||
}
|
||||
public static Model.Unqualified_WorkContactApprove GetSee(string WorkContactId, string userId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == WorkContactId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == WorkContactId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
}
|
||||
public static void See(string WorkContactId, string userId)
|
||||
{
|
||||
@@ -111,7 +111,7 @@ namespace BLL
|
||||
/// <returns>一个工作联系单审批实体</returns>
|
||||
public static Model.Unqualified_WorkContactApprove GetWorkContactApproveByWorkContactId(string noticeId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == noticeId && x.ApproveDate == null && x.ApproveType != "S");
|
||||
return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == noticeId && x.ApproveDate == null && x.ApproveType != "S");
|
||||
}
|
||||
/// <summary>
|
||||
/// 修改工作联系单审批信息
|
||||
@@ -138,7 +138,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static Model.Unqualified_WorkContactApprove GetAudit1(string workContactId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit1);
|
||||
return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit1);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -148,7 +148,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static Model.Unqualified_WorkContactApprove GetAudit2(string workContactId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit2 || x.ApproveType == BLL.Const.WorkContact_Audit2R));
|
||||
return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit2 || x.ApproveType == BLL.Const.WorkContact_Audit2R));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -158,7 +158,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static Model.Unqualified_WorkContactApprove GetAudit3(string workContactId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit3);
|
||||
return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Audit3);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -168,12 +168,12 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static Model.Unqualified_WorkContactApprove GetAudit4(string workContactId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit4 || x.ApproveType == BLL.Const.WorkContact_Audit1R));
|
||||
return Funs.DB.Unqualified_WorkContactApprove.OrderByDescending(x => x.ApproveDate).FirstOrDefault(x => x.WorkContactId == workContactId && (x.ApproveType == BLL.Const.WorkContact_Audit4 || x.ApproveType == BLL.Const.WorkContact_Audit1R));
|
||||
}
|
||||
|
||||
public static Model.Unqualified_WorkContactApprove GetComplie(string workContactId)
|
||||
{
|
||||
return db.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Compile);
|
||||
return Funs.DB.Unqualified_WorkContactApprove.FirstOrDefault(x => x.WorkContactId == workContactId && x.ApproveType == BLL.Const.WorkContact_Compile);
|
||||
}
|
||||
public static Model.Unqualified_WorkContactApprove GetWorkContactApproveById(string WorkContactApproveId)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user