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

SGGL/Model/APIItem/HSSE/CheckSpecialDetailItem.cs

@@ -201,7 +201,7 @@ namespace Model
         /// <summary>
         /// 整改期限
         /// </summary>
-        public DateTime? Rectification_Date { get; set; }
+        public string Rectification_Date { get; set; }
 
     }
 }

SGGL/Model/APIItem/HSSE/FlowOperateItem.cs

@@ -170,5 +170,11 @@ namespace Model
             get;
             set;
         }
+
+        public string AttachUrl
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/APIItem/HSSE/HSSELogItem.cs

@@ -0,0 +1,70 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model
+{
+    public class HSSELogItem
+    {
+        public string HSSELogId { get; set; }
+
+        public string ProjectId { get; set; }
+        public string CompileDate { get; set; }
+        public string CompileMan { get; set; }
+        public string Weather { get; set; }
+        public bool? IsVisible { get; set; }
+        public string CompileManName { get; set; }
+        public string WeatherName { get; set; }
+
+        public int? Num11 { get; set; }
+
+      
+
+        public string Contents12 { get; set; }
+        public string Contents13 { get; set; }
+        public string Contents21 { get; set; }
+
+        public int? Num21 { get; set; }
+        public string Contents22 { get; set; }
+
+        public int? Num22 { get; set; }
+        public string Contents23 { get; set; }
+        public int? Num23 { get; set; }
+        public string Contents24 { get; set; }
+        public int? Num24 { get; set; }
+        public string Contents210 { get; set; }
+        public int? Num210 { get; set; }
+        public int? Num211 { get; set; }
+        public string Contents31 { get; set; }
+        public int? Num31 { get; set; }
+        public string Contents32 { get; set; }
+        public int? Num32 { get; set; }
+        public string Contents41 { get; set; }
+        public string Contents42 { get; set; }
+
+        #region 添加修改时字段
+        public string Content1 { get; set; }
+        public string Content2 { get; set; }
+        public string Content3 { get; set; }
+        public string Content4 { get; set; }
+        public string Content5 { get; set; }
+        public string Content6 { get; set; }
+        public string Content7 { get; set; }
+        public string Content8 { get; set; }
+        public string Content9 { get; set; }
+        public string Content10 { get; set; }
+        public string Content11 { get; set; }
+        public string Content12 { get; set; }
+        public string Content13 { get; set; }
+        public string Content14 { get; set; }
+        public string Content15 { get; set; }
+        public string Content16 { get; set; }
+        public string Content17 { get; set; }
+        public string Content18 { get; set; }
+        public string Content19 { get; set; }
+        public string Content20 { get; set; }
+        #endregion
+    }
+}

SGGL/Model/APIItem/HSSE/LicenseDataItem.cs

@@ -277,7 +277,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 作业负责人名字（射线、夜间）
+        /// 作业负责人名字（射线、夜间、高处）
         /// </summary>
         public string WorkLeaderName
         {
@@ -285,7 +285,7 @@ namespace Model
             set;
         }
         /// <summary>
-        /// 作业负责人电话（射线、夜间）
+        /// 作业负责人电话（射线、夜间、高处）
         /// </summary>
         public string WorkLeaderTel
         {
@@ -389,5 +389,133 @@ namespace Model
             get;
             set;
         }
+
+        //新增
+        public string WorkAreaName
+        {
+            get;
+            set;
+        }
+        /// <summary>
+        /// 区域
+        /// </summary>
+        public string WorkAreaId
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 原因
+        /// </summary>
+        public string Reason
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 动火作业级别
+        /// </summary>
+        public string FireLevel
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 空间内介质描述
+        /// </summary>
+        public string LimitedDescribe
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 是否存在其它介质
+        /// </summary>
+        public bool? IsBoolOther
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 作业是否耗氧或产生其它有毒有害气体
+        /// </summary>
+        public bool? IsBoolHarmfulGas
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 氧含量测试结果
+        /// </summary>
+        public string TestResult
+        {
+            get;
+            set;
+        }
+
+        /// <summary>
+        /// 测试时间
+        /// </summary>
+        public string TestDate { get; set; }
+
+        /// <summary>
+        /// 测试人
+        /// </summary>
+        public string TestPerson { get; set; }
+
+        /// <summary>
+        /// 通风措施
+        /// </summary>
+        public string VenStep { get; set; }
+
+        /// <summary>
+        /// 作业点高度
+        /// </summary>
+        public string WorkHeight { get; set; }
+
+        /// <summary>
+        /// 高处作业级别
+        /// </summary>
+        public string HeightLevel { get; set; }
+
+        /// <summary>
+        /// 吊装高度
+        /// </summary>
+        public string LiftingHeight { get; set; }
+
+        /// <summary>
+        /// 起重工姓名
+        /// </summary>
+        public string QzgName { get; set; }
+
+        /// <summary>
+        /// 起重工电话
+        /// </summary>
+        public string QzgPhone { get; set; }
+
+        /// <summary>
+        /// 司机姓名
+        /// </summary>
+        public string SjName { get; set; }
+
+        /// <summary>
+        /// 司机电话
+        /// </summary>
+        public string SjPhone { get; set; }
+
+        /// <summary>
+        /// 申请人签名
+        /// </summary>
+        public string SignatureUrl
+        {
+            get;
+            set;
+        }
     }
 }

SGGL/Model/Model.csproj

@@ -94,6 +94,7 @@
     <Compile Include="APIItem\HJGL\NDETrustItem.cs" />
     <Compile Include="APIItem\HJGL\WeldJointItem.cs" />
     <Compile Include="APIItem\HSSE\HSEDiaryItem.cs" />
+    <Compile Include="APIItem\HSSE\HSSELogItem.cs" />
     <Compile Include="APIItem\HSSE\IncentiveNoticeItem.cs" />
     <Compile Include="APIItem\HSSE\LicenseDataItem.cs" />
     <Compile Include="APIItem\HSSE\LicenseItem.cs" />