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

1、施工机具设备在用数统计规则调整 

2、作业许可项数去除只取高风险作业逻辑
This commit is contained in:
夏菊 2026-03-11 16:04:26 +08:00
parent 64dc52bf92
commit b185fc4f09
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
SGGL/BLL/ZHGL/DataSync/HSSEData_HSSEService.cs
View File

@ -5,6 +5,7 @@ using Newtonsoft.Json;
using System; using System;
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data;
using System.Linq; using System.Linq;
using System.Runtime.InteropServices.ComTypes; using System.Runtime.InteropServices.ComTypes;
using System.Runtime.Remoting.Contexts; using System.Runtime.Remoting.Contexts;
@ -840,7 +841,8 @@ namespace BLL
ProjectDrillPersonNum = projectDrillList.Sum(x => x.JointPersonNum), ProjectDrillPersonNum = projectDrillList.Sum(x => x.JointPersonNum),
CostExtract = Convert.ToInt32(costExtract.Sum(x => x.SUMCost)), CostExtract = Convert.ToInt32(costExtract.Sum(x => x.SUMCost)),
CostUse = Convert.ToInt32(costUseList.Sum(x => x.SUMCost)), CostUse = Convert.ToInt32(costUseList.Sum(x => x.SUMCost)),
UseEquipmentNum = useEquipmentList.Count(), //UseEquipmentNum = useEquipmentList.Count(),
UseEquipmentNum = Convert.ToInt32(useEquipmentList.Sum(x => x.EquipmentCount)),
SpecialEquipmentNum = specialEquipmentList.Count(), SpecialEquipmentNum = specialEquipmentList.Count(),
LicensesNum = licensesList.Count(), LicensesNum = licensesList.Count(),
LicensesCloseNum = licensesCloseList.Count(), LicensesCloseNum = licensesCloseList.Count(),
@ -991,7 +993,8 @@ namespace BLL
ProjectDrillPersonNum = projectDrillList.Where(x => x.ProjectId == projectid).Sum(x => x.JointPersonNum), ProjectDrillPersonNum = projectDrillList.Where(x => x.ProjectId == projectid).Sum(x => x.JointPersonNum),
CostExtract = Convert.ToInt32(costExtract.Where(x => x.ProjectId == projectid).Sum(x => x.SUMCost)), CostExtract = Convert.ToInt32(costExtract.Where(x => x.ProjectId == projectid).Sum(x => x.SUMCost)),
CostUse = Convert.ToInt32(costUseList.Where(x => x.ProjectId == projectid).Sum(x => x.SUMCost)), CostUse = Convert.ToInt32(costUseList.Where(x => x.ProjectId == projectid).Sum(x => x.SUMCost)),
UseEquipmentNum = useEquipmentList.Count(x => x.ProjectId == projectid), //UseEquipmentNum = useEquipmentList.Count(x => x.ProjectId == projectid),
UseEquipmentNum = Convert.ToInt32(useEquipmentList.Where(x => x.ProjectId == projectid).Sum(x => x.EquipmentCount)),
SpecialEquipmentNum = specialEquipmentList.Count(x => x.ProjectId == projectid), SpecialEquipmentNum = specialEquipmentList.Count(x => x.ProjectId == projectid),
LicensesNum = licensesList.Count(x => x.ProjectId == projectid), LicensesNum = licensesList.Count(x => x.ProjectId == projectid),
LicensesCloseNum = licensesCloseList.Count(x => x.ProjectId == projectid), LicensesCloseNum = licensesCloseList.Count(x => x.ProjectId == projectid),
@ -3671,6 +3674,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetUseEquipment() public static List<Model.ConstructionEquipmentOutput> GetUseEquipment()
{ {
var datenow = DateTime.Now;
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup //join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty() //from eq in eqGroup.DefaultIfEmpty()
@ -3680,7 +3684,7 @@ namespace BLL
from p in pGroup.DefaultIfEmpty() from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty() from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId) where BeUnderConstructionList.Contains(item.ProjectId) && (item.OutDate == null || (item.OutDate != null && item.OutDate > datenow))
select new ConstructionEquipmentOutput select new ConstructionEquipmentOutput
{ {
Id = item.EquipmentQualityId, Id = item.EquipmentQualityId,
@ -3693,6 +3697,7 @@ namespace BLL
//SizeModel = item.SizeModel, //SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode, CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate, CompileDate = item.CompileDate,
EquipmentCount = 1,
EQType = "特种设备" EQType = "特种设备"
}) })
.Union( .Union(
@ -3705,7 +3710,7 @@ namespace BLL
from p in pGroup.DefaultIfEmpty() from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty() from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId) where BeUnderConstructionList.Contains(item.ProjectId) && item.EquipmentCount != null && item.IsQualified == true
select new ConstructionEquipmentOutput select new ConstructionEquipmentOutput
{ {
Id = item.GeneralEquipmentQualityId, Id = item.GeneralEquipmentQualityId,
@ -3721,6 +3726,7 @@ namespace BLL
CertificateNum = item.GeneralEquipmentQualityCode, CertificateNum = item.GeneralEquipmentQualityCode,
//IsUsed = item.IsUsed, //IsUsed = item.IsUsed,
CompileDate = item.CompileDate, CompileDate = item.CompileDate,
EquipmentCount = item.EquipmentCount,
EQType = "一般设备" EQType = "一般设备"
} }
); );
@ -3799,6 +3805,7 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetSpecialEquipment() public static List<Model.ConstructionEquipmentOutput> GetSpecialEquipment()
{ {
var datenow = DateTime.Now;
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup //join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty() //from eq in eqGroup.DefaultIfEmpty()
@ -3808,7 +3815,7 @@ namespace BLL
from p in pGroup.DefaultIfEmpty() from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty() from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId) where BeUnderConstructionList.Contains(item.ProjectId) && (item.OutDate == null || (item.OutDate != null && item.OutDate > datenow))
select new ConstructionEquipmentOutput select new ConstructionEquipmentOutput
{ {
Id = item.EquipmentQualityId, Id = item.EquipmentQualityId,
@ -3821,6 +3828,7 @@ namespace BLL
SizeModel = item.SizeModel, SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode, CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate, CompileDate = item.CompileDate,
EquipmentCount = 1,
EQType = "特种设备" EQType = "特种设备"
}); });
/* 通用版业务逻辑【弃用】 /* 通用版业务逻辑【弃用】
@ -3872,9 +3880,9 @@ namespace BLL
/// <returns></returns> /// <returns></returns>
public static List<LicenseOutput> GetLicenses() public static List<LicenseOutput> GetLicenses()
{ {
//x.IsHighRisk == true &&
var result = (from x in Funs.DB.View_License_LicenseManager var result = (from x in Funs.DB.View_License_LicenseManager
where BeUnderConstructionList.Contains(x.ProjectId) && x.IsHighRisk == true && where BeUnderConstructionList.Contains(x.ProjectId) && x.CompileDate > Const.DtmarkTime
x.CompileDate > Const.DtmarkTime
select new Model.LicenseOutput select new Model.LicenseOutput
{ {
Id = x.LicenseManagerId, Id = x.LicenseManagerId,
@ -3954,7 +3962,7 @@ namespace BLL
ProjectCode = gg.Key.ProjectCode, ProjectCode = gg.Key.ProjectCode,
ProNum = gg.Count(y => y.States != "4" && y.States != "-1"), ProNum = gg.Count(y => y.States != "4" && y.States != "-1"),
RecNum = gg.Count(y => y.States == "3"), RecNum = gg.Count(y => y.States == "3"),
NoRecNum = gg.Count(y => y.States != "3" && y.States != "-1"), NoRecNum = gg.Count(y => y.States != "3" && y.States != "4" && y.States != "-1"),
RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" : RecRate = gg.Count(y => y.States != "4" && y.States != "-1") == 0 ? "0" :
Math.Round(Convert.ToDecimal(gg.Count(y => y.States == "3") / Math.Round(Convert.ToDecimal(gg.Count(y => y.States == "3") /
gg.Count(y => y.States != "4" && y.States != "-1") * 100), 2, MidpointRounding.AwayFromZero).ToString() gg.Count(y => y.States != "4" && y.States != "-1") * 100), 2, MidpointRounding.AwayFromZero).ToString()

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

@ -20402,7 +20402,7 @@
</FlavorProperties> </FlavorProperties>
</VisualStudio> </VisualStudio>
</ProjectExtensions> </ProjectExtensions>
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v15.0\WebApplications\Microsoft.WebApplication.targets" /> <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v18.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">

7
SGGL/Model/ZHGL/DataSync/ConstructionEquipmentOutput.cs
View File

@ -29,7 +29,12 @@ namespace Model
/// <summary> /// <summary>
/// 是否使用 /// 是否使用
/// </summary> /// </summary>
public bool ? IsUsed { get; set; } public bool? IsUsed { get; set; }
/// <summary>
/// 数量
/// </summary>
public int? EquipmentCount { get; set; }
} }
} }