lpf
/
CNCEC_SUBQHSE_WUHUAN
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

提交代码

This commit is contained in:
高飞 2024-09-04 11:24:59 +08:00
parent 3ca4765f80
commit 97b236d21d
2 changed files with 35 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SGGL/FineUIPro.Web/FineUIPro.Web.csproj
View File

@ -19232,7 +19232,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v16.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets. Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild"> <Target Name="BeforeBuild">

50
SGGL/FineUIPro.Web/common/main_new0.aspx.cs
View File

@ -189,9 +189,9 @@ namespace FineUIPro.Web.common
//一般 //一般
allYhYb += "'" + allYhYb += "'" +
((from x in hazardRegisters ((from x in hazardRegisters
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" && where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States == "3" &&
x.CheckTime > Const.DtmarkTime x.CheckTime > Const.DtmarkTime
select x).Count() + select x).Count() +
(from x in hazardRegisters (from x in hazardRegisters
where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" && where x.ProjectId == item.ProjectId && x.Risk_Level == "一般" && x.States != "3" &&
x.CheckTime > Const.DtmarkTime x.CheckTime > Const.DtmarkTime
@ -546,7 +546,11 @@ namespace FineUIPro.Web.common
var result = (from x in Funs.DB.Emergency_EmergencyList_Unit var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime where y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
select x).Count(); select x).Count() +
(from x in Funs.DB.Emergency_EmergencyList
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("综合") && x.CompileDate > Const.DtmarkTime
select x).Count();
return result; return result;
} }
@ -559,7 +563,11 @@ namespace FineUIPro.Web.common
var result = (from x in Funs.DB.Emergency_EmergencyList_Unit var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime where y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
select x).Count(); select x).Count() +
(from x in Funs.DB.Emergency_EmergencyList
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("专项") && x.CompileDate > Const.DtmarkTime
select x).Count();
return result; return result;
} }
@ -572,7 +580,11 @@ namespace FineUIPro.Web.common
var result = (from x in Funs.DB.Emergency_EmergencyList_Unit var result = (from x in Funs.DB.Emergency_EmergencyList_Unit
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("现场处置") && x.CompileDate > Const.DtmarkTime where y.EmergencyTypeName.Contains("现场处置") && x.CompileDate > Const.DtmarkTime
select x).Count(); select x).Count() +
(from x in Funs.DB.Emergency_EmergencyList
join y in Funs.DB.Base_EmergencyType on x.EmergencyTypeId equals y.EmergencyTypeId
where y.EmergencyTypeName.Contains("现场处置") && x.CompileDate > Const.DtmarkTime
select x).Count();
return result; return result;
} }
@ -584,7 +596,10 @@ namespace FineUIPro.Web.common
{ {
var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit var result = (from x in Funs.DB.Emergency_DrillRecordList_Unit
where x.CompileDate > Const.DtmarkTime where x.CompileDate > Const.DtmarkTime
select x).Count(); select x).Count() +
(from x in Funs.DB.Emergency_DrillRecordList
where x.CompileDate > Const.DtmarkTime
select x).Count();
return result; return result;
} }
#endregion #endregion
@ -596,9 +611,10 @@ namespace FineUIPro.Web.common
/// <returns></returns> /// <returns></returns>
public static int GetSafeTrainNum() public static int GetSafeTrainNum()
{ {
var result = (from x in Funs.DB.EduTrain_TrainRecord var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
where y.TrainType == "1" && x.TrainStartDate > Const.DtmarkTime join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
where y.TrainType == "1"
select x).Count(); select x).Count();
return result; return result;
} }
@ -609,9 +625,10 @@ namespace FineUIPro.Web.common
/// <returns></returns> /// <returns></returns>
public static int GetSpecialTrainNum() public static int GetSpecialTrainNum()
{ {
var result = (from x in Funs.DB.EduTrain_TrainRecord var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
where y.TrainType == "2" && x.TrainStartDate > Const.DtmarkTime join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
where y.TrainType == "2"
select x).Count(); select x).Count();
return result; return result;
} }
@ -622,9 +639,10 @@ namespace FineUIPro.Web.common
/// <returns></returns> /// <returns></returns>
public static int GetSpecialOperationTrainNum() public static int GetSpecialOperationTrainNum()
{ {
var result = (from x in Funs.DB.EduTrain_TrainRecord var result = (from x in Funs.DB.EduTrain_TrainRecordDetail
join y in Funs.DB.Base_TrainType on x.TrainTypeId equals y.TrainTypeId join z in Funs.DB.EduTrain_TrainRecord on x.TrainingId equals z.TrainingId
where y.TrainType == "3" && x.TrainStartDate > Const.DtmarkTime join y in Funs.DB.Base_TrainType on z.TrainTypeId equals y.TrainTypeId
where y.TrainType == "3"
select x).Count(); select x).Count();
return result; return result;
} }