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

质量危大工程补充作业人数

This commit is contained in:
夏菊 2025-06-28 11:41:02 +08:00
parent e68b8dba96
commit 94eea2512d
10 changed files with 1090 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
DataBase/版本日志/SGGLDB_WH_2025-06-27.sql Normal file
View File

@ -0,0 +1,40 @@
--质量危大工程补充方案名称、作业人数
alter table dbo.Comprehensive_MajorPlanApproval add OperativesNum int
go
exec sp_addextendedproperty 'MS_Description', N'作业人员数', 'SCHEMA', 'dbo', 'TABLE', 'Comprehensive_MajorPlanApproval',
'COLUMN', 'OperativesNum'
go
exec sp_addextendedproperty 'MS_Description', N'方案名称', 'SCHEMA', 'dbo', 'TABLE', 'Solution_LargerHazard',
'COLUMN', 'HazardName'
go
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value1 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value2 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value3 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value4 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value5 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value6 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value7 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value8 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value9 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value10 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value11 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value12 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value13 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value14 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value15 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value16 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value17 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value18 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value19 NVARCHAR(1000);
ALTER TABLE Sys_CQMS_DataInTemp ALTER COLUMN Value20 NVARCHAR(1000);

6
SGGL/BLL/CQMS/Comprehensive/MajorPlanApprovalService.cs
View File

@ -126,6 +126,7 @@ namespace BLL
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
newMajorPlanApproval.States = majorPlanApproval.States;
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
@ -169,6 +170,7 @@ namespace BLL
newMajorPlanApproval.HazardType = majorPlanApproval.HazardType;
newMajorPlanApproval.ExpectedTime = majorPlanApproval.ExpectedTime;
newMajorPlanApproval.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newMajorPlanApproval.OperativesNum = majorPlanApproval.OperativesNum;
newMajorPlanApproval.States = majorPlanApproval.States;
newMajorPlanApproval.IsReview = majorPlanApproval.IsReview;
db.SubmitChanges();
@ -212,6 +214,7 @@ namespace BLL
{
HazardId = majorPlanApproval.MajorPlanApprovalId,
HazardCode = majorPlanApproval.PlanCode,
HazardName = majorPlanApproval.PlanName,
HazardType = majorPlanApproval.HazardType,
ProjectId = majorPlanApproval.ProjectId,
Address = majorPlanApproval.UnitWorkId,
@ -221,6 +224,7 @@ namespace BLL
RecardMan = majorPlanApproval.CompileMan,
States = majorPlanApproval.States,
TrainPersonNum = majorPlanApproval.TrainPersonNum,
OperativesNum = majorPlanApproval.OperativesNum,
IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false,
};
@ -238,6 +242,7 @@ namespace BLL
if (newLargerHazard != null)
{
newLargerHazard.HazardCode = majorPlanApproval.PlanCode;
newLargerHazard.HazardName = majorPlanApproval.PlanName;
newLargerHazard.HazardType = majorPlanApproval.HazardType;
newLargerHazard.ProjectId = majorPlanApproval.ProjectId;
newLargerHazard.Address = majorPlanApproval.UnitWorkId;
@ -246,6 +251,7 @@ namespace BLL
newLargerHazard.RecordTime = majorPlanApproval.ApprovalDate;
newLargerHazard.States = majorPlanApproval.States;
newLargerHazard.TrainPersonNum = majorPlanApproval.TrainPersonNum;
newLargerHazard.OperativesNum = majorPlanApproval.OperativesNum;
newLargerHazard.IsSuperLargerHazard = majorPlanApproval.SchemeType == "超危大工程" ? true : false;
db.SubmitChanges();
}

4
SGGL/BLL/HSSE/Solution/LargerHazardService.cs
View File

@ -132,6 +132,7 @@ namespace BLL
Model.Comprehensive_MajorPlanApproval newMajorPlanApproval = new Model.Comprehensive_MajorPlanApproval();
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.PlanName = largerHazard.HazardName;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@ -141,6 +142,7 @@ namespace BLL
newMajorPlanApproval.CompileMan = largerHazard.RecardMan;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.Comprehensive_MajorPlanApproval.InsertOnSubmit(newMajorPlanApproval);
db.SubmitChanges();
@ -155,6 +157,7 @@ namespace BLL
{
newMajorPlanApproval.MajorPlanApprovalId = largerHazard.HazardId;
newMajorPlanApproval.PlanCode = largerHazard.HazardCode;
newMajorPlanApproval.PlanName = largerHazard.HazardName;
newMajorPlanApproval.HazardType = largerHazard.HazardType;
newMajorPlanApproval.ProjectId = largerHazard.ProjectId;
newMajorPlanApproval.UnitWorkId = largerHazard.Address;
@ -163,6 +166,7 @@ namespace BLL
newMajorPlanApproval.ApprovalDate = largerHazard.RecordTime;
newMajorPlanApproval.States = largerHazard.States;
newMajorPlanApproval.TrainPersonNum = largerHazard.TrainPersonNum;
newMajorPlanApproval.OperativesNum = largerHazard.OperativesNum;
newMajorPlanApproval.SchemeType = largerHazard.IsSuperLargerHazard.HasValue ? "超危大工程" : "危大工程";
db.SubmitChanges();
}

1
SGGL/BLL/ZHGL/DataSync/ProjectDataSync/Project_HSSEData_HSSEService.cs
View File

@ -2100,6 +2100,7 @@ namespace BLL
Address = x.Address,
Descriptions = x.Descriptions,
TrainPersonNum = x.TrainPersonNum,
OperativesNum = x.OperativesNum,
RecordTime = x.RecordTime,
ExpectedTime = x.ExpectedTime,
States = x.States,

1
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx
View File

@ -81,6 +81,7 @@
<f:ListItem Text="作业中" Value="2"/>
<f:ListItem Text="已关闭" Value="3"/>
</f:DropDownList>
<f:NumberBox runat="server" ID="txtOperativesNum" NoDecimal="true" NoNegative="true" Label="作业人员数" LabelWidth="130px"></f:NumberBox>
</Items>
</f:FormRow>
<f:FormRow>

3
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.cs
View File

@ -89,6 +89,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
this.AttachUrl6.InnerHtml = BLL.UploadAttachmentService.ShowAttachment("../../", getUrl(this.MajorPlanApprovalId + "_6"));
this.txtTrainPersonNum.Text = majorPlanApproval.TrainPersonNum.HasValue ? majorPlanApproval.TrainPersonNum.ToString() : "";
this.txtOperativesNum.Text = majorPlanApproval.OperativesNum.HasValue ? majorPlanApproval.OperativesNum.ToString() : "";
this.txtAuditMan.Text = majorPlanApproval.AuditMan;
this.txtApprovalMan.Text = majorPlanApproval.ApprovalMan;
//this.txtImplementationDeviation.Text = majorPlanApproval.ImplementationDeviation;
@ -155,7 +156,7 @@ namespace FineUIPro.Web.CQMS.Comprehensive
majorPlanApproval.States = this.drpStates.SelectedValue;
}
majorPlanApproval.TrainPersonNum = Funs.GetNewInt(this.txtTrainPersonNum.Text.Trim());
majorPlanApproval.OperativesNum = Funs.GetNewInt(this.txtOperativesNum.Text.Trim());
if (this.drpSchemeType.SelectedValue == "超危大工程" && this.drpStates.SelectedValue != "1")
{

9
SGGL/FineUIPro.Web/CQMS/Comprehensive/MajorPlanApprovalEdit.aspx.designer.cs generated
View File

@ -194,6 +194,15 @@ namespace FineUIPro.Web.CQMS.Comprehensive
/// </remarks>
protected global::FineUIPro.DropDownList drpStates;
/// <summary>
/// txtOperativesNum 控件。
/// </summary>
/// <remarks>
/// 自动生成的字段。
/// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
/// </remarks>
protected global::FineUIPro.NumberBox txtOperativesNum;
/// <summary>
/// Panel2 控件。
/// </summary>

1035
SGGL/Model/Model.cs
View File

File diff suppressed because it is too large Load Diff

22
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-27T02:31:14.8332810Z||;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||;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-28T03:40:36.0544739Z||;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||;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/27/2025 10:31:13</publishTime>
<publishTime>06/28/2025 11:40:34</publishTime>
</File>
<File Include="bin/App_global.asax.dll">
<publishTime>06/27/2025 10:31:13</publishTime>
<publishTime>06/28/2025 11:40:34</publishTime>
</File>
<File Include="bin/Aspose.Words.dll">
<publishTime>12/06/2024 20:13:58</publishTime>
</File>
<File Include="bin/BLL.dll">
<publishTime>06/27/2025 10:31:03</publishTime>
<publishTime>06/28/2025 11:40:10</publishTime>
</File>
<File Include="bin/BLL.dll.config">
<publishTime>12/26/2024 09:46:52</publishTime>
</File>
<File Include="bin/BLL.pdb">
<publishTime>06/27/2025 10:31:03</publishTime>
<publishTime>06/28/2025 11:40:10</publishTime>
</File>
<File Include="bin/BouncyCastle.Crypto.dll">
<publishTime>12/18/2020 05:32:28</publishTime>
@ -128,10 +128,10 @@
<publishTime>07/25/2012 19:48:56</publishTime>
</File>
<File Include="bin/Model.dll">
<publishTime>06/25/2025 17:39:58</publishTime>
<publishTime>06/27/2025 15:09:55</publishTime>
</File>
<File Include="bin/Model.pdb">
<publishTime>06/25/2025 17:39:58</publishTime>
<publishTime>06/27/2025 15:09:55</publishTime>
</File>
<File Include="bin/netstandard.dll">
<publishTime>07/04/2024 14:13:01</publishTime>
@ -389,13 +389,13 @@
<publishTime>02/09/2013 00:42:28</publishTime>
</File>
<File Include="bin/WebAPI.dll">
<publishTime>06/27/2025 10:31:04</publishTime>
<publishTime>06/28/2025 11:40:14</publishTime>
</File>
<File Include="bin/WebAPI.pdb">
<publishTime>06/27/2025 10:31:04</publishTime>
<publishTime>06/28/2025 11:40:14</publishTime>
</File>
<File Include="bin/WebAPI.xml">
<publishTime>06/27/2025 10:31:04</publishTime>
<publishTime>06/28/2025 11:40:14</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/27/2025 10:31:05</publishTime>
<publishTime>06/28/2025 11:40:15</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 />