危险源管理模块接入真实数据库:新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理(含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档)
排除 CreateModel.bat(含明文sa密码与本地服务器名,未入库)
This commit is contained in:
@@ -10,7 +10,7 @@ namespace BLL
|
||||
{
|
||||
public static string ConvertAuditDate(object ConstructSolutionId)
|
||||
{
|
||||
var approve= (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null select x.ApproveDate ).FirstOrDefault();
|
||||
var approve= (from x in Funs.DB.Solution_HSSEConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate !=null select x.ApproveDate ).FirstOrDefault();
|
||||
if (approve != null)
|
||||
{
|
||||
return approve.Value.ToString("yyyy-MM-dd");
|
||||
@@ -20,14 +20,14 @@ namespace BLL
|
||||
public static Model.Solution_HSSEConstructSolutionApprove GetSee(string ConstructSolutionId, string userId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
return db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
}
|
||||
|
||||
public static void See(string ConstructSolutionId, string userId)
|
||||
{
|
||||
using (var db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
var res = db.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
|
||||
if (res != null)
|
||||
{
|
||||
res.ApproveDate = DateTime.Now;
|
||||
@@ -43,7 +43,7 @@ namespace BLL
|
||||
public static List<string> GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType)
|
||||
{
|
||||
var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
|
||||
return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
|
||||
return (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
|
||||
}
|
||||
|
||||
public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
|
||||
@@ -100,14 +100,14 @@ namespace BLL
|
||||
public static List<Model.Solution_HSSEConstructSolutionApprove> GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
|
||||
var reDate = (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == BLL.Const.CQMSConstructSolution_ReCompile orderby x.ApproveDate descending select x.ApproveDate).FirstOrDefault();
|
||||
if (reDate == null)
|
||||
{
|
||||
return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList();
|
||||
return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList();
|
||||
}
|
||||
else
|
||||
{
|
||||
return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
|
||||
return (from x in db.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -121,7 +121,7 @@ namespace BLL
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
var res = from x in db.Solution_HSSEConstructSolutionApprove
|
||||
where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
orderby x.ApproveDate
|
||||
select x;
|
||||
|
||||
@@ -143,7 +143,7 @@ namespace BLL
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
var res = from x in db.Solution_HSSEConstructSolutionApprove
|
||||
where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
orderby x.ApproveType,x.Edition
|
||||
select x;
|
||||
|
||||
@@ -223,7 +223,7 @@ namespace BLL
|
||||
public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
|
||||
{
|
||||
Model.SGGLDB db = Funs.DB;
|
||||
var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
|
||||
var q = (from x in Funs.DB.Solution_HSSEConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList();
|
||||
db.Solution_HSSEConstructSolutionApprove.DeleteAllOnSubmit(q);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
@@ -235,17 +235,17 @@ namespace BLL
|
||||
public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan)
|
||||
{
|
||||
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
}
|
||||
public static Model.Solution_HSSEConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion)
|
||||
{
|
||||
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
}
|
||||
|
||||
public static Model.Solution_HSSEConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan)
|
||||
{
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
return Funs.DB.Solution_HSSEConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
|
||||
}
|
||||
|
||||
|
||||
@@ -312,7 +312,7 @@ namespace BLL
|
||||
using (var db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var q = from x in db.Solution_HSSEConstructSolutionApprove
|
||||
where x.ConstructSolutionId == ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
|
||||
where x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edition && x.ApproveDate != null && x.ApproveType != "S"
|
||||
orderby x.ApproveDate
|
||||
select new
|
||||
{
|
||||
@@ -350,7 +350,7 @@ namespace BLL
|
||||
using (var db = new Model.SGGLDB(Funs.ConnString))
|
||||
{
|
||||
var q = from x in db.Solution_HSSEConstructSolutionApprove
|
||||
where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S"
|
||||
orderby x.ApproveDate
|
||||
select new
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user