This commit is contained in:
parent
bb77afd4d9
commit
2c1f892dec
|
|
@ -188,6 +188,8 @@ namespace BLL
|
||||||
LicensesCloseNum = newtable.LicensesCloseNum,
|
LicensesCloseNum = newtable.LicensesCloseNum,
|
||||||
GeneralClosedNum = newtable.GeneralClosedNum,
|
GeneralClosedNum = newtable.GeneralClosedNum,
|
||||||
GeneralNotClosedNum = newtable.GeneralNotClosedNum,
|
GeneralNotClosedNum = newtable.GeneralNotClosedNum,
|
||||||
|
LargerClosedNum = newtable.LargerClosedNum,
|
||||||
|
LargerNotClosedNum = newtable.LargerNotClosedNum,
|
||||||
MajorClosedNum = newtable.MajorClosedNum,
|
MajorClosedNum = newtable.MajorClosedNum,
|
||||||
MajorNotClosedNum = newtable.MajorNotClosedNum,
|
MajorNotClosedNum = newtable.MajorNotClosedNum,
|
||||||
GeneralRiskNum = newtable.GeneralRiskNum,
|
GeneralRiskNum = newtable.GeneralRiskNum,
|
||||||
|
|
@ -328,6 +330,8 @@ namespace BLL
|
||||||
table.LicensesCloseNum = newtable.LicensesCloseNum;
|
table.LicensesCloseNum = newtable.LicensesCloseNum;
|
||||||
table.GeneralClosedNum = newtable.GeneralClosedNum;
|
table.GeneralClosedNum = newtable.GeneralClosedNum;
|
||||||
table.GeneralNotClosedNum = newtable.GeneralNotClosedNum;
|
table.GeneralNotClosedNum = newtable.GeneralNotClosedNum;
|
||||||
|
table.LargerClosedNum = newtable.LargerClosedNum;
|
||||||
|
table.LargerNotClosedNum = newtable.LargerNotClosedNum;
|
||||||
table.MajorClosedNum = newtable.MajorClosedNum;
|
table.MajorClosedNum = newtable.MajorClosedNum;
|
||||||
table.MajorNotClosedNum = newtable.MajorNotClosedNum;
|
table.MajorNotClosedNum = newtable.MajorNotClosedNum;
|
||||||
table.GeneralRiskNum = newtable.GeneralRiskNum;
|
table.GeneralRiskNum = newtable.GeneralRiskNum;
|
||||||
|
|
@ -552,6 +556,8 @@ namespace BLL
|
||||||
{
|
{
|
||||||
table.GeneralClosedNum = GetGeneralClosedNum(projectid);
|
table.GeneralClosedNum = GetGeneralClosedNum(projectid);
|
||||||
table.GeneralNotClosedNum = GetGeneralNotClosedNum(projectid);
|
table.GeneralNotClosedNum = GetGeneralNotClosedNum(projectid);
|
||||||
|
table.LargerClosedNum = GetLargerClosedNum(projectid);
|
||||||
|
table.LargerNotClosedNum = GetLargerNotClosedNum(projectid);
|
||||||
table.MajorClosedNum = GetMajorClosedNum(projectid);
|
table.MajorClosedNum = GetMajorClosedNum(projectid);
|
||||||
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
|
table.MajorNotClosedNum = GetMajorNotClosedNum(projectid);
|
||||||
}
|
}
|
||||||
|
|
@ -1417,6 +1423,31 @@ namespace BLL
|
||||||
select x).Count();
|
select x).Count();
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
/// <summary>
|
||||||
|
/// 获取较大隐患整改闭环项
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static int GetLargerClosedNum(string projectid)
|
||||||
|
{
|
||||||
|
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||||
|
where x.ProjectId == projectid && x.Risk_Level == "较大事故隐患" && x.States == "3" &&
|
||||||
|
x.CheckTime > Const.DtmarkTime
|
||||||
|
select x).Count();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// 获取较大隐患未整改完成项
|
||||||
|
/// </summary>
|
||||||
|
/// <returns></returns>
|
||||||
|
public static int GetLargerNotClosedNum(string projectid)
|
||||||
|
{
|
||||||
|
var result = (from x in Funs.DB.HSSE_Hazard_HazardRegister
|
||||||
|
where x.ProjectId == projectid && x.Risk_Level == "较大事故隐患" && x.States != "3" && x.States != "-1" &&
|
||||||
|
x.CheckTime > Const.DtmarkTime
|
||||||
|
select x).Count();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取重大隐患整改闭环项
|
/// 获取重大隐患整改闭环项
|
||||||
|
|
@ -1719,6 +1750,8 @@ namespace BLL
|
||||||
x.LicensesCloseNum,
|
x.LicensesCloseNum,
|
||||||
x.GeneralClosedNum,
|
x.GeneralClosedNum,
|
||||||
x.GeneralNotClosedNum,
|
x.GeneralNotClosedNum,
|
||||||
|
x.LargerClosedNum,
|
||||||
|
x.LargerNotClosedNum,
|
||||||
x.MajorClosedNum,
|
x.MajorClosedNum,
|
||||||
x.MajorNotClosedNum,
|
x.MajorNotClosedNum,
|
||||||
x.GeneralRiskNum,
|
x.GeneralRiskNum,
|
||||||
|
|
|
||||||
|
|
@ -6,7 +6,7 @@
|
||||||
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
|
<_PublishTargetUrl>G:\发布\五环WebApi</_PublishTargetUrl>
|
||||||
<History>True|2026-03-11T09:57:46.6298303Z||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;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||;</History>
|
<History>True|2026-03-11T11:40:09.7470523Z||;True|2026-03-11T17:57:46.6298303+08:00||;True|2026-03-06T12:42:13.4499176+08:00||;True|2026-03-05T15:19:57.4320764+08:00||;True|2026-03-04T19:14:37.2772043+08:00||;True|2026-03-01T17:32:51.9305697+08:00||;True|2026-03-01T16:45:09.4172340+08:00||;True|2026-03-01T14:50:18.5222913+08:00||;True|2026-02-28T17:34:46.4778856+08:00||;True|2026-02-28T15:29:45.4981175+08:00||;True|2026-02-28T15:22:44.8350431+08:00||;True|2026-02-28T15:16:49.0265188+08:00||;True|2026-02-28T15:01:52.0489798+08:00||;True|2026-02-28T14:40:09.1723344+08:00||;True|2026-02-28T09:47:26.7601751+08:00||;True|2026-01-24T15:12:59.9025754+08:00||;True|2026-01-19T14:30:45.4370000+08:00||;True|2025-12-24T19:02:35.3684081+08:00||;True|2025-12-18T09:29:13.2909255+08:00||;True|2025-11-25T10:18:00.9729814+08:00||;True|2025-11-25T10:14:14.6947178+08:00||;True|2025-11-25T10:06:29.1167142+08:00||;True|2025-11-25T09:25:18.3566779+08:00||;True|2025-11-24T16:07:37.5433070+08:00||;True|2025-11-19T19:50:54.0090859+08:00||;True|2025-11-19T19:29:28.5861506+08:00||;True|2025-11-19T19:14:02.6887533+08:00||;True|2025-11-19T19:08:28.7856694+08:00||;True|2025-11-17T14:41:29.0529618+08:00||;True|2025-11-17T12:28:22.9224307+08:00||;True|2025-11-17T11:17:50.1481769+08:00||;True|2025-11-07T14:46:56.1446809+08:00||;True|2025-11-05T09:32:06.4998794+08:00||;True|2025-11-04T16:39:28.2175670+08:00||;True|2025-11-04T16:39:02.3610432+08:00||;True|2025-11-04T15:44:06.1295264+08:00||;True|2025-10-31T16:41:11.6570385+08:00||;True|2025-10-30T15:58:05.2014433+08:00||;True|2025-10-29T16:22:27.7866967+08:00||;True|2025-10-29T11:19:32.1187038+08:00||;True|2025-10-24T15:59:19.4176668+08:00||;True|2025-10-23T10:17:32.2384443+08:00||;True|2025-10-23T10:09:35.0601937+08:00||;True|2025-10-23T09:59:27.2018799+08:00||;True|2025-09-29T15:39:36.8617347+08:00||;True|2025-09-29T11:28:10.9193152+08:00||;True|2025-09-29T10:59:58.2893583+08:00||;True|2025-09-23T16:56:39.6344263+08:00||;True|2025-09-23T16:44:57.4175593+08:00||;True|2025-09-23T16:44:35.0478492+08:00||;True|2025-09-23T16:06:50.5843534+08:00||;True|2025-09-22T20:54:35.9805610+08:00||;True|2025-09-22T20:45:58.7044128+08:00||;True|2025-09-22T20:40:46.7449595+08:00||;True|2025-09-22T15:14:22.9602725+08:00||;True|2025-09-22T15:08:27.5989706+08:00||;True|2025-09-22T14:54:19.5237685+08:00||;True|2025-09-18T09:53:17.9300539+08:00||;True|2025-09-16T19:11:12.4383069+08:00||;True|2025-09-02T11:14:00.9580707+08:00||;True|2025-09-02T10:52:20.0445598+08:00||;True|2025-08-29T17:56:01.6245615+08:00||;True|2025-08-29T17:55:41.2802685+08:00||;True|2025-08-09T21:27:40.2103961+08:00||;True|2025-08-06T15:31:52.1166645+08:00||;True|2025-08-04T18:56:13.9675910+08:00||;True|2025-07-23T11:12:18.0134770+08:00||;True|2025-07-23T10:36:09.9990536+08:00||;True|2025-07-23T10:35:51.8814789+08:00||;True|2025-07-21T17:46:45.4620710+08:00||;True|2025-07-21T17:40:43.9871097+08:00||;True|2025-07-21T17:29:11.9275869+08:00||;True|2025-07-21T17:05:21.7763763+08:00||;True|2025-07-18T17:55:59.4892329+08:00||;True|2025-07-18T11:08:56.2628896+08:00||;True|2025-07-18T10:53:44.2534260+08:00||;True|2025-07-18T10:27:52.6751668+08:00||;True|2025-07-18T10:03:09.1785776+08:00||;True|2025-07-18T10:02:38.1252107+08:00||;True|2025-07-17T18:19:07.5837609+08:00||;True|2025-07-17T15:40:11.9126705+08:00||;True|2025-07-11T17:54:03.0298703+08:00||;True|2025-07-11T16:19:50.3283029+08:00||;True|2025-07-11T15:49:22.5920473+08:00||;True|2025-07-02T14:39:27.0436873+08:00||;True|2025-07-02T11:18:29.1208369+08:00||;True|2025-07-01T15:52:16.6767496+08:00||;True|2025-07-01T10:14:59.0471052+08:00||;True|2025-06-28T11:40:36.0544739+08:00||;True|2025-06-27T15:10:24.4628086+08:00||;True|2025-06-27T10:31:14.8332810+08:00||;True|2025-06-27T10:13:13.3022394+08:00||;True|2025-06-26T23:51:04.1304509+08:00||;True|2025-06-26T23:34:06.4223762+08:00||;True|2025-06-26T22:42:08.9018138+08:00||;True|2025-06-26T22:16:01.8954571+08:00||;True|2025-06-26T21:19:42.2638204+08:00||;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||;</History>
|
||||||
<LastFailureDetails />
|
<LastFailureDetails />
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|
@ -86,22 +86,22 @@
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.compiled">
|
<File Include="bin/App_global.asax.compiled">
|
||||||
<publishTime>03/11/2026 17:57:44</publishTime>
|
<publishTime>03/11/2026 19:40:09</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/App_global.asax.dll">
|
<File Include="bin/App_global.asax.dll">
|
||||||
<publishTime>03/11/2026 17:57:44</publishTime>
|
<publishTime>03/11/2026 19:40:09</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/Aspose.Words.dll">
|
<File Include="bin/Aspose.Words.dll">
|
||||||
<publishTime>12/06/2024 20:13:58</publishTime>
|
<publishTime>12/06/2024 20:13:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.dll">
|
<File Include="bin/BLL.dll">
|
||||||
<publishTime>03/11/2026 17:57:22</publishTime>
|
<publishTime>03/11/2026 19:39:57</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.dll.config">
|
<File Include="bin/BLL.dll.config">
|
||||||
<publishTime>12/26/2024 09:46:52</publishTime>
|
<publishTime>12/26/2024 09:46:52</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BLL.pdb">
|
<File Include="bin/BLL.pdb">
|
||||||
<publishTime>03/11/2026 17:57:22</publishTime>
|
<publishTime>03/11/2026 19:39:57</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/BouncyCastle.Crypto.dll">
|
<File Include="bin/BouncyCastle.Crypto.dll">
|
||||||
<publishTime>12/18/2020 05:32:28</publishTime>
|
<publishTime>12/18/2020 05:32:28</publishTime>
|
||||||
|
|
@ -389,13 +389,13 @@
|
||||||
<publishTime>02/09/2013 00:42:28</publishTime>
|
<publishTime>02/09/2013 00:42:28</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.dll">
|
<File Include="bin/WebAPI.dll">
|
||||||
<publishTime>03/11/2026 17:57:23</publishTime>
|
<publishTime>03/11/2026 19:39:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.pdb">
|
<File Include="bin/WebAPI.pdb">
|
||||||
<publishTime>03/11/2026 17:57:23</publishTime>
|
<publishTime>03/11/2026 19:39:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebAPI.xml">
|
<File Include="bin/WebAPI.xml">
|
||||||
<publishTime>03/11/2026 17:57:23</publishTime>
|
<publishTime>03/11/2026 19:39:58</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="bin/WebGrease.dll">
|
<File Include="bin/WebGrease.dll">
|
||||||
<publishTime>01/23/2014 21:57:34</publishTime>
|
<publishTime>01/23/2014 21:57:34</publishTime>
|
||||||
|
|
@ -479,7 +479,7 @@
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="PrecompiledApp.config">
|
<File Include="PrecompiledApp.config">
|
||||||
<publishTime>03/11/2026 17:57:24</publishTime>
|
<publishTime>03/11/2026 19:39:59</publishTime>
|
||||||
</File>
|
</File>
|
||||||
<File Include="Scripts/bootstrap.js">
|
<File Include="Scripts/bootstrap.js">
|
||||||
<publishTime>10/28/2024 14:02:50</publishTime>
|
<publishTime>10/28/2024 14:02:50</publishTime>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue