1、系统菜单调整;
2、系统看板UI调整; 3、事故事件功能 4、其他
This commit is contained in:
@@ -100,7 +100,6 @@ namespace BLL
|
||||
DangerousProject
|
||||
}
|
||||
|
||||
public static CNPCDB db = Funs.DB;
|
||||
|
||||
/// <summary>
|
||||
/// 新增实体
|
||||
@@ -218,7 +217,7 @@ namespace BLL
|
||||
/// <returns></returns>
|
||||
public static Project_HSSEData_HSSE GetProject_HSSEData_HSSEById(string Id)
|
||||
{
|
||||
return db.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
|
||||
return Funs.DB.Project_HSSEData_HSSE.FirstOrDefault(x => x.Id == Id);
|
||||
}
|
||||
|
||||
public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByProjectid(string Projectid)
|
||||
@@ -232,6 +231,19 @@ namespace BLL
|
||||
}
|
||||
}
|
||||
|
||||
public static void DeleteProject_HSSEData_HSSEByDate(DateTime? reportDate)
|
||||
{
|
||||
using (var db = new CNPCDB(Funs.ConnString))
|
||||
{
|
||||
var table = db.Project_HSSEData_HSSE.Where(x => x.ReportDate.Value.Date.CompareTo(reportDate.Value.Date) == 0);
|
||||
if (table != null)
|
||||
{
|
||||
db.Project_HSSEData_HSSE.DeleteAllOnSubmit(table);
|
||||
db.SubmitChanges();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void UpdateProject_HSSEData_HSSE(Project_HSSEData_HSSE newtable)
|
||||
{
|
||||
using (var db = new CNPCDB(Funs.ConnString))
|
||||
@@ -503,7 +515,7 @@ namespace BLL
|
||||
table.GeneralClosedNum = GetGeneralClosedNum(projectid);
|
||||
table.GeneralNotClosedNum = GetGeneralNotClosedNum(projectid);
|
||||
table.MajorClosedNum = GetMajorClosedNum(projectid);
|
||||
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
|
||||
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
|
||||
}
|
||||
|
||||
if (hSseDateType == HSSEDateType.SecurityRisk || hSseDateType == HSSEDateType.All)
|
||||
@@ -1271,7 +1283,7 @@ namespace BLL
|
||||
&& x.ApplyDate > Const.DtmarkTime
|
||||
select x).Count() +
|
||||
(from x in db.License_LicenseManager
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate> Const.DtmarkTime
|
||||
where x.ProjectId == projectid && x.IsHighRisk == true && x.CompileDate > Const.DtmarkTime
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1286,7 +1298,7 @@ namespace BLL
|
||||
using (var db = new Model.CNPCDB(Funs.ConnString))
|
||||
{
|
||||
var result = (from x in db.License_FireWork
|
||||
where x.ProjectId == projectid && x.States== Const.State_3
|
||||
where x.ProjectId == projectid && x.States == Const.State_3
|
||||
&& x.ApplyDate > Const.DtmarkTime
|
||||
select x).Count() +
|
||||
(from x in db.License_HeightWork
|
||||
@@ -1552,7 +1564,7 @@ namespace BLL
|
||||
|
||||
public static List<Project_HSSEData_HSSE> GetProject_HSSEData_HSSEByModle(Project_HSSEData_HSSE table)
|
||||
{
|
||||
var q = from x in db.Project_HSSEData_HSSE
|
||||
var q = from x in Funs.DB.Project_HSSEData_HSSE
|
||||
where
|
||||
(string.IsNullOrEmpty(table.Id) || x.Id.Contains(table.Id)) &&
|
||||
(string.IsNullOrEmpty(table.ProjectId) || x.Id.Contains(table.ProjectId)) &&
|
||||
|
||||
Reference in New Issue
Block a user