diff --git a/DataBase/版本日志/SGGLDB_2025-07-16-gf.sql b/DataBase/版本日志/SGGLDB_2025-07-16-gf.sql
new file mode 100644
index 0000000..206b71d
--- /dev/null
+++ b/DataBase/版本日志/SGGLDB_2025-07-16-gf.sql
@@ -0,0 +1,42 @@
+alter table Information_MillionsMonthlyReport add KeyWorkNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKNum int null
+alter table Information_MillionsMonthlyReport add KeyWorkOKRate nvarchar(20) null
+GO
+
+
+/*************ҵʱȫͳ±**************/
+ALTER VIEW [dbo].[View_Information_MillionsMonthlyReport]
+AS
+SELECT
+Report.MillionsMonthlyReportId,
+Report.UnitId,
+Report.FillingDate,
+Report.UpState,
+(ISNULL(Group_0008.ConstText,'-') + ISNULL(Group_0009.ConstText,'-')) AS ReportDate,
+Group_0008.ConstText as YearStr,
+Group_0009.ConstText as MonthStr,
+U.UnitName,
+Report.Year,
+Report.Month,
+Report.DutyPerson,
+Report.RecordableIncidentRate,
+Report.LostTimeRate,
+Report.LostTimeInjuryRate,
+Report.DeathAccidentFrequency,
+Report.AccidentMortality,
+Report.HandleState,
+Report.HandleMan,
+Report.KeyWorkNum,
+Report.KeyWorkOKNum,
+Report.KeyWorkOKRate,
+US.UserName
+FROM dbo.Information_MillionsMonthlyReport AS Report
+LEFT JOIN Base_Unit AS U ON U.UnitId=Report.UnitId
+LEFT JOIN Sys_Const AS Group_0008 ON Group_0008.GroupId='0008' AND Group_0008.ConstValue =Report.[Year]
+LEFT JOIN Sys_Const AS Group_0009 ON Group_0009.GroupId='0009' AND Group_0009.ConstValue =Report.[Month]
+LEFT JOIN Sys_User AS US ON US.UserId=Report.HandleMan
+
+
+GO
+
+
diff --git a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
index 5526d2c..7084edc 100644
--- a/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
+++ b/SUBQHSE/BLL/WebService/CNCECHSSEWebService.cs
@@ -93,7 +93,7 @@
UnitId = x.UnitId,
Year = x.Year,
Month = x.Month,
- FillingMan = x.FillingMan,
+ FillingMan = x.FillingMan+"|"+(x.KeyWorkNum??0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
FillingDate = x.FillingDate,
DutyPerson = x.DutyPerson,
RecordableIncidentRate = x.RecordableIncidentRate,
diff --git a/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportService.cs b/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
index a807d8f..b19cb2f 100644
--- a/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
+++ b/SUBQHSE/BLL/ZHGL/Information/MillionsMonthlyReportService.cs
@@ -73,6 +73,9 @@ namespace BLL
BreakGroundLicenseNum = MillionsMonthlyReport.BreakGroundLicenseNum,
ElectricityLicenseNum = MillionsMonthlyReport.ElectricityLicenseNum,
RTLicenseNum = MillionsMonthlyReport.RTLicenseNum,
+ KeyWorkNum = MillionsMonthlyReport.KeyWorkNum,
+ KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum,
+ KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate,
NightLicenseNum = MillionsMonthlyReport.NightLicenseNum,
CommissionerNum = MillionsMonthlyReport.CommissionerNum,
SoleDutyNum = MillionsMonthlyReport.SoleDutyNum,
@@ -120,6 +123,9 @@ namespace BLL
newMillionsMonthlyReport.NightLicenseNum = MillionsMonthlyReport.NightLicenseNum;
newMillionsMonthlyReport.CommissionerNum = MillionsMonthlyReport.CommissionerNum;
newMillionsMonthlyReport.SoleDutyNum = MillionsMonthlyReport.SoleDutyNum;
+ newMillionsMonthlyReport.KeyWorkNum = MillionsMonthlyReport.KeyWorkNum;
+ newMillionsMonthlyReport.KeyWorkOKNum = MillionsMonthlyReport.KeyWorkOKNum;
+ newMillionsMonthlyReport.KeyWorkOKRate = MillionsMonthlyReport.KeyWorkOKRate;
Funs.DB.SubmitChanges();
}
diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
index 2e3b640..8b4822c 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReport.aspx
@@ -110,6 +110,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
protected global::FineUIPro.Label lbAccidentMortality;
+ ///
+ /// txtKeyWorkNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkNum;
+
+ ///
+ /// txtKeyWorkOKNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkOKNum;
+
+ ///
+ /// txtKeyWorkOKRate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label txtKeyWorkOKRate;
+
+ ///
+ /// Label1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label1;
+
+ ///
+ /// Label2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Label Label2;
+
///
/// Grid1 控件。
///
diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
index 0548ef2..bbcc04b 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx
@@ -185,6 +185,23 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
index fa3c007..46a192c 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.cs
@@ -176,6 +176,18 @@ namespace FineUIPro.Web.ZHGL.Information
{
this.txtSoleDutyNum.Text = Convert.ToString(report.SoleDutyNum);
}
+ if (report.KeyWorkNum != null)
+ {
+ this.txtKeyWorkNum.Text = report.KeyWorkNum.ToString();
+ }
+ if (report.KeyWorkOKNum != null)
+ {
+ this.txtKeyWorkOKNum.Text = report.KeyWorkOKNum.ToString();
+ }
+ if (!string.IsNullOrEmpty(report.KeyWorkOKRate))
+ {
+ this.txtKeyWorkOKRate.Text = report.KeyWorkOKRate;
+ }
}
}
else
@@ -276,6 +288,9 @@ namespace FineUIPro.Web.ZHGL.Information
report.NightLicenseNum = Funs.GetNewInt(this.txtNightLicenseNum.Text.Trim());
report.CommissionerNum = Funs.GetNewInt(this.txtCommissionerNum.Text.Trim());
report.SoleDutyNum = Funs.GetNewInt(this.txtSoleDutyNum.Text.Trim());
+ report.KeyWorkNum = Funs.GetNewIntOrZero(this.txtKeyWorkNum.Text.Trim());
+ report.KeyWorkOKNum = Funs.GetNewIntOrZero(this.txtKeyWorkOKNum.Text.Trim());
+ report.KeyWorkOKRate = this.txtKeyWorkOKRate.Text.Trim();
if (String.IsNullOrEmpty(MillionsMonthlyReportId))
{
Information_MillionsMonthlyReport old = MillionsMonthlyReportService.GetMillionsMonthlyReportByUnitIdDate(drpUnit.SelectedValue, Funs.GetNewIntOrZero(drpYear.SelectedValue), Funs.GetNewIntOrZero(drpMonth.SelectedValue));
@@ -1254,5 +1269,17 @@ namespace FineUIPro.Web.ZHGL.Information
}
}
#endregion
+
+ protected void txtKeyWorkNum_TextChanged(object sender, EventArgs e)
+ {
+ decimal keyWorkNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkNum.Text.Trim());
+ decimal keyWorkOKNum = Funs.GetNewDecimalOrZero(this.txtKeyWorkOKNum.Text.Trim());
+ string rate = string.Empty;
+ if (keyWorkNum > 0)
+ {
+ rate = (decimal.Round(keyWorkOKNum / keyWorkNum, 4) * 100).ToString("0.##") + "%";
+ }
+ this.txtKeyWorkOKRate.Text = rate;
+ }
}
}
\ No newline at end of file
diff --git a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
index 08fc7c7..7fea476 100644
--- a/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
+++ b/SUBQHSE/FineUIPro.Web/ZHGL/Information/MillionsMonthlyReportSave.aspx.designer.cs
@@ -381,6 +381,51 @@ namespace FineUIPro.Web.ZHGL.Information {
///
protected global::FineUIPro.NumberBox txtSoleDutyNum;
+ ///
+ /// GroupPanel1 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.GroupPanel GroupPanel1;
+
+ ///
+ /// Form2 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.Form Form2;
+
+ ///
+ /// txtKeyWorkNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtKeyWorkNum;
+
+ ///
+ /// txtKeyWorkOKNum 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.NumberBox txtKeyWorkOKNum;
+
+ ///
+ /// txtKeyWorkOKRate 控件。
+ ///
+ ///
+ /// 自动生成的字段。
+ /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+ ///
+ protected global::FineUIPro.TextBox txtKeyWorkOKRate;
+
///
/// Grid1 控件。
///
diff --git a/SUBQHSE/Model/Model.cs b/SUBQHSE/Model/Model.cs
index 302d470..3ed3f0c 100644
--- a/SUBQHSE/Model/Model.cs
+++ b/SUBQHSE/Model/Model.cs
@@ -218653,6 +218653,12 @@ namespace Model
private System.Nullable _SoleDutyNum;
+ private System.Nullable _KeyWorkNum;
+
+ private System.Nullable _KeyWorkOKNum;
+
+ private string _KeyWorkOKRate;
+
private EntityRef _Base_Unit;
private EntitySet _Information_MillionsMonthlyReportItem;
@@ -218723,6 +218729,12 @@ namespace Model
partial void OnCommissionerNumChanged();
partial void OnSoleDutyNumChanging(System.Nullable value);
partial void OnSoleDutyNumChanged();
+ partial void OnKeyWorkNumChanging(System.Nullable value);
+ partial void OnKeyWorkNumChanged();
+ partial void OnKeyWorkOKNumChanging(System.Nullable value);
+ partial void OnKeyWorkOKNumChanged();
+ partial void OnKeyWorkOKRateChanging(string value);
+ partial void OnKeyWorkOKRateChanged();
#endregion
public Information_MillionsMonthlyReport()
@@ -219356,6 +219368,66 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+ public System.Nullable KeyWorkNum
+ {
+ get
+ {
+ return this._KeyWorkNum;
+ }
+ set
+ {
+ if ((this._KeyWorkNum != value))
+ {
+ this.OnKeyWorkNumChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkNum = value;
+ this.SendPropertyChanged("KeyWorkNum");
+ this.OnKeyWorkNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+ public System.Nullable KeyWorkOKNum
+ {
+ get
+ {
+ return this._KeyWorkOKNum;
+ }
+ set
+ {
+ if ((this._KeyWorkOKNum != value))
+ {
+ this.OnKeyWorkOKNumChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkOKNum = value;
+ this.SendPropertyChanged("KeyWorkOKNum");
+ this.OnKeyWorkOKNumChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+ public string KeyWorkOKRate
+ {
+ get
+ {
+ return this._KeyWorkOKRate;
+ }
+ set
+ {
+ if ((this._KeyWorkOKRate != value))
+ {
+ this.OnKeyWorkOKRateChanging(value);
+ this.SendPropertyChanging();
+ this._KeyWorkOKRate = value;
+ this.SendPropertyChanged("KeyWorkOKRate");
+ this.OnKeyWorkOKRateChanged();
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Information_MillionsMonthlyReport_Base_Unit", Storage="_Base_Unit", ThisKey="UnitId", OtherKey="UnitId", IsForeignKey=true)]
public Base_Unit Base_Unit
{
@@ -478823,6 +478895,12 @@ namespace Model
private string _HandleMan;
+ private System.Nullable _KeyWorkNum;
+
+ private System.Nullable _KeyWorkOKNum;
+
+ private string _KeyWorkOKRate;
+
private string _UserName;
public View_Information_MillionsMonthlyReport()
@@ -479117,6 +479195,54 @@ namespace Model
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkNum", DbType="Int")]
+ public System.Nullable KeyWorkNum
+ {
+ get
+ {
+ return this._KeyWorkNum;
+ }
+ set
+ {
+ if ((this._KeyWorkNum != value))
+ {
+ this._KeyWorkNum = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKNum", DbType="Int")]
+ public System.Nullable KeyWorkOKNum
+ {
+ get
+ {
+ return this._KeyWorkOKNum;
+ }
+ set
+ {
+ if ((this._KeyWorkOKNum != value))
+ {
+ this._KeyWorkOKNum = value;
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_KeyWorkOKRate", DbType="NVarChar(20)")]
+ public string KeyWorkOKRate
+ {
+ get
+ {
+ return this._KeyWorkOKRate;
+ }
+ set
+ {
+ if ((this._KeyWorkOKRate != value))
+ {
+ this._KeyWorkOKRate = value;
+ }
+ }
+ }
+
[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UserName", DbType="NVarChar(50)")]
public string UserName
{