1

SGGL/Model/APIItem/DropDownItem.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 DropDownItem
+    {
+        public string Text { get; set; }
+
+        public string Values { get; set; }
+
+        public string Counts { get; set; }
+
+        public string Mtype { get; set; }
+
+        public string Ttype { get; set; }
+    }
+}

SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs

@@ -124,7 +124,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 隐患类别
+        /// 隐患级别
         /// </summary>
         public string HiddenHazardType
         {
@@ -132,7 +132,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 隐患类别名称
+        /// 隐患级别名称
         /// </summary>
         public string HiddenHazardTypeName
         {
@@ -207,5 +207,15 @@ namespace Model
         /// 处理意见
         /// </summary>
         public string CheckOpinions { get; set; }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
+        
     }
 }

SGGL/Model/APIItem/HSSE/HazardRegisterItem.cs

@@ -361,12 +361,21 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 风险等级
+        /// 隐患级别
         /// </summary>
         public string Risk_Level
         {
             get;
             set;
         }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/APIItem/HSSE/RectifyNoticesItemItem.cs

@@ -82,5 +82,23 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 隐患级别
+        /// </summary>
+        public string HiddenType
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 隐患类型
+        /// </summary>
+        public string HiddenHazardType
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/APIItem/ProjectItem.cs

@@ -95,5 +95,14 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 是否海外项目
+        /// </summary>
+        public bool IsForeign
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/CQMS/UnitWork.cs

@@ -0,0 +1,59 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    /// <summary>
+    /// 单位工程
+    /// </summary>
+   public class UnitWork
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string UnitWorkId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 单位工程编号
+        /// </summary>
+        public string SupUnitWorkCode
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 单位工程名称
+        /// </summary>
+        public string SupUnitWorkName
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 子单位工程编号
+        /// </summary>
+        public string UnitWorkCode
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 子单位工程名称
+        /// </summary>
+        public string UnitWorkName
+        {
+            get;
+            set;
+        }
+    }
+}

SGGL/Model/HSSE/MonthReportCHSEDay.cs

@@ -81,5 +81,15 @@ namespace Model
             get;
             set;
         }
+
+        /// <summary>
+        /// 年度累计安全人工时
+        /// </summary>
+        public int TotalHseManhoursYear
+        {
+            get;
+            set;
+        }
+        
     }
 }

SGGL/Model/Model.csproj

@@ -74,6 +74,7 @@
     <Compile Include="APIItem\CNCEC\UpCheckReportItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItemItem.cs" />
     <Compile Include="APIItem\CNCEC\UpCheckReportItemItem2.cs" />
+    <Compile Include="APIItem\DropDownItem.cs" />
     <Compile Include="APIItem\EnergyReport.cs" />
     <Compile Include="APIItem\EnergyReportItem.cs" />
     <Compile Include="APIItem\EPSummaryReport.cs" />
@@ -189,6 +190,7 @@
     <Compile Include="CQMS\PassWelderStatisc.cs" />
     <Compile Include="CQMS\QualityAcceptanceItem.cs" />
     <Compile Include="CQMS\SteelItem.cs" />
+    <Compile Include="CQMS\UnitWork.cs" />
     <Compile Include="CQMS\WelderItem.cs" />
     <Compile Include="DoorServer\AbsenceDutyItem.cs" />
     <Compile Include="DoorServer\attendanceItem.cs" />