gaofei/SGGL_HBAZ
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

危险源管理模块接入真实数据库：新增危大/超危工程、风险控制清单、安全验收、安全巡检、临时用电管理（含前端页面、BLL/API服务、WebAPI控制器、Model项、SQL脚本与接口文档）

Browse Source 
排除 CreateModel.bat（含明文sa密码与本地服务器名，未入库）
This commit is contained in:
杨家亮
2026-08-24 11:07:59 +08:00
parent 4925a6c4b0
commit 55944d732a
323 changed files with 9806 additions and 922 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/BLL/CQMS/Solution/CQMSConstructSolutionApproveService.cs
+16 -16
View File
@@ -10,7 +10,7 @@ namespace BLL
{
public static string ConvertAuditDate(object ConstructSolutionId)
{
var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove 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_CQMSConstructSolutionApprove 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,7 +20,7 @@ namespace BLL
public static string ConvertToDo(object ConstructSolutionId)
{
string res = "";
var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x);
var approve = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove orderby x.ApproveDate descending where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.ApproveDate == null select x);
if (approve != null)
{
foreach (var item in approve)
@@ -33,14 +33,14 @@ namespace BLL
public static Model.Solution_CQMSConstructSolutionApprove GetSee(string ConstructSolutionId, string userId)
{
Model.SGGLDB db = Funs.DB;
return db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
return db.Solution_CQMSConstructSolutionApprove.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_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
var res = db.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == "S" && x.ApproveMan == userId && x.ApproveDate == null);
if (res != null)
{
res.ApproveDate = DateTime.Now;
@@ -56,7 +56,7 @@ namespace BLL
public static List<string> GetUserIdsApprovesBySignType(string ConstructSolutionId, string signType)
{
var edtion = GetUserIdsApprovesBySignTypeEditon(ConstructSolutionId);
return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
return (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType != "S" && x.SignType == signType && x.Edition == edtion select x.ApproveMan).ToList();
}
public static int? GetUserIdsApprovesBySignTypeEditon(string ConstructSolutionId)
@@ -113,14 +113,14 @@ namespace BLL
public static List<Model.Solution_CQMSConstructSolutionApprove> GetConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId, string state)
{
Model.SGGLDB db = Funs.DB;
var reDate = (from x in db.Solution_CQMSConstructSolutionApprove 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_CQMSConstructSolutionApprove 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_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state select x).ToList();
return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state select x).ToList();
}
else
{
return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
return (from x in db.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveType == state && (x.ApproveDate == null || x.ApproveDate > reDate) select x).ToList();
}
}
@@ -134,7 +134,7 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
var res = from x in db.Solution_CQMSConstructSolutionApprove
where x.ConstructSolutionId == ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S"
where x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveDate != null && x.ApproveType != "S" && x.SignType != "S"
orderby x.ApproveDate
select x;
@@ -156,7 +156,7 @@ namespace BLL
{
Model.SGGLDB db = Funs.DB;
var res = from x in db.Solution_CQMSConstructSolutionApprove
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;
@@ -236,7 +236,7 @@ namespace BLL
public static void DeleteConstructSolutionApprovesByConstructSolutionId(string ConstructSolutionId)
{
Model.SGGLDB db = Funs.DB;
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == ConstructSolutionId select x).ToList();
var q = (from x in Funs.DB.Solution_CQMSConstructSolutionApprove where x.ConstructSolutionId == (string)ConstructSolutionId select x).ToList();
db.Solution_CQMSConstructSolutionApprove.DeleteAllOnSubmit(q);
db.SubmitChanges();
}
@@ -248,17 +248,17 @@ namespace BLL
public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolutionApproveByApproveMan(string ConstructSolutionId, string approveMan)
{
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
}
public static Model.Solution_CQMSConstructSolutionApprove GetConstructSoluAppByApproveMan(string ConstructSolutionId, string approveMan, int edtion)
{
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.Edition == edtion && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
}
public static Model.Solution_CQMSConstructSolutionApprove GetConstructSolApproveByApproveMan(string ConstructSolutionId, string approveMan)
{
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
return Funs.DB.Solution_CQMSConstructSolutionApprove.FirstOrDefault(x => x.ConstructSolutionId == (string)ConstructSolutionId && x.ApproveMan == approveMan && x.ApproveType != "S" && x.ApproveDate == null);
}
@@ -325,7 +325,7 @@ namespace BLL
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Solution_CQMSConstructSolutionApprove
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
{
@@ -363,7 +363,7 @@ namespace BLL
using (var db = new Model.SGGLDB(Funs.ConnString))
{
var q = from x in db.Solution_CQMSConstructSolutionApprove
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
{
SGGL/BLL/CQMS/WBS/ProjectQualityService.cs
+2 -2
View File
@@ -76,7 +76,7 @@ namespace BLL
}
}
catch (Exception ex)
catch (Exception)
{
isok = false;
}
@@ -102,7 +102,7 @@ namespace BLL
db.SubmitChanges();
}
}
catch (Exception ex)
catch (Exception)
{
isok = false;
}