1

2026-01-24 15:01:27 +08:00
parent a5a8b130e5
commit eaec543bf7
24 changed files with 327 additions and 50 deletions
@@ -162,6 +162,9 @@
                                <f:RenderField Width="120px" ColumnID="TotalWorkNum" DataField="TotalWorkNum" FieldType="String"
                                    HeaderText="总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
                                </f:RenderField>
+                                <f:RenderField Width="120px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
+                               HeaderText="去除系统内单位的总工时数（万）" HeaderTextAlign="Center" TextAlign="Center">
+                </f:RenderField>
                                <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
                                    <Columns>
                                        <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
@@ -123,6 +123,7 @@ namespace FineUIPro.Web.ZHGL.Information
                yearTotalItem.ContractorNum = yearSumItems.Sum(x => x.ContractorNum ?? 0);
                yearTotalItem.SumPersonNum = yearSumItems.Sum(x => x.SumPersonNum ?? 0);
                yearTotalItem.TotalWorkNum = yearSumItems.Sum(x => x.TotalWorkNum ?? 0);
+                yearTotalItem.OutSideUnitWorkNum = yearSumItems.Sum(x => x.OutSideUnitWorkNum ?? 0);
                yearTotalItem.SeriousInjuriesNum = yearSumItems.Sum(x => x.SeriousInjuriesNum ?? 0);
                yearTotalItem.SeriousInjuriesPersonNum = yearSumItems.Sum(x => x.SeriousInjuriesPersonNum ?? 0);
                yearTotalItem.SeriousInjuriesLossHour = yearSumItems.Sum(x => x.SeriousInjuriesLossHour ?? 0);
@@ -12,6 +12,11 @@
            white-space: normal;
            word-break: break-all;
        }
+
+         .f-grid-colheader-text {
+            white-space: normal;
+            word-break: break-all;
+        }
    </style>
 </head>
 <body>
@@ -270,6 +275,16 @@
                                        </f:NumberBox>
                                    </Editor>
                                </f:RenderField>
+                                <f:RenderField Width="110px" ColumnID="OutSideUnitWorkNum" DataField="OutSideUnitWorkNum" FieldType="String"
+                                    HeaderText="去除系统内单位的总工时数(万)" HeaderTextAlign="Center">
+                                    <Editor>
+                                        <%-- <f:TextBox runat="server" ID="txtTotalWorkNum" Text='<%# Eval("TotalWorkNum")%>'>
+                                    </f:TextBox>--%>
+                                        <f:NumberBox ID="txtOutSideUnitWorkNum" NoDecimal="false" NoNegative="true" MinValue="0.00"
+                                            Text='<%# Eval("TotalWorkNum")%>' runat="server" DecimalPrecision="4">
+                                        </f:NumberBox>
+                                    </Editor>
+                                </f:RenderField>
                                <f:GroupField EnableLock="true" HeaderText="损失工时伤害事故" TextAlign="Center">
                                    <Columns>
                                        <f:GroupField EnableLock="true" HeaderText="死亡事故" TextAlign="Center">
@@ -464,7 +464,7 @@ namespace FineUIPro.Web.ZHGL.Information
        #region 增加本月明细
        private void GetItems(string millionsMonthlyReportId)
        {
-            decimal TotalWorkNumSum = 0;
+            decimal TotalWorkNumSum = 0, OutSideUnitWorkNumSum = 0;
            int PostPersonNumSum = 0, SnapPersonNumSum = 0, ContractorNumSum = 0, SumPersonNumSum = 0, SeriousInjuriesNumSum = 0, SeriousInjuriesPersonNumSum = 0, SeriousInjuriesLossHourSum = 0, MinorAccidentNumSum = 0,
                           MinorAccidentPersonNumSum = 0, MinorAccidentLossHourSum = 0, DeathAccidentNumSum = 0, DeathAccidentPersonNumSum = 0, DeathAccidentLossHourSum = 0, RestrictedWorkPersonNumSum = 0, RestrictedWorkLossHourSum = 0, MedicalTreatmentPersonNumSum = 0, MedicalTreatmentLossHourSum = 0,
                           FireNumSum = 0, EnvironmenNumSum = 0, TrafficNumSum = 0, EquipmentNumSum = 0, QualityNumSum = 0, OtherNumSum = 0, FirstAidDressingsNumSum = 0, AttemptedEventNumSum = 0, LossDayNumSum = 0;
@@ -535,6 +535,15 @@ namespace FineUIPro.Web.ZHGL.Information
                {
                    item.TotalWorkNum = 0;
                }
+                if (!string.IsNullOrEmpty(values["OutSideUnitWorkNum"].ToString()))
+                {
+                    item.OutSideUnitWorkNum = values.Value<decimal>("OutSideUnitWorkNum");
+                    OutSideUnitWorkNumSum += values.Value<decimal>("OutSideUnitWorkNum");
+                }
+                else
+                {
+                    item.OutSideUnitWorkNum = 0;
+                }
                if (!string.IsNullOrEmpty(values["SeriousInjuriesNum"].ToString()))
                {
                    item.SeriousInjuriesNum = values.Value<int>("SeriousInjuriesNum");
@@ -741,6 +750,7 @@ namespace FineUIPro.Web.ZHGL.Information
                ContractorNum = ContractorNumSum,
                SumPersonNum = SumPersonNumSum,
                TotalWorkNum = TotalWorkNumSum,
+                OutSideUnitWorkNum = OutSideUnitWorkNumSum,
                SeriousInjuriesNum = SeriousInjuriesNumSum,
                SeriousInjuriesPersonNum = SeriousInjuriesPersonNumSum,
                SeriousInjuriesLossHour = SeriousInjuriesLossHourSum,
@@ -917,6 +927,7 @@ namespace FineUIPro.Web.ZHGL.Information
                ContractorNum = 0,
                SumPersonNum = 0,
                TotalWorkNum = 0,
+                OutSideUnitWorkNum = 0,
                SeriousInjuriesNum = 0,
                SeriousInjuriesPersonNum = 0,
                SeriousInjuriesLossHour = 0,
@@ -953,6 +964,7 @@ namespace FineUIPro.Web.ZHGL.Information
                ContractorNum = 0,
                SumPersonNum = 0,
                TotalWorkNum = 0,
+                OutSideUnitWorkNum = 0,
                SeriousInjuriesNum = 0,
                SeriousInjuriesPersonNum = 0,
                SeriousInjuriesLossHour = 0,
@@ -981,6 +993,7 @@ namespace FineUIPro.Web.ZHGL.Information

            var projects = BLL.ProjectService.GetProjectWorkList();
            int i = 20;
+            List<Model.InformationProject_MillionsMonthlyReport> millionsMonthlyReports = (from x in Funs.DB.InformationProject_MillionsMonthlyReport where x.Year.ToString() == year && x.Month.ToString() == months && x.States == BLL.Const.State_2 select x).ToList();
            foreach (var p in projects)
            {
                i += 10;
@@ -1018,7 +1031,15 @@ namespace FineUIPro.Web.ZHGL.Information
                {
                    item.TotalWorkNum = Math.Round(getInfo.MonthWorkTime / 10000 ?? 0, 4);
                }
-
+                Model.InformationProject_MillionsMonthlyReport report = millionsMonthlyReports.FirstOrDefault(x => x.ProjectId == p.ProjectId);
+                if (report != null)
+                {
+                    item.OutSideUnitWorkNum = report.OutSideUnitWorkNum;
+                }
+                else
+                {
+                    item.OutSideUnitWorkNum = item.TotalWorkNum;
+                }
                item.SeriousInjuriesNum = 0;
                item.SeriousInjuriesPersonNum = 0;
                item.SeriousInjuriesLossHour = 0;
@@ -1176,6 +1197,7 @@ namespace FineUIPro.Web.ZHGL.Information
                                    ContractorNum = item.ContractorNum,
                                    SumPersonNum = item.SumPersonNum,
                                    TotalWorkNum = item.TotalWorkNum,
+                                    OutSideUnitWorkNum = item.OutSideUnitWorkNum,
                                    SeriousInjuriesNum = item.SeriousInjuriesNum,
                                    SeriousInjuriesPersonNum = item.SeriousInjuriesPersonNum,
                                    SeriousInjuriesLossHour = item.SeriousInjuriesLossHour,
@@ -489,6 +489,15 @@ namespace FineUIPro.Web.ZHGL.Information {
        /// </remarks>
        protected global::FineUIPro.NumberBox txtTotalWorkNum;
        
+        /// <summary>
+        /// txtOutSideUnitWorkNum 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.NumberBox txtOutSideUnitWorkNum;
+        
        /// <summary>
        /// txtDeathAccidentNum 控件。
        /// </summary>