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

对接集团大屏数据

This commit is contained in:
夏菊 2025-06-26 22:14:34 +08:00
parent 7ad1cafae8
commit 3680941218
4 changed files with 104 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
DataBase/版本日志/SGGLDB_WH_2025-06-26.sql Normal file
View File

@ -0,0 +1,12 @@
update HSSE_Hazard_HazardRegister set Risk_Level='一般事故隐患'
where Risk_Level='一般'
update HSSE_Hazard_HazardRegister set Risk_Level='重大事故隐患'
where Risk_Level='重大'
GO

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

@ -3709,6 +3709,61 @@ namespace BLL
/// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetUseEquipment()
{
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.EquipmentQualityId,
ProjectId = item.ProjectId,
//ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
//UnitId = item.UnitId,
UnitName = unit.UnitName,
SpecialEquipmentName = item.EquipmentQualityName,
SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate,
EQType = "特种设备"
})
.Union(
from item in Funs.DB.QualityAudit_GeneralEquipmentQuality
join eq in Funs.DB.Base_SpecialEquipment on item.GeneralEquipmentQualityId equals eq.SpecialEquipmentId into eqGroup
from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.GeneralEquipmentQualityId,
ProjectId = item.ProjectId,
// ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
// UnitId = item.UnitId,
UnitName = unit.UnitName,
// SpecialEquipmentId = item.SpecialEquipmentId,
SpecialEquipmentName = eq.SpecialEquipmentName,
//SizeModel = eq.SizeModel,
//OwnerCheck = item.OwnerCheck,
CertificateNum = item.GeneralEquipmentQualityCode,
//IsUsed = item.IsUsed,
CompileDate = item.CompileDate,
EQType = "一般设备"
}
);
/* 通用版业务逻辑【弃用】
var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
from eq in eqGroup.DefaultIfEmpty()
@ -3765,6 +3820,7 @@ namespace BLL
EQType = "一般设备"
}
);
*/
return query.ToList();
}
@ -3781,6 +3837,31 @@ namespace BLL
/// <returns></returns>
public static List<Model.ConstructionEquipmentOutput> GetSpecialEquipment()
{
var query = (from item in Funs.DB.QualityAudit_EquipmentQuality
//join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into eqGroup
//from eq in eqGroup.DefaultIfEmpty()
//join spe in Funs.DB.Base_SpecialEquipment on item.SpecialEquipmentId equals spe.SpecialEquipmentId into speGroup
//from spe in speGroup.DefaultIfEmpty()
join p in Funs.DB.Base_Project on item.ProjectId equals p.ProjectId into pGroup
from p in pGroup.DefaultIfEmpty()
join unit in Funs.DB.Base_Unit on item.UnitId equals unit.UnitId into unitGroup
from unit in unitGroup.DefaultIfEmpty()
where BeUnderConstructionList.Contains(item.ProjectId)
select new ConstructionEquipmentOutput
{
Id = item.EquipmentQualityId,
ProjectId = item.ProjectId,
//ProjectCode = p.ProjectCode,
ProjectName = p.ProjectName,
//UnitId = item.UnitId,
UnitName = unit.UnitName,
SpecialEquipmentName = item.EquipmentQualityName,
SizeModel = item.SizeModel,
CertificateNum = item.CertificateCode,
CompileDate = item.CompileDate,
EQType = "特种设备"
});
/* 通用版业务逻辑【弃用】
var query = (from item in Funs.DB.InApproveManager_EquipmentInItem
join eq in Funs.DB.InApproveManager_EquipmentIn on item.EquipmentInId equals eq.EquipmentInId into
eqGroup
@ -3810,6 +3891,7 @@ namespace BLL
CompileDate = eq.CompileDate,
EQType = "特种设备"
});
*/
return query.ToList();
}
public static async Task<List<Model.ConstructionEquipmentOutput>> GetSpecialEquipmentAsync()

18
SGGL/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
View File

@ -6,7 +6,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
<History>True|2025-06-25T15:22:39.7267591Z||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<History>True|2025-06-26T13:19:42.2638204Z||;True|2025-06-25T23:22:39.7267591+08:00||;True|2025-06-25T23:19:33.2378458+08:00||;True|2025-06-25T22:18:16.2863303+08:00||;True|2025-06-25T22:10:29.2540175+08:00||;True|2025-06-25T22:00:58.5212166+08:00||;True|2025-06-25T22:00:31.2531214+08:00||;True|2025-06-25T18:33:01.5770030+08:00||;True|2025-06-25T17:47:33.7779622+08:00||;True|2025-06-25T17:40:26.9905954+08:00||;True|2025-06-20T11:24:58.4099232+08:00||;True|2025-06-19T16:42:45.2358810+08:00||;True|2025-06-16T19:28:10.6447738+08:00||;True|2025-06-12T11:00:02.3559090+08:00||;True|2025-06-12T10:40:29.0324520+08:00||;True|2025-06-04T23:24:01.0324973+08:00||;True|2025-06-04T18:39:41.7304136+08:00||;True|2025-06-04T11:23:17.3803405+08:00||;True|2025-06-04T11:04:32.4212196+08:00||;True|2025-05-26T19:19:09.7246357+08:00||;True|2025-05-26T19:16:39.1283077+08:00||;True|2025-05-26T19:09:24.1561616+08:00||;True|2025-04-07T16:11:44.5172315+08:00||;True|2025-04-02T18:10:22.8695984+08:00||;True|2025-04-02T17:59:51.2978116+08:00||;True|2025-04-02T17:50:55.8630437+08:00||;True|2025-04-02T17:49:22.5114405+08:00||;True|2025-04-02T17:47:11.0650205+08:00||;True|2025-04-02T17:39:09.8576853+08:00||;True|2025-04-02T17:38:15.3079030+08:00||;True|2025-04-02T17:22:03.6735964+08:00||;True|2025-04-02T17:19:04.4220913+08:00||;True|2025-04-02T17:17:14.0244636+08:00||;True|2025-04-02T17:11:09.6583011+08:00||;True|2025-04-02T17:07:23.6330597+08:00||;True|2025-04-02T16:58:45.4070649+08:00||;True|2025-04-02T16:50:20.5907511+08:00||;True|2025-04-02T16:44:18.5351224+08:00||;True|2025-04-02T16:31:11.1297141+08:00||;True|2025-04-02T16:18:43.1126995+08:00||;True|2025-04-02T14:50:42.5384021+08:00||;True|2025-04-01T10:53:08.9403414+08:00||;True|2025-04-01T10:52:08.7646389+08:00||;True|2025-04-01T09:52:56.3095742+08:00||;True|2025-03-13T16:44:25.3220313+08:00||;True|2025-03-13T15:31:10.3223071+08:00||;True|2025-03-13T10:58:17.1401575+08:00||;True|2025-01-23T23:10:37.9664637+08:00||;True|2024-09-24T09:51:10.8028974+08:00||;True|2024-09-20T17:30:59.6144803+08:00||;True|2024-09-20T15:28:40.2547949+08:00||;True|2024-09-19T16:30:51.3047517+08:00||;True|2024-09-19T15:53:23.2431713+08:00||;True|2024-09-19T15:48:55.0571748+08:00||;True|2024-09-19T15:06:29.5748482+08:00||;True|2024-09-19T14:55:42.1477578+08:00||;True|2024-09-19T10:07:53.8666329+08:00||;True|2024-09-03T16:26:17.4985546+08:00||;True|2024-07-17T10:29:15.9472548+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
<ItemGroup>
@ -86,22 +86,22 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="bin/App_global.asax.compiled">
<publishTime>06/25/2025 23:40:39</publishTime>
<publishTime>06/26/2025 21:19:40</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/25/2025 23:40:39</publishTime>
<publishTime>06/26/2025 21:19:40</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>06/25/2025 23:40:29</publishTime>
<publishTime>06/26/2025 21:19:19</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>06/25/2025 23:40:29</publishTime>
<publishTime>06/26/2025 21:19:19</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>06/25/2025 23:40:30</publishTime>
<publishTime>06/26/2025 21:19:22</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>06/25/2025 23:40:30</publishTime>
<publishTime>06/26/2025 21:19:22</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>06/25/2025 23:40:30</publishTime>
<publishTime>06/26/2025 21:19:22</publishTime>
</File>
<File Include="bin/WebGrease.dll">
<publishTime>01/23/2014 21:57:34</publishTime>
@ -479,7 +479,7 @@
<publishTime>10/28/2024 14:02:50</publishTime>
</File>
<File Include="PrecompiledApp.config">
<publishTime>06/25/2025 23:40:32</publishTime>
<publishTime>06/26/2025 21:19:24</publishTime>
</File>
<File Include="Scripts/bootstrap.js">
<publishTime>10/28/2024 14:02:50</publishTime>

2
SGGL/WebAPI/WebAPI.csproj.user
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
<LastActiveSolutionConfig>Release|Any CPU</LastActiveSolutionConfig>
<UseIISExpress>true</UseIISExpress>
<Use64BitIISExpress />
<IISExpressSSLPort />