代码无效引用清理,试压包资料界面看板修改
This commit is contained in:
@@ -1,10 +1,10 @@
|
||||
using System;
|
||||
using FineUIPro;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using FineUIPro;
|
||||
using Model;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace BLL
|
||||
{
|
||||
@@ -1334,12 +1334,12 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid
|
||||
where y.ProjectId == projectid
|
||||
select x).Count() +
|
||||
(from x in Funs.DB.InApproveManager_GeneralEquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_GeneralEquipmentIn on x.GeneralEquipmentInId equals y
|
||||
.GeneralEquipmentInId
|
||||
where y.ProjectId == projectid
|
||||
where y.ProjectId == projectid
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1352,7 +1352,7 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.InApproveManager_EquipmentInItem
|
||||
join y in Funs.DB.InApproveManager_EquipmentIn on x.EquipmentInId equals y.EquipmentInId
|
||||
where y.ProjectId == projectid
|
||||
where y.ProjectId == projectid
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1442,7 +1442,7 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 2 || x.HazardLevel == "2") && x.IsStart == true
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 2 || x.HazardLevel == "2") && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1455,7 +1455,7 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 1 || x.HazardLevel == "1") && x.IsStart == true
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 1 || x.HazardLevel == "1") && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1468,7 +1468,7 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 3 || x.HazardLevel == "3") && x.IsStart == true
|
||||
where x.ProjectId == projectid && (y.RiskLevel == 3 || x.HazardLevel == "3") && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1481,7 +1481,7 @@ namespace BLL
|
||||
{
|
||||
var result = (from x in Funs.DB.Hazard_HazardSelectedItem
|
||||
join y in Funs.DB.Base_RiskLevel on x.HazardLevel equals y.RiskLevelId
|
||||
where x.ProjectId == projectid && y.RiskLevel == 4 && x.IsStart == true
|
||||
where x.ProjectId == projectid && y.RiskLevel == 4 && x.IsStart == true
|
||||
select x).Count();
|
||||
return result;
|
||||
}
|
||||
@@ -1752,7 +1752,7 @@ namespace BLL
|
||||
where (x.IsUpdate == null || x.IsUpdate == false) && x.CheckTime > BLL.Const.DtmarkTime
|
||||
&& x.ProblemTypes == "1"
|
||||
&& x.ProjectState == "1"
|
||||
// && x.IsBranch.Value == true
|
||||
// && x.IsBranch.Value == true
|
||||
select new Model.Hazard_HazardRegisterItem
|
||||
{
|
||||
HazardRegisterId = x.HazardRegisterId,
|
||||
|
||||
Reference in New Issue
Block a user