Merge branch 'master' of https://gitee.com/frane-yang/SGGL_SeDin_New

SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs

@@ -373,5 +373,23 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 分部分项id
+        /// </summary>
+        public string WorkPackageId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 分部分项名称
+        /// </summary>
+        public string WorkPackageName
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/ConstructionLogCQMS.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class ConstructionLogCQMS
+    {
+        public string ConstructionLogId { get; set; }
+
+        public string CQMSTodaySummary { get; set; }
+
+        public string CQMSTodaySummaryRemark { get; set; }
+
+        public string CQMSTomorrowPlan { get; set; }
+
+        public string CQMSTomorrowPlanRemark { get; set; }
+    }
+}

SGGL/Model/ConstructionLogHSE.cs

@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class ConstructionLogHSE
+    {
+        public string ConstructionLogId { get; set; }
+
+        public string HSETodaySummary { get; set; }
+
+        public string HSETodaySummaryRemark { get; set; }
+
+        public string HSETomorrowPlan { get; set; }
+
+        public string HSETomorrowPlanRemark { get; set; }
+    }
+}

SGGL/Model/ConstructionLogMachineItem.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class ConstructionLogMachineItem
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ConstructionLogMachineId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ConstructionLogId { get; set; }
+        public string UnitWorkId { get; set; }
+        public string MachineId { get; set; }
+
+        public int Num0 { get; set; }
+        public int Num1 { get; set; }
+        public int Num2 { get; set; }
+        public int Num3 { get; set; }
+        public int Num4 { get; set; }
+        public int Num5 { get; set; }
+        public int Num6 { get; set; }
+        public int Num7 { get; set; }
+        public int Num8 { get; set; }
+        public int Num9 { get; set; }
+        public int Num10 { get; set; }
+        public int Num11 { get; set; }
+        public int Num12 { get; set; }
+        public int Num13 { get; set; }
+        public int Num14 { get; set; }
+        public int Num15 { get; set; }
+        public int Num16 { get; set; }
+        public int Num17 { get; set; }
+        public int Num18 { get; set; }
+        public int Num19 { get; set; }
+        public int Num20 { get; set; }
+    }
+}

SGGL/Model/ConstructionLogPersonItem.cs

@@ -0,0 +1,44 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class ConstructionLogPersonItem
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ConstructionLogPersonId { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public string ConstructionLogId { get; set; }
+        public string UnitWorkId { get; set; }
+        public string WorkPostId { get; set; }
+
+        public int Num0 { get; set; }
+        public int Num1 { get; set; }
+        public int Num2 { get; set; }
+        public int Num3 { get; set; }
+        public int Num4 { get; set; }
+        public int Num5 { get; set; }
+        public int Num6 { get; set; }
+        public int Num7 { get; set; }
+        public int Num8 { get; set; }
+        public int Num9 { get; set; }
+        public int Num10 { get; set; }
+        public int Num11 { get; set; }
+        public int Num12 { get; set; }
+        public int Num13 { get; set; }
+        public int Num14 { get; set; }
+        public int Num15 { get; set; }
+        public int Num16 { get; set; }
+        public int Num17 { get; set; }
+        public int Num18 { get; set; }
+        public int Num19 { get; set; }
+        public int Num20 { get; set; }
+    }
+}

SGGL/Model/Model.csproj

@@ -176,6 +176,10 @@
     <Compile Include="Chart\DataSourceChart.cs" />
     <Compile Include="Chart\DataSourcePoint.cs" />
     <Compile Include="Chart\DataSourceTeam.cs" />
+    <Compile Include="ConstructionLogCQMS.cs" />
+    <Compile Include="ConstructionLogHSE.cs" />
+    <Compile Include="ConstructionLogMachineItem.cs" />
+    <Compile Include="ConstructionLogPersonItem.cs" />
     <Compile Include="CQMS\CheckItem.cs" />
     <Compile Include="CQMS\DigDataCQMSDataCollectItem.cs" />
     <Compile Include="CQMS\FileCabinetItem.cs" />