Merge branch 'master' of http://47.104.102.122:3000/panhf/CNCEC_SUBQHSE_WUHUAN

SGGL/Model/APIItem/AnBang/PersonInput.cs

@@ -0,0 +1,134 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBnag
+{
+    public class PersonInput
+    {
+
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; } 
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string Name { get; set; }
+        /// <summary>
+        /// 性别 1 男 2 女
+        /// </summary>
+        public string Sex { get; set; }
+        /// <summary>
+        /// 出生日期
+        /// </summary>
+        public DateTime? BirthDay { get; set; }
+        /// <summary>
+        /// 地址
+        /// </summary>
+        public string Address { get; set; }
+        /// <summary>
+        ///   民族
+        /// </summary>
+        public string Nation { get; set; }
+        /// <summary>
+        /// 身份证号码
+        /// </summary>
+        public string IdentifyID { get; set; }
+        /// <summary>
+        /// 发证机关
+        /// </summary>
+        public string Police { get; set; }
+        /// <summary>
+        /// 有效期开始时间
+        /// </summary>
+        public string ValidPeriodStart { get; set; }
+        /// <summary>
+        /// 有效期结束时间
+        /// </summary>
+        public string ValidPeriodEnd { get; set; }
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Station { get; set; } 
+        /// <summary>
+        /// 电话
+        /// </summary>
+        public string Telephone { get; set; }
+        /// <summary>
+        /// Age
+        /// </summary>
+        public int? Age { get; set; }
+        /// <summary>
+        /// 工号
+        /// </summary>
+        public string JobNumber { get; set; }  
+        /// <summary>
+        /// 现住址
+        /// </summary>
+        public string NewAddress { get; set; } 
+        /// <summary>
+        /// 登记时间
+        /// </summary>
+        public DateTime? RegisterDate { get; set; } 
+        /// <summary>
+        /// 专业
+        /// </summary>
+        public string Category { get; set; }
+        /// <summary>
+        /// 专业等级
+        /// </summary>
+        public string CategoryLevel { get; set; }
+        /// <summary>
+        /// 入场时间
+        /// </summary>
+        public DateTime? EntranceDate { get; set; }
+        /// <summary>
+        /// 是否离场 1 离场 0 未离场
+        /// </summary>
+        public string IsOut { get; set; }
+        /// <summary>
+        /// 离场时间
+        /// </summary>
+        public DateTime? LeaveDate { get; set; }
+        /// <summary>
+        /// 是否黑名单 1 是 0 否
+        /// </summary>
+        public string IsBlackList { get; set; } 
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNumber { get; set; } 
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; }
+    }
+
+}

SGGL/Model/APIItem/AnBang/PersonTrainRecordInput.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBang
+{
+    public class PersonTrainRecordInput
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string IdentifyId { get; set; }
+        /// <summary>
+        /// 工种
+        /// </summary>
+        public string CategoryName { get; set; }
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public decimal? TotalScore { get; set; }
+        /// <summary>
+        /// 及格分
+        /// </summary>
+        public decimal? PassScore { get; set; }
+        /// <summary>
+        /// 成绩
+        /// </summary>
+        public decimal? Score { get; set; }
+        /// <summary>
+        /// 是否通过 0否 1是
+        /// </summary>
+        public string IsPass { get; set; }
+        /// <summary>
+        /// 考试批次号
+        /// </summary>
+        public string GroupNo { get; set; }
+        /// <summary>
+        /// 试卷编号
+        /// </summary>
+        public string ExamNo { get; set; }
+        /// <summary>
+        /// 考试次数
+        /// </summary>
+        public string ExamCount { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 答案
+        /// </summary>
+        public string Answers { get; set; }
+        /// <summary>
+        /// 培训记录名称
+        /// </summary>
+        public string RecordName { get; set; }
+        /// <summary>
+        /// 培训类型
+        /// </summary>
+        public string TrainType { get; set; }
+        /// <summary>
+        /// 出卷类型 0 使用原卷 1 重新出卷
+        /// </summary>
+        public string PaperMode { get; set; }
+        /// <summary>
+        /// 培训方式
+        /// </summary>
+        public string TrainMode { get; set; }
+        /// <summary>
+        /// 培训负责人
+        /// </summary>
+        public string TrainPrincipal { get; set; }
+        /// <summary>
+        /// 培训开始时间
+        /// </summary>
+        public DateTime? TrainStartDate { get; set; }
+        /// <summary>
+        /// 培训结束时间
+        /// </summary>
+        public DateTime? TrainEndDate { get; set; }
+        /// <summary>
+        /// 培训内容
+        /// </summary>
+        public string TrainContent { get; set; }
+        /// <summary>
+        /// 培训详细信息
+        /// </summary>
+        public string TrainDescript { get; set; } 
+    }
+
+}

SGGL/Model/APIItem/AnBang/TrainInput.cs

@@ -0,0 +1,112 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBnag 
+{
+    public class TrainInput
+    {
+        /// <summary>
+        /// 主键id
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目id
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 名称
+        /// </summary>
+        public string RecordName { get; set; }
+        /// <summary>
+        /// 培训类型
+        /// </summary>
+        public string TrainType { get; set; }
+        /// <summary>
+        /// 出卷类型 0 使用原卷 1 重新出卷
+        /// </summary>
+        public string PaperMode { get; set; }
+        /// <summary>
+        /// 培训方式
+        /// </summary>
+        public string TrainMode { get; set; }
+        /// <summary>
+        /// 培训负责人
+        /// </summary>
+        public string TrainPrincipal { get; set; }
+        /// <summary>
+        ///  培训开始时间
+        /// </summary>
+        public DateTime? TrainStartDate { get; set; }
+        /// <summary>
+        /// 培训结束时间
+        /// </summary>
+        public DateTime? TrainEndDate { get; set; }
+        /// <summary>
+        /// 培训内容
+        /// </summary>
+        public string TrainContent { get; set; }
+        /// <summary>
+        /// 培训详细信息
+        /// </summary>
+        public string TrainDescript { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 人员数量
+        /// </summary>
+        public int PersonCount { get; set; }
+        /// <summary>
+        /// 合格人数
+        /// </summary>
+        public int PassedCount { get; set; }
+        /// <summary>
+        /// 课程数量
+        /// </summary>
+        public int CourseCount { get; set; }
+        /// <summary>
+        /// 课程总时长
+        /// </summary>
+        public string CourseDuration { get; set; }
+        /// <summary>
+        /// 来源 0 项目 1 课程
+        /// </summary>
+        public string Source { get; set; }
+        /// <summary>
+        /// 备注说明
+        /// </summary>
+        public string Description { get; set; }
+        /// <summary>
+        /// 工具箱编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; } 
+        /// <summary>
+        /// 培训单位
+        /// </summary>
+        public string TrainDepart { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        /// 创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; }
+    }
+}

SGGL/Model/APIItem/AnBang/TrainPersonInput.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Model.AnBang
+{
+    public class TrainPersonInput
+    {
+        /// <summary>
+        /// 主键
+        /// </summary>
+        public string ID { get; set; }
+        /// <summary>
+        /// 项目ID
+        /// </summary>
+        public string ProjectId { get; set; }
+        /// <summary>
+        /// 姓名
+        /// </summary>
+        public string EmpName { get; set; }
+        /// <summary>
+        /// 身份证号
+        /// </summary>
+        public string IdentifyId { get; set; }
+        /// <summary>
+        /// 岗位
+        /// </summary>
+        public string Station { get; set; }
+        /// <summary>
+        /// 工种
+        /// </summary>
+        public string CategoryName { get; set; }  
+        /// <summary>
+        /// 所在单位
+        /// </summary>
+        public string DepartName { get; set; }
+        /// <summary>
+        /// 签到时间
+        /// </summary>
+        public DateTime? SignInDate { get; set; }
+        /// <summary>
+        /// 培训学时
+        /// </summary>
+        public string TrainPeriod { get; set; }
+        /// <summary>
+        /// 状态 0 正常 1 补签
+        /// </summary>
+        public string State { get; set; }
+        /// <summary>
+        /// 总分
+        /// </summary>
+        public decimal? TotalScore { get; set; }
+        /// <summary>
+        /// 及格分
+        /// </summary>
+        public decimal? PassScore { get; set; }
+        /// <summary>
+        /// 成绩
+        /// </summary>
+        public decimal? Score { get; set; }
+        /// <summary>
+        ///  是否合格 0 不合格 1 合格
+        /// </summary>
+        public string IsPass { get; set; }
+        /// <summary>
+        /// 考试批次号
+        /// </summary>
+        public string GroupNo { get; set; }
+        /// <summary>
+        /// 试卷编号
+        /// </summary>
+        public string ExamNo { get; set; }
+        /// <summary>
+        /// 考试次数
+        /// </summary>
+        public int? ExamCount { get; set; }
+        /// <summary>
+        /// 设备编号
+        /// </summary>
+        public string DeviceNo { get; set; } 
+        /// <summary>
+        /// 上传时间
+        /// </summary>
+        public DateTime? UploadTime { get; set; }
+        /// <summary>
+        /// 答案
+        /// </summary>
+        public string Answers { get; set; }
+        /// <summary>
+        /// 创建时间
+        /// </summary>
+        public DateTime? CreateDate { get; set; }
+        /// <summary>
+        ///     创建人
+        /// </summary>
+        public string CreateUser { get; set; }
+        /// <summary>
+        /// 操作时间
+        /// </summary>
+        public DateTime? OperDate { get; set; }
+        /// <summary>
+        /// 操作人
+        /// </summary>
+        public string OperUser { get; set; }
+    }
+
+}

SGGL/Model/APIItem/UnitItem.cs

@@ -23,9 +23,18 @@ namespace Model
         public string IsBuild { get; set; }
         public string EMail { get; set; }
         public string IsHide { get; set; }
-        public string IsBranch { get; set; }
+        public bool? IsBranch { get; set; }
         public string ShortUnitName { get; set; }
         public string DataSources { get; set; }
         public string FromUnitId { get; set; }
+        public string IsChina { get; set; }
+        public string CollCropCode { get; set; }
+
+        public string LinkName { get; set; }
+        public string IdcardType { get; set; }
+        public string IdcardNumber { get; set; }
+        public string CollCropStatus { get; set; }
+        public string LinkMobile { get; set; }
+        public string ProjectId { get; set; }
     }
 }

SGGL/Model/Model.csproj

@@ -27,10 +27,11 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;m</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <Prefer32Bit>false</Prefer32Bit>
+    <DocumentationFile>bin\Debug\Model.xml</DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -59,6 +60,10 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="APIItem\AnBang\PersonInput.cs" />
+    <Compile Include="APIItem\AnBang\PersonTrainRecordInput.cs" />
+    <Compile Include="APIItem\AnBang\TrainInput.cs" />
+    <Compile Include="APIItem\AnBang\TrainPersonInput.cs" />
     <Compile Include="APIItem\ArchitectureReport.cs" />
     <Compile Include="APIItem\ArchitectureReportItem.cs" />
     <Compile Include="APIItem\BaseInfoItem.cs" />