zhanghj/ChengDa_English
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

合并最新

Browse Source
This commit is contained in:
李超
2022-12-20 09:32:32 +08:00
parent 844e9f1488
commit 1abdaa9476
654 changed files with 73563 additions and 9746 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SGGL/Model/APIItem/HSSE/PersonItem.cs
+46 -6
View File
@@ -30,12 +30,16 @@ namespace Model
/// <summary>
/// 身份证号码
/// </summary>
public string IdentityCard { get; set; }
public string IdentityCard { get; set; }
/// <summary>
/// 地址
/// </summary>
public string Address { get; set; }
/// <summary>
/// 生日
/// </summary>
public DateTime? Birthday { get; set; }
/// <summary>
/// 项目id
/// </summary>
public string ProjectId { get; set; }
@@ -48,6 +52,10 @@ namespace Model
/// </summary>
public string ProjectName { get; set; }
/// <summary>
/// 单位 统一社会信用代码
/// </summary>
public string CollCropCode { get; set; }
/// <summary>
/// 单位ID
/// </summary>
public string UnitId { get; set; }
@@ -66,7 +74,7 @@ namespace Model
/// <summary>
/// 班组名称
/// </summary>
public string TeamGroupName { get; set; }
public string TeamGroupName { get; set; }
/// <summary>
/// 岗位ID
/// </summary>
@@ -76,6 +84,14 @@ namespace Model
/// </summary>
public string WorkPostName { get; set; }
/// <summary>
/// 部门ID
/// </summary>
public string DepartId { get; set; }
/// <summary>
/// 部门名称
/// </summary>
public string DepartName { get; set; }
/// <summary>
/// 入场时间
/// </summary>
public string InTime { get; set; }
@@ -90,15 +106,15 @@ namespace Model
/// <summary>
/// 电话
/// </summary>
public string Telephone { get; set; }
public string Telephone { get; set; }
/// <summary>
/// 照片路径
/// </summary>
public string PhotoUrl { get; set; }
public string PhotoUrl { get; set; }
/// <summary>
/// 部门名称
/// 照片二进制
/// </summary>
public string DepartName { get; set; }
public string headImage { get; set; }
/// <summary>
/// 是否启用
/// </summary>
@@ -384,5 +400,29 @@ namespace Model
get;
set;
}
/// <summary>
/// 培训类型-查询
/// </summary>
public string TrainTypeId
{
get;
set;
}
/// <summary>
/// 查询-查询字符串
/// </summary>
public string strParam
{
get;
set;
}
/// <summary>
/// 培训类型-查询
/// </summary>
public int PageIndex
{
get;
set;
} = 0;
}
}
SGGL/Model/APIItem/HSSE/TestPlanItem.cs
+18
View File
@@ -179,6 +179,24 @@ namespace Model
get;
set;
}
/// <summary>
/// 考试部门ID
/// </summary>
public string DepartIds
{
get;
set;
}
/// <summary>
/// 考试部门名称
/// </summary>
public string DepartNames
{
get;
set;
}
/// <summary>
/// 考试二维码
/// </summary>
SGGL/Model/APIItem/HSSE/TrainingPlanItem.cs
+16
View File
@@ -161,6 +161,22 @@ namespace Model
set;
}
/// <summary>
/// 培训部门ID
/// </summary>
public string DepartIds
{
get;
set;
}
/// <summary>
/// 培训部门
/// </summary>
public string DepartNames
{
get;
set;
}
/// <summary>
/// 培训岗位ID
/// </summary>
public string WorkPostId
SGGL/Model/DoorServer/InOutListItem.cs
+135
View File
@@ -0,0 +1,135 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
/// <summary>
/// 出入记录
/// </summary>
public class InOutListItem
{
///// <summary>
///// ID
///// </summary>
//public Double RowNumber
//{
// get;
// set;
//}
/// <summary>
/// NEWID
/// </summary>
public string NewID
{
get;
set;
}
/// <summary>
/// ProjectId
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// EmployName
/// </summary>
public string EmployName
{
get;
set;
}
/// <summary>
/// DepartmentID
/// </summary>
public string DepartmentID
{
get;
set;
}
/// <summary>
/// DepartName
/// </summary>
public string DepartName
{
get;
set;
}
/// <summary>
/// AreaID
/// </summary>
public string AreaID
{
get;
set;
}
/// <summary>
/// AreaName
/// </summary>
public string AreaName
{
get;
set;
}
/// <summary>
/// EmployNO
/// </summary>
public string EmployNO
{
get;
set;
}
/// <summary>
/// CardID
/// </summary>
public string CardID
{
get;
set;
}
/// <summary>
/// DateTimeRecord
/// </summary>
public DateTime? DateTimeRecord
{
get;
set;
}
/// <summary>
/// RecordDes
/// </summary>
public string RecordDes
{
get;
set;
}
/// <summary>
/// InOrOut
/// </summary>
public string InOrOut
{
get;
set;
}
/// <summary>
/// UnitId
/// </summary>
public string UnitId
{
get;
set;
}
/// <summary>
/// TeamGroupId
/// </summary>
public string TeamGroupId
{
get;
set;
}
}
}
SGGL/Model/DoorServer/InOutstatisticsItem.cs
+8
View File
@@ -38,6 +38,14 @@ namespace Model
/// <summary>
/// 单位名称
/// </summary>
public string AllUnitName
{
get;
set;
}
/// <summary>
/// 单位名称
/// </summary>
public string UnitName
{
get;
SGGL/Model/DoorServer/attendanceItem.cs
+94
View File
@@ -0,0 +1,94 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
/// <summary>
/// 项目出入记录-潮州华赢
/// </summary>
public class attendanceItem
{
/// <summary>
/// ID
/// </summary>
public string ProjectId
{
get;
set;
}
/// <summary>
/// ID
/// </summary>
public string ProjectCode
{
get;
set;
}
/// <summary>
/// 设备序列号
/// </summary>
public string deviceSn
{
get;
set;
}
/// <summary>
/// 工人姓名
/// </summary>
public string personName
{
get;
set;
}
/// <summary>
/// 证件号码
/// </summary>
public string idCardNumber
{
get;
set;
}
/// <summary>
/// 性别
/// </summary>
public string gender
{
get;
set;
}
/// <summary>
/// 考勤时间
/// </summary>
public string attendanceTime
{
get;
set;
}
/// <summary>
/// 打卡类型(0:无效,1:进门,2出门)
/// </summary>
public int attendanceType
{
get;
set;
}
/// <summary>
/// 考勤照片
/// </summary>
public string attendanceImage
{
get;
set;
}
/// <summary>
/// 现场人员可见光照片
/// </summary>
public string headImage
{
get;
set;
}
}
}
SGGL/Model/DoorServer/attendanceItems.cs
+22
View File
@@ -0,0 +1,22 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
namespace Model
{
/// <summary>
/// 项目出入记录集合
/// </summary>
public class attendanceItems
{
/// <summary>
/// ID
/// </summary>
public List<attendanceItem> records
{
get;
set;
}
}
}
SGGL/Model/Model.cs
+3416 -2196
View File
File diff suppressed because it is too large Load Diff
SGGL/Model/Model.csproj
+3
View File
@@ -166,6 +166,9 @@
<Compile Include="CQMS\SteelItem.cs" />
<Compile Include="CQMS\WelderItem.cs" />
<Compile Include="DoorServer\AbsenceDutyItem.cs" />
<Compile Include="DoorServer\attendanceItem.cs" />
<Compile Include="DoorServer\attendanceItems.cs" />
<Compile Include="DoorServer\InOutListItem.cs" />
<Compile Include="DoorServer\t_d_departmentItem.cs" />
<Compile Include="DoorServer\t_d_employinfoItem.cs" />
<Compile Include="DoorServer\InOutstatisticsItem.cs" />
SGGL/Model/ModelProc.cs
+13
View File
@@ -22,6 +22,19 @@ namespace Model
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
/// <summary>
/// 获取当前用户在移动端待办事项
/// </summary>
/// <param name="unitcode"></param>
/// <param name="isono"></param>
/// <returns></returns>
[Function(Name = "[dbo].[Sp_APP_GetCQMSToDoItems]")]
public IEnumerable<ToDoItem> Sp_APP_GetCQMSToDoItems([Parameter(DbType = "nvarchar(50)")] string projectId, [Parameter(DbType = "nvarchar(50)")] string userId)
{
IExecuteResult result = this.ExecuteMethodCall(this, ((MethodInfo)MethodInfo.GetCurrentMethod()), projectId, userId);
return (ISingleResult<ToDoItem>)result.ReturnValue;
}
/// <summary>
/// 获取当前用户在本部待办事项
/// </summary>