安全报表增加系统外工时统计

2026-01-26 17:34:39 +08:00
parent 7dff01059b
commit fd322d4c7f
25 changed files with 841 additions and 306 deletions
@@ -163,7 +163,7 @@
                                       UnitId = x.UnitId,
                                       Year = x.Year,
                                       Month = x.Month,
-                                       FillingMan = x.FillingMan+"|"+(x.KeyWorkNum??0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
+                                       FillingMan = x.FillingMan + "|" + (x.KeyWorkNum ?? 0).ToString() + "|" + (x.KeyWorkOKNum ?? 0).ToString() + "|" + (x.KeyWorkOKRate ?? ""),
                                       FillingDate = x.FillingDate,
                                       DutyPerson = x.DutyPerson,
                                       RecordableIncidentRate = x.RecordableIncidentRate,
@@ -203,6 +203,7 @@
                                           ContractorNum = x.ContractorNum,
                                           SumPersonNum = x.SumPersonNum,
                                           TotalWorkNum = x.TotalWorkNum,
+                                           OutSideUnitWorkNum = x.OutSideUnitWorkNum,
                                           SeriousInjuriesNum = x.SeriousInjuriesNum,
                                           SeriousInjuriesPersonNum = x.SeriousInjuriesPersonNum,
                                           SeriousInjuriesLossHour = x.SeriousInjuriesLossHour,
@@ -225,6 +226,8 @@
                                           FirstAidDressingsNum = x.FirstAidDressingsNum,
                                           AttemptedEventNum = x.AttemptedEventNum,
                                           LossDayNum = x.LossDayNum,
+                                           UnitId = x.UnitId,
+                                           ProjectId = x.ProjectId,
                                       };

                    //老接口Serveice
@@ -261,6 +264,7 @@
                return code;
            }
        }
+
        /// <summary>
        /// UpApiMillionsMonthlyReportApi调用
        /// </summary>
@@ -2535,6 +2539,12 @@
            [System.Runtime.Serialization.OptionalFieldAttribute()]
            private System.Nullable<int> MedicalTreatmentPersonNumField;

+            [System.Runtime.Serialization.OptionalFieldAttribute()]
+            private string UnitIdField;
+
+            [System.Runtime.Serialization.OptionalFieldAttribute()]
+            private string ProjectIdField;
+
            [System.Runtime.Serialization.OptionalFieldAttribute()]
            private string MillionsMonthlyReportIdField;

@@ -2598,6 +2608,9 @@
            [System.Runtime.Serialization.OptionalFieldAttribute()]
            private System.Nullable<decimal> TotalWorkNumField;

+            [System.Runtime.Serialization.OptionalFieldAttribute()]
+            private System.Nullable<decimal> OutSideUnitWorkNumField;
+
            [System.Runtime.Serialization.OptionalFieldAttribute()]
            private System.Nullable<int> TrafficNumField;

@@ -2784,6 +2797,40 @@
                }
            }

+            [System.Runtime.Serialization.DataMemberAttribute()]
+            public string UnitId
+            {
+                get
+                {
+                    return this.UnitIdField;
+                }
+                set
+                {
+                    if ((object.ReferenceEquals(this.UnitIdField, value) != true))
+                    {
+                        this.UnitIdField = value;
+                        this.RaisePropertyChanged("UnitId");
+                    }
+                }
+            }
+
+            [System.Runtime.Serialization.DataMemberAttribute()]
+            public string ProjectId
+            {
+                get
+                {
+                    return this.ProjectIdField;
+                }
+                set
+                {
+                    if ((object.ReferenceEquals(this.ProjectIdField, value) != true))
+                    {
+                        this.ProjectIdField = value;
+                        this.RaisePropertyChanged("ProjectId");
+                    }
+                }
+            }
+
            [System.Runtime.Serialization.DataMemberAttribute()]
            public string MillionsMonthlyReportId
            {
@@ -3141,6 +3188,23 @@
                }
            }

+            [System.Runtime.Serialization.DataMemberAttribute()]
+            public System.Nullable<decimal> OutSideUnitWorkNum
+            {
+                get
+                {
+                    return this.OutSideUnitWorkNumField;
+                }
+                set
+                {
+                    if ((this.OutSideUnitWorkNumField.Equals(value) != true))
+                    {
+                        this.OutSideUnitWorkNumField = value;
+                        this.RaisePropertyChanged("OutSideUnitWorkNum");
+                    }
+                }
+            }
+
            [System.Runtime.Serialization.DataMemberAttribute()]
            public System.Nullable<int> TrafficNum
            {