wyw/mh_jy_safe
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://121.41.2.71:3000/wyw/mh_jy_safe

Browse Source
This commit is contained in:
wyw 2026-04-27 09:05:17 +08:00
commit 62f93d3ed6
25 changed files with 146725 additions and 143968 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
APT.MicroApi/APT.BD.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.BD.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.BD; using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护 #region Hmi-HMI资源表维护
/// <summary> /// <summary>
/// HMI资源表维护 /// HMI资源表维护
@ -131,9 +138,11 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Picture-图片资源 #region Picture-图片资源
/// <summary> /// <summary>
/// 图片资源 /// 图片资源
@ -242,9 +251,11 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PictureFile-资源图片文件 #region PictureFile-资源图片文件
/// <summary> /// <summary>
/// 资源图片文件 /// 资源图片文件
@ -353,9 +364,11 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Place-区域表 #region Place-区域表
/// <summary> /// <summary>
/// 区域表 /// 区域表
@ -463,6 +476,7 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -474,9 +488,11 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region ServerInfo-服务器信息表 #region ServerInfo-服务器信息表
/// <summary> /// <summary>
/// 服务器信息表 /// 服务器信息表
@ -585,9 +601,11 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SystemInfo-系统信息表 #region SystemInfo-系统信息表
/// <summary> /// <summary>
/// 系统信息表 /// 系统信息表
@ -696,9 +714,11 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region WordTemplate-WORD模板维护 #region WordTemplate-WORD模板维护
/// <summary> /// <summary>
/// WORD模板维护 /// WORD模板维护
@ -807,6 +827,8 @@ namespace APT.BD.WebApi.Controllers.Api
} }
} }
#endregion #endregion
} }

130
APT.MicroApi/APT.BS.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表 #region CheckContent-检查内容表
/// <summary> /// <summary>
/// 检查内容表 /// 检查内容表
@ -131,9 +138,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContents-检查内容 #region CheckContents-检查内容
/// <summary> /// <summary>
/// 检查内容 /// 检查内容
@ -242,9 +251,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContentCheckType-检查类型 #region CheckContentCheckType-检查类型
/// <summary> /// <summary>
/// 检查类型 /// 检查类型
@ -353,9 +364,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级) #region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary> /// <summary>
/// 检查内容检查类型子表(关联层级) /// 检查内容检查类型子表(关联层级)
@ -464,9 +477,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContentHmRiskArea-检查区域 #region CheckContentHmRiskArea-检查区域
/// <summary> /// <summary>
/// 检查区域 /// 检查区域
@ -575,9 +590,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckMain-安全检查库 #region CheckMain-安全检查库
/// <summary> /// <summary>
/// 安全检查库 /// 安全检查库
@ -686,9 +703,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContentMainDepartment-安全检查库责任部门 #region CheckContentMainDepartment-安全检查库责任部门
/// <summary> /// <summary>
/// 安全检查库责任部门 /// 安全检查库责任部门
@ -797,9 +816,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckContentQuestion-检查问题 #region CheckContentQuestion-检查问题
/// <summary> /// <summary>
/// 检查问题 /// 检查问题
@ -908,9 +929,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckMainLaw-检查库法规 #region CheckMainLaw-检查库法规
/// <summary> /// <summary>
/// 检查库法规 /// 检查库法规
@ -1019,9 +1042,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckProject-检查项目 #region CheckProject-检查项目
/// <summary> /// <summary>
/// 检查项目 /// 检查项目
@ -1130,9 +1155,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckProjectCategory-检查项目分类表 #region CheckProjectCategory-检查项目分类表
/// <summary> /// <summary>
/// 检查项目分类表 /// 检查项目分类表
@ -1241,9 +1268,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型 #region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary> /// <summary>
/// 检查项目分类_检查类型 /// 检查项目分类_检查类型
@ -1352,9 +1381,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域 #region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary> /// <summary>
/// 检查项目分类_检查区域 /// 检查项目分类_检查区域
@ -1463,9 +1494,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckProjectProjectCategory-检查项目分类 #region CheckProjectProjectCategory-检查项目分类
/// <summary> /// <summary>
/// 检查项目分类 /// 检查项目分类
@ -1574,9 +1607,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckQuestion-检查问题 #region CheckQuestion-检查问题
/// <summary> /// <summary>
/// 检查问题 /// 检查问题
@ -1685,9 +1720,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckType-检查类型表 #region CheckType-检查类型表
/// <summary> /// <summary>
/// 检查类型表 /// 检查类型表
@ -1794,6 +1831,7 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -1806,9 +1844,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckTypeLevel-检查层级 #region CheckTypeLevel-检查层级
/// <summary> /// <summary>
/// 检查层级 /// 检查层级
@ -1917,9 +1957,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CheckTypeMinetype-检查类型生产单元 #region CheckTypeMinetype-检查类型生产单元
/// <summary> /// <summary>
/// 检查类型生产单元 /// 检查类型生产单元
@ -2028,9 +2070,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region DepartmentAreaobject-部门范围 #region DepartmentAreaobject-部门范围
/// <summary> /// <summary>
/// 部门范围 /// 部门范围
@ -2139,9 +2183,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region OperateLog-操作日志 #region OperateLog-操作日志
/// <summary> /// <summary>
/// 操作日志 /// 操作日志
@ -2250,9 +2296,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PlanSet-制定任务 #region PlanSet-制定任务
/// <summary> /// <summary>
/// 制定任务 /// 制定任务
@ -2361,9 +2409,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PlanSetArea-制定任务区域 #region PlanSetArea-制定任务区域
/// <summary> /// <summary>
/// 制定任务区域 /// 制定任务区域
@ -2472,9 +2522,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PlanSetDepartmentOut-制定任务排除组织 #region PlanSetDepartmentOut-制定任务排除组织
/// <summary> /// <summary>
/// 制定任务排除组织 /// 制定任务排除组织
@ -2583,9 +2635,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PlanSetDepObject-制定任务部门触发范围 #region PlanSetDepObject-制定任务部门触发范围
/// <summary> /// <summary>
/// 制定任务部门触发范围 /// 制定任务部门触发范围
@ -2694,9 +2748,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PlanSetObject-制定任务触发范围 #region PlanSetObject-制定任务触发范围
/// <summary> /// <summary>
/// 制定任务触发范围 /// 制定任务触发范围
@ -2805,9 +2861,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskCategory-隐患类别 #region RiskCategory-隐患类别
/// <summary> /// <summary>
/// 隐患类别 /// 隐患类别
@ -2916,9 +2974,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数 #region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary> /// <summary>
/// 隐患等级最长延期整改天数 /// 隐患等级最长延期整改天数
@ -3027,9 +3087,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskReason-隐患原因表 #region RiskReason-隐患原因表
/// <summary> /// <summary>
/// 隐患原因表 /// 隐患原因表
@ -3138,9 +3200,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmit-隐患上报表 #region RiskSubmit-隐患上报表
/// <summary> /// <summary>
/// 隐患上报表 /// 隐患上报表
@ -3249,9 +3313,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContent-隐患上报明细 #region RiskSubmitContent-隐患上报明细
/// <summary> /// <summary>
/// 隐患上报明细 /// 隐患上报明细
@ -3360,9 +3426,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentBack-隐患上报明细退回 #region RiskSubmitContentBack-隐患上报明细退回
/// <summary> /// <summary>
/// 隐患上报明细退回 /// 隐患上报明细退回
@ -3471,9 +3539,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentDeal-隐患整改记录 #region RiskSubmitContentDeal-隐患整改记录
/// <summary> /// <summary>
/// 隐患整改记录 /// 隐患整改记录
@ -3582,9 +3652,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表 #region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -3693,9 +3765,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentDealFile-检查任务附件表 #region RiskSubmitContentDealFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -3804,9 +3878,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名 #region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary> /// <summary>
/// 隐患整改验收人签名 /// 隐患整改验收人签名
@ -3915,9 +3991,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名 #region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary> /// <summary>
/// 隐患整改责任人签名 /// 隐患整改责任人签名
@ -4026,9 +4104,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentFile-检查任务明细附件表 #region RiskSubmitContentFile-检查任务明细附件表
/// <summary> /// <summary>
/// 检查任务明细附件表 /// 检查任务明细附件表
@ -4137,9 +4217,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentReason-隐患上报明细原因 #region RiskSubmitContentReason-隐患上报明细原因
/// <summary> /// <summary>
/// 隐患上报明细原因 /// 隐患上报明细原因
@ -4248,9 +4330,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitContentTemp-隐患上报详情待入库 #region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary> /// <summary>
/// 隐患上报详情待入库 /// 隐患上报详情待入库
@ -4359,9 +4443,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitDelayApply-延期整改申请 #region RiskSubmitDelayApply-延期整改申请
/// <summary> /// <summary>
/// 延期整改申请 /// 延期整改申请
@ -4470,9 +4556,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情 #region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary> /// <summary>
/// 延期整改申请详情 /// 延期整改申请详情
@ -4581,9 +4669,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitFile-检查任务附件表 #region RiskSubmitFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -4692,9 +4782,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitNotice-隐患通知 #region RiskSubmitNotice-隐患通知
/// <summary> /// <summary>
/// 隐患通知 /// 隐患通知
@ -4803,9 +4895,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskSubmitNoticePerson-隐患通知 #region RiskSubmitNoticePerson-隐患通知
/// <summary> /// <summary>
/// 隐患通知 /// 隐患通知
@ -4914,9 +5008,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RiskTpm-TPM对接数据 #region RiskTpm-TPM对接数据
/// <summary> /// <summary>
/// TPM对接数据 /// TPM对接数据
@ -5025,9 +5121,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheck-安全检查 #region SafeCheck-安全检查
/// <summary> /// <summary>
/// 安全检查 /// 安全检查
@ -5136,9 +5234,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetail-检查明细 #region SafeCheckDetail-检查明细
/// <summary> /// <summary>
/// 检查明细 /// 检查明细
@ -5247,9 +5347,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailFile-检查任务明细附件表 #region SafeCheckDetailFile-检查任务明细附件表
/// <summary> /// <summary>
/// 检查任务明细附件表 /// 检查任务明细附件表
@ -5358,9 +5460,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailLaw-检查依据 #region SafeCheckDetailLaw-检查依据
/// <summary> /// <summary>
/// 检查依据 /// 检查依据
@ -5469,9 +5573,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailQuestion-检查明细问题 #region SafeCheckDetailQuestion-检查明细问题
/// <summary> /// <summary>
/// 检查明细问题 /// 检查明细问题
@ -5580,9 +5686,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailReason-检查明细隐患原因 #region SafeCheckDetailReason-检查明细隐患原因
/// <summary> /// <summary>
/// 检查明细隐患原因 /// 检查明细隐患原因
@ -5691,9 +5799,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailReject-检查明细退回 #region SafeCheckDetailReject-检查明细退回
/// <summary> /// <summary>
/// 检查明细退回 /// 检查明细退回
@ -5802,9 +5912,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailRejectFile-检查明细退回附件 #region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary> /// <summary>
/// 检查明细退回附件 /// 检查明细退回附件
@ -5913,9 +6025,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckDetailUser-检查明细人员 #region SafeCheckDetailUser-检查明细人员
/// <summary> /// <summary>
/// 检查明细人员 /// 检查明细人员
@ -6024,9 +6138,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckFile-安全检查文件 #region SafeCheckFile-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6135,9 +6251,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckProject-安全检查文件 #region SafeCheckProject-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6246,9 +6364,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckProjectCategory-安全检查文件 #region SafeCheckProjectCategory-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6357,9 +6477,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckRecord-检查记录确认 #region SafeCheckRecord-检查记录确认
/// <summary> /// <summary>
/// 检查记录确认 /// 检查记录确认
@ -6468,9 +6590,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckRecordDetail-检查记录确认明细 #region SafeCheckRecordDetail-检查记录确认明细
/// <summary> /// <summary>
/// 检查记录确认明细 /// 检查记录确认明细
@ -6579,9 +6703,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckRiskArea-检查区域 #region SafeCheckRiskArea-检查区域
/// <summary> /// <summary>
/// 检查区域 /// 检查区域
@ -6690,9 +6816,11 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region SafeCheckUsersign-检查签名 #region SafeCheckUsersign-检查签名
/// <summary> /// <summary>
/// 检查签名 /// 检查签名
@ -6801,6 +6929,8 @@ namespace APT.BS.WebApi.Controllers.Api
} }
} }
#endregion #endregion
} }

115
APT.MicroApi/APT.FM.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -24,6 +30,7 @@ namespace APT.FM.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
#region Api-API #region Api-API
/// <summary> /// <summary>
/// API /// API
@ -132,9 +139,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region BaseAdd-企业位置信息 #region BaseAdd-企业位置信息
/// <summary> /// <summary>
/// 企业位置信息 /// 企业位置信息
@ -243,9 +252,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region BaseEnergy-企业能耗配置信息 #region BaseEnergy-企业能耗配置信息
/// <summary> /// <summary>
/// 企业能耗配置信息 /// 企业能耗配置信息
@ -354,9 +365,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region BaseInfo-企业基本信息 #region BaseInfo-企业基本信息
/// <summary> /// <summary>
/// 企业基本信息 /// 企业基本信息
@ -465,9 +478,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentCalendarConfig-部门日历配置表 #region DepartmentCalendarConfig-部门日历配置表
/// <summary> /// <summary>
/// 部门日历配置表 /// 部门日历配置表
@ -576,9 +591,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表 #region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary> /// <summary>
/// 部门日历配置明细表 /// 部门日历配置明细表
@ -687,9 +704,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表 #region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary> /// <summary>
/// 部门日历配置班组表 /// 部门日历配置班组表
@ -798,9 +817,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentCompletion-XX班完成情况统计 #region DepartmentCompletion-XX班完成情况统计
/// <summary> /// <summary>
/// XX班完成情况统计 /// XX班完成情况统计
@ -909,9 +930,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentCompletionSort-班组完成情况前十 #region DepartmentCompletionSort-班组完成情况前十
/// <summary> /// <summary>
/// 班组完成情况前十 /// 班组完成情况前十
@ -1020,9 +1043,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentPost-部门岗位 #region DepartmentPost-部门岗位
/// <summary> /// <summary>
/// 部门岗位 /// 部门岗位
@ -1131,9 +1156,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentPostUser-部门岗位人员 #region DepartmentPostUser-部门岗位人员
/// <summary> /// <summary>
/// 部门岗位人员 /// 部门岗位人员
@ -1242,9 +1269,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentProductionUnit-生产单元 #region DepartmentProductionUnit-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -1353,9 +1382,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentSafeuser-安全员表 #region DepartmentSafeuser-安全员表
/// <summary> /// <summary>
/// 安全员表 /// 安全员表
@ -1464,9 +1495,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentScheduling-部门排班表 #region DepartmentScheduling-部门排班表
/// <summary> /// <summary>
/// 部门排班表 /// 部门排班表
@ -1575,9 +1608,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentSchedulingDetail-排班信息人员明细表 #region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary> /// <summary>
/// 排班信息人员明细表 /// 排班信息人员明细表
@ -1686,9 +1721,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region DepartmentUser-部门人员表 #region DepartmentUser-部门人员表
/// <summary> /// <summary>
/// 部门人员表 /// 部门人员表
@ -1797,9 +1834,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Enum-枚举管理 #region Enum-枚举管理
/// <summary> /// <summary>
/// 枚举管理 /// 枚举管理
@ -1908,9 +1947,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Enums-枚举表单 #region Enums-枚举表单
/// <summary> /// <summary>
/// 枚举表单 /// 枚举表单
@ -2019,9 +2060,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region EnumItem-枚举项 #region EnumItem-枚举项
/// <summary> /// <summary>
/// 枚举项 /// 枚举项
@ -2130,9 +2173,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region EnumType-枚举类别 #region EnumType-枚举类别
/// <summary> /// <summary>
/// 枚举类别 /// 枚举类别
@ -2241,9 +2286,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region HiddenDangerRectification-隐患整改完成情况统计 #region HiddenDangerRectification-隐患整改完成情况统计
/// <summary> /// <summary>
/// 隐患整改完成情况统计 /// 隐患整改完成情况统计
@ -2352,9 +2399,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region JobActivityCompletion-班组作业完成率统计 #region JobActivityCompletion-班组作业完成率统计
/// <summary> /// <summary>
/// 班组作业完成率统计 /// 班组作业完成率统计
@ -2463,9 +2512,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region MessageTemplate-短信模板表 #region MessageTemplate-短信模板表
/// <summary> /// <summary>
/// 短信模板表 /// 短信模板表
@ -2574,9 +2625,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Monitoring-服务器监听表 #region Monitoring-服务器监听表
/// <summary> /// <summary>
/// 服务器监听表 /// 服务器监听表
@ -2685,9 +2738,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Notice-信息通知表 #region Notice-信息通知表
/// <summary> /// <summary>
/// 信息通知表 /// 信息通知表
@ -2796,9 +2851,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region NotificationTask-娑堟伅琛? #region NotificationTask-娑堟伅琛?
/// <summary> /// <summary>
/// 娑堟伅琛? /// 娑堟伅琛?
@ -2907,9 +2964,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃? #region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary> /// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃? /// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3018,9 +3077,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region ParamSet-参数设置表 #region ParamSet-参数设置表
/// <summary> /// <summary>
/// 参数设置表 /// 参数设置表
@ -3129,9 +3190,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region ParamSetDepartment-组织关联信息 #region ParamSetDepartment-组织关联信息
/// <summary> /// <summary>
/// 组织关联信息 /// 组织关联信息
@ -3240,9 +3303,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Person-人员信息 #region Person-人员信息
/// <summary> /// <summary>
/// 人员信息 /// 人员信息
@ -3351,9 +3416,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region PersonCertificateFile-证书 #region PersonCertificateFile-证书
/// <summary> /// <summary>
/// 证书 /// 证书
@ -3462,9 +3529,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region PersonEducationFile-学历证 #region PersonEducationFile-学历证
/// <summary> /// <summary>
/// 学历证 /// 学历证
@ -3573,9 +3642,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region PersonIdcardFile-身份证 #region PersonIdcardFile-身份证
/// <summary> /// <summary>
/// 身份证 /// 身份证
@ -3684,9 +3755,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region PersonSkills-技能 #region PersonSkills-技能
/// <summary> /// <summary>
/// 技能 /// 技能
@ -3795,9 +3868,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region PersonWork-工作经历 #region PersonWork-工作经历
/// <summary> /// <summary>
/// 工作经历 /// 工作经历
@ -3906,9 +3981,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region RiskLevelProportion-风险等级占比 #region RiskLevelProportion-风险等级占比
/// <summary> /// <summary>
/// 风险等级占比 /// 风险等级占比
@ -4017,9 +4094,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region RiskTypeProportion-风险类别占比 #region RiskTypeProportion-风险类别占比
/// <summary> /// <summary>
/// 风险类别占比 /// 风险类别占比
@ -4128,9 +4207,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region RoleDepartment-部门权限 #region RoleDepartment-部门权限
/// <summary> /// <summary>
/// 部门权限 /// 部门权限
@ -4239,9 +4320,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Snapshot-随手拍 #region Snapshot-随手拍
/// <summary> /// <summary>
/// 随手拍 /// 随手拍
@ -4350,9 +4433,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region SnapshotFile-随手拍图片 #region SnapshotFile-随手拍图片
/// <summary> /// <summary>
/// 随手拍图片 /// 随手拍图片
@ -4461,9 +4546,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region SyncLimit-数据同步次数限制 #region SyncLimit-数据同步次数限制
/// <summary> /// <summary>
/// 数据同步次数限制 /// 数据同步次数限制
@ -4572,9 +4659,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region SyncLog-跑批日志表 #region SyncLog-跑批日志表
/// <summary> /// <summary>
/// 跑批日志表 /// 跑批日志表
@ -4683,9 +4772,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region SyncLogDetail-跑批日志明细表 #region SyncLogDetail-跑批日志明细表
/// <summary> /// <summary>
/// 跑批日志明细表 /// 跑批日志明细表
@ -4794,9 +4885,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region SyncUserRule-用户数据同步例外配置 #region SyncUserRule-用户数据同步例外配置
/// <summary> /// <summary>
/// 用户数据同步例外配置 /// 用户数据同步例外配置
@ -4905,9 +4998,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region Team-班组表 #region Team-班组表
/// <summary> /// <summary>
/// 班组表 /// 班组表
@ -5016,9 +5111,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region TeamPerson-班组人员关联信息 #region TeamPerson-班组人员关联信息
/// <summary> /// <summary>
/// 班组人员关联信息 /// 班组人员关联信息
@ -5127,9 +5224,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserDepartment-用户部门关联表 #region UserDepartment-用户部门关联表
/// <summary> /// <summary>
/// 用户部门关联表 /// 用户部门关联表
@ -5238,9 +5337,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserPost-宀椾綅鍒楄〃 #region UserPost-宀椾綅鍒楄〃
/// <summary> /// <summary>
/// 宀椾綅鍒楄〃 /// 宀椾綅鍒楄〃
@ -5349,9 +5450,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserProductionUnit-生产单元 #region UserProductionUnit-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -5460,9 +5563,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserProductionUnitSet-生产单元 #region UserProductionUnitSet-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -5571,9 +5676,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserSignFile-签名照片 #region UserSignFile-签名照片
/// <summary> /// <summary>
/// 签名照片 /// 签名照片
@ -5682,9 +5789,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserTest-测试多选 #region UserTest-测试多选
/// <summary> /// <summary>
/// 测试多选 /// 测试多选
@ -5793,9 +5902,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region UserVacationSet-人员休假设置 #region UserVacationSet-人员休假设置
/// <summary> /// <summary>
/// 人员休假设置 /// 人员休假设置
@ -5904,9 +6015,11 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计 #region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary> /// <summary>
/// 关键许可工作票完成情况统计 /// 关键许可工作票完成情况统计
@ -6015,6 +6128,8 @@ using APT.BaseData.Domain.Entities;
} }
} }
#endregion #endregion
} }

43
APT.MicroApi/APT.FO.WebApi/Controllers/ChangeShiftRecordController.cs
View File

@ -225,31 +225,26 @@ namespace APT.FO.WebApi.Controllers.Api.FO
public PagedActionResult<T_FO_CHANGE_SHIFT_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter) public PagedActionResult<T_FO_CHANGE_SHIFT_RECORD> OrderPaged([FromBody] KeywordPageFilter pageFilter)
{ {
var result = new PagedActionResult<T_FO_CHANGE_SHIFT_RECORD>(); var result = new PagedActionResult<T_FO_CHANGE_SHIFT_RECORD>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole"); var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
var admiId = users.FirstOrDefault(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value;
var tempDeps = GetEntities<T_FM_DEPARTMENT>(t=>t.ENABLE_STATUS == 0,new BaseFilter(pageFilter.OrgId));
var tempDep = tempDeps.FirstOrDefault(t=>t.ID == currDep);
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_PreUsers"); pageFilter.Include.Add("Nav_PreUsers");
pageFilter.Include.Add("Nav_AfterUsers"); pageFilter.Include.Add("Nav_AfterUsers");
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
pageFilter.Limit = 10; pageFilter.Limit = 10;
if (tempDep!=null&& tempDep.DEPARTMENT_TYPE == (int)FMDepartmentType.Class) var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId), "Nav_ApproveRole");
{ var tempDeps = GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId));
currDep = (Guid)tempDep.PARENT_ID; var departStatus = tempDeps.FirstOrDefault(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
} var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
var AHDepartment = users.FirstOrDefault(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment)
{ {
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(null, pageFilter);
} }
else if (tempDep != null && (tempDep.NAME.Contains("安环科") || tempDep.NAME.Contains("安全环保")) && tempDep.PARENT_ID != null) else
{ {
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)tempDep.PARENT_ID); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { (Guid)tempDep.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
@ -258,20 +253,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
result.Data = null; result.Data = null;
} }
else
{
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CHANGE_SHIFT_RECORD>(t => t.Nav_Team!=null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID), pageFilter);
}
else
result.Data = null;
}
if (result.Data.Any()) if (result.Data.Any())
{ {
foreach (var entity in result.Data) foreach (var entity in result.Data)
@ -279,12 +260,12 @@ namespace APT.FO.WebApi.Controllers.Api.FO
if (entity.Nav_PreUsers != null && entity.Nav_PreUsers.Any()) if (entity.Nav_PreUsers != null && entity.Nav_PreUsers.Any())
{ {
var userTemp = entity.Nav_PreUsers.Select(t => t.USER_ID).ToList(); var userTemp = entity.Nav_PreUsers.Select(t => t.USER_ID).ToList();
var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m=>m.NAME).ToList(); var userList = users.Where(t => userTemp.Contains(t.ID)).Select(m => m.NAME).ToList();
entity.CURRENT_USER = string.Join(",", userList); entity.CURRENT_USER = string.Join(",", userList);
} }
if (entity.Nav_AfterUsers != null && entity.Nav_AfterUsers.Any()) if (entity.Nav_AfterUsers != null && entity.Nav_AfterUsers.Any())
{ {
var user = users.FirstOrDefault(t=>t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID); var user = users.FirstOrDefault(t => t.ID == entity.Nav_AfterUsers.FirstOrDefault().USER_ID);
if (user != null) if (user != null)
{ {
entity.CHANGE_DEPART = tempDeps.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID)?.NAME; entity.CHANGE_DEPART = tempDeps.FirstOrDefault(t => t.ID == user.DEPARTMENT_ID)?.NAME;

7
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobController.cs
View File

@ -1757,10 +1757,11 @@ namespace APT.FO.WebApi.Controllers
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB>(null, pageFilter);
} }

7
APT.MicroApi/APT.FO.WebApi/Controllers/CrucialLicenseJobOutsourceController.cs
View File

@ -1062,10 +1062,11 @@ namespace APT.FO.WebApi.Controllers
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CRUCIAL_LICENSE_JOB_OUTSOURCE>(null, pageFilter);
} }

30
APT.MicroApi/APT.FO.WebApi/Controllers/CurrentClassRecord.cs
View File

@ -618,34 +618,20 @@ namespace APT.FO.WebApi.Controllers.Api.FO
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>(); var result = new PagedActionResult<T_FO_CURRENT_CLASS_RECORD>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; //安环部负责人departmentID
var AHDepartment = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole!=null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0); var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(null, pageFilter);
} }
else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null)
{
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)departInfo.PARENT_ID);
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_CURRENT_CLASS_RECORD>(t => (t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID)), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
else else
{ {
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {

7
APT.MicroApi/APT.FO.WebApi/Controllers/JobActivityRecordController.cs
View File

@ -791,10 +791,11 @@ namespace APT.FO.WebApi.Controllers
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_JOB_ACTIVITY_RECORD>(null, pageFilter);
} }

20
APT.MicroApi/APT.FO.WebApi/Controllers/JobEventRecordController.cs
View File

@ -750,14 +750,21 @@ namespace APT.FO.WebApi.Controllers
var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME"); var filter = pageFilter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "PARENT_NAME");
if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString())) if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString()))
pageFilter.FilterGroup.Rules.Remove(filter); pageFilter.FilterGroup.Rules.Remove(filter);
pageFilter.Include.Add("Nav_CreateUser");
pageFilter.Include.Add("Nav_JobEventPerson");
pageFilter.Include.Add("Nav_JobEventPerson.Nav_User");
pageFilter.SelectField.Add("Nav_JobEventPerson.USER_ID");
pageFilter.SelectField.Add("Nav_JobEventPerson.Nav_User.NAME");
pageFilter.IgnoreDataRule = true;
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User"); result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter);
} }
else else
{ {
@ -766,7 +773,7 @@ namespace APT.FO.WebApi.Controllers
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");//|| dataIds.Contains(t.ID) result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter);//|| dataIds.Contains(t.ID)
} }
else else
result.Data = null; result.Data = null;
@ -774,6 +781,7 @@ namespace APT.FO.WebApi.Controllers
if (result.Data.Any()) if (result.Data.Any())
{ {
var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList(); var departments = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
//var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(pageFilter.OrgId)).ToList();
result.Data.ForEach(t => result.Data.ForEach(t =>
{ {
if (t.Nav_CreateUser != null && t.Nav_CreateUser.DEPARTMENT_ID != null) if (t.Nav_CreateUser != null && t.Nav_CreateUser.DEPARTMENT_ID != null)
@ -783,7 +791,7 @@ namespace APT.FO.WebApi.Controllers
} }
if (t.Nav_JobEventPerson != null && t.Nav_JobEventPerson.Any()) if (t.Nav_JobEventPerson != null && t.Nav_JobEventPerson.Any())
{ {
var names = t.Nav_JobEventPerson.Select(m => m.Nav_User?.NAME).ToList(); var names = t.Nav_JobEventPerson.Where(t => t.USER_ID!=null).Select(m => m.Nav_User?.NAME).Distinct().ToList();
t.USER_NAME = string.Join(", ", names); t.USER_NAME = string.Join(", ", names);
} }
}); });

8
APT.MicroApi/APT.FO.WebApi/Controllers/PreOperSchController.cs
View File

@ -9,6 +9,7 @@ using APT.MS.Domain.Entities.FO;
using APT.MS.Domain.Enums; using APT.MS.Domain.Enums;
using APT.Utility; using APT.Utility;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using StackExchange.Redis;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
@ -280,10 +281,11 @@ namespace APT.FM.WebApi.Controllers.Api.FO
var result = new PagedActionResult<T_FO_PRE_OPER_SCH>(); var result = new PagedActionResult<T_FO_PRE_OPER_SCH>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_PRE_OPER_SCH>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_PRE_OPER_SCH>(null, pageFilter);
} }

42
APT.MicroApi/APT.FO.WebApi/Controllers/PreShiftMeetingRecordController.cs
View File

@ -786,45 +786,25 @@ namespace APT.FO.WebApi.Controllers.Api.FO
pageFilter.Include.Add("Nav_Team"); pageFilter.Include.Add("Nav_Team");
pageFilter.Include.Add("Nav_Users.Nav_User"); pageFilter.Include.Add("Nav_Users.Nav_User");
var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>(); var result = new PagedActionResult<T_FO_PRE_SHIFT_MEETING_RECORD>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; Expression<Func<T_FO_PRE_SHIFT_MEETING_RECORD, bool>> express = t => t.IS_DELETED == false;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value;
var AH = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && (t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员"));
Guid? AHDepartment = Guid.Empty;
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0);
Expression<Func<T_FO_PRE_SHIFT_MEETING_RECORD, bool>> express = t => t.IS_DELETED==false;
if (!string.IsNullOrEmpty(pageFilter.Parameter1)) if (!string.IsNullOrEmpty(pageFilter.Parameter1))
{ {
express = express.And(t => t.Nav_Users.Any(i =>i.Nav_User!=null && i.Nav_User.NAME.Contains(pageFilter.Parameter1))); express = express.And(t => t.Nav_Users.Any(i => i.Nav_User != null && i.Nav_User.NAME.Contains(pageFilter.Parameter1)));
} }
if (AH != null) var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
{ var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
AHDepartment = AH.DEPARTMENT_ID; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
} //安环部负责人departmentID
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter); result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);
} }
else if (departInfo!=null && (departInfo.NAME.Contains("安环科")|| departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID!=null)
{
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)departInfo.PARENT_ID);
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
express = express.And(t => t.Nav_Team != null && departmentIds.Contains((Guid)t.Nav_Team.DEPARTMENT_ID));
result = this.GetOrderPageEntities<T_FO_PRE_SHIFT_MEETING_RECORD>(express, pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
else else
{ {
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {

237
APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

32
APT.MicroApi/APT.FO.WebApi/Controllers/TeamActivityController.cs
View File

@ -257,20 +257,20 @@ namespace APT.FO.WebApi.Controllers.Api.FO
pageFilter.IgnoreDataRule = true; pageFilter.IgnoreDataRule = true;
pageFilter.Include.Add("Nav_Taem"); pageFilter.Include.Add("Nav_Taem");
var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>(); var result = new PagedActionResult<T_FO_TEAM_ACTIVITY>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var admiId = this.GetEntity<T_FM_USER>(t => t.CODE.Contains("admin") && t.ENABLE_STATUS == 0)?.ID; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
var currDep = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID.Value; //安环部负责人departmentID
var AHDepartment = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole!=null &&(t.Nav_ApproveRole.NAME == "安环部负责人" || t.Nav_ApproveRole.NAME == "安环部安全员")).DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
var departInfo = GetEntity<T_FM_DEPARTMENT>(t => t.ID == currDep && t.ENABLE_STATUS == 0); var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if (loginUserId == null || loginUserId == admiId || currDep == AHDepartment) if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(null, pageFilter);
} }
else if (departInfo != null && (departInfo.NAME.Contains("安环科") || departInfo.NAME.Contains("安全环保")) && departInfo.PARENT_ID != null) else
{ {
List<Guid> departmentId = new List<Guid>(); List<Guid> departmentId = new List<Guid>() { loginDepartmentId.Value };
departmentId.Add((Guid)departInfo.PARENT_ID); List<Guid> departmentIds = new List<Guid>() { loginDepartmentId.Value };
List<Guid> departmentIds = new List<Guid>() { (Guid)departInfo.PARENT_ID };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
@ -279,20 +279,6 @@ namespace APT.FO.WebApi.Controllers.Api.FO
else else
result.Data = null; result.Data = null;
} }
else
{
var loginDepartmentId = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
List<Guid> departmentId = new List<Guid>();
departmentId.Add((Guid)loginDepartmentId);
List<Guid> departmentIds = new List<Guid>() { (Guid)loginDepartmentId };
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any())
{
result = this.GetOrderPageEntities<T_FO_TEAM_ACTIVITY>(t => t.Nav_Taem!=null && departmentIds.Contains((Guid)t.Nav_Taem.DEPARTMENT_ID), pageFilter);//|| dataIds.Contains(t.ID)
}
else
result.Data = null;
}
return result; return result;
} }
} }

7
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromController.cs
View File

@ -786,10 +786,11 @@ namespace APT.FO.WebApi.Controllers
var result = new PagedActionResult<T_FO_TECH_DISCLOSURE_FROM>(); var result = new PagedActionResult<T_FO_TECH_DISCLOSURE_FROM>();
var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; var loginDepartmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var loginUserCode = APT.Infrastructure.Api.AppContext.CurrentSession.UserCode; var loginUserCode = this.GetEntity<T_FM_USER>(t => t.ID == loginUserId && t.ENABLE_STATUS == 0)?.CODE;
//安环部负责人departmentID //安环部负责人departmentID
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var departStatus = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == loginDepartmentId && t.ENABLE_STATUS == 0)?.DEPARTMENT_STATUS;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) var ahRole = this.GetEntity<T_FM_USER_BELONG_ROLE>(t => t.Nav_BelongRole != null && t.Nav_BelongRole.NAME.Contains("安环") && t.USER_ID == loginUserId);
if ((!string.IsNullOrEmpty(loginUserCode) && loginUserCode.Contains("admin")) || departStatus != (int)FMDepartmentStatus.生产部门 || ahRole != null)
{ {
result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter); result = this.GetOrderPageEntities<T_FO_TECH_DISCLOSURE_FROM>(null, pageFilter);
} }

294
APT.MicroApi/APT.HM.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

9
APT.MicroApi/APT.LG.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.LG.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.LG; using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表 #region Oprate-表单操作日志表
/// <summary> /// <summary>
/// 表单操作日志表 /// 表单操作日志表
@ -131,6 +138,8 @@ namespace APT.LG.WebApi.Controllers.Api
} }
} }
#endregion #endregion
} }

14
APT.MicroApi/APT.NW.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.NW.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.NW; using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表 #region Enterprise-子企业表
/// <summary> /// <summary>
/// 子企业表 /// 子企业表
@ -130,6 +137,7 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -141,9 +149,11 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region RoleDataPerm-子企业数据权限表 #region RoleDataPerm-子企业数据权限表
/// <summary> /// <summary>
/// 子企业数据权限表 /// 子企业数据权限表
@ -252,9 +262,11 @@ namespace APT.NW.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RoleMenu-子企业权限表 #region RoleMenu-子企业权限表
/// <summary> /// <summary>
/// 子企业权限表 /// 子企业权限表
@ -363,6 +375,8 @@ namespace APT.NW.WebApi.Controllers.Api
} }
} }
#endregion #endregion
} }

60
APT.MicroApi/APT.OP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,6 +29,7 @@ namespace APT.OP.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.OP; using APT.BaseData.Domain.Entities.OP;
#region Alluser-用户表(租户平台) #region Alluser-用户表(租户平台)
/// <summary> /// <summary>
/// 用户表(租户平台) /// 用户表(租户平台)
@ -131,9 +138,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region BillingRule-计费规则表 #region BillingRule-计费规则表
/// <summary> /// <summary>
/// 计费规则表 /// 计费规则表
@ -242,9 +251,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region BillingRuleVersion-计费规则子表 #region BillingRuleVersion-计费规则子表
/// <summary> /// <summary>
/// 计费规则子表 /// 计费规则子表
@ -353,9 +364,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region ChargeTimeSet-充电时长配置 #region ChargeTimeSet-充电时长配置
/// <summary> /// <summary>
/// 充电时长配置 /// 充电时长配置
@ -464,9 +477,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Client-客户表 #region Client-客户表
/// <summary> /// <summary>
/// 客户表 /// 客户表
@ -575,9 +590,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region ClinetOpenid-客户表OpenId #region ClinetOpenid-客户表OpenId
/// <summary> /// <summary>
/// 客户表OpenId /// 客户表OpenId
@ -686,9 +703,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region CommonQuestion-常见问题 #region CommonQuestion-常见问题
/// <summary> /// <summary>
/// 常见问题 /// 常见问题
@ -797,9 +816,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region FileFirmware-充电桩固件表 #region FileFirmware-充电桩固件表
/// <summary> /// <summary>
/// 充电桩固件表 /// 充电桩固件表
@ -908,9 +929,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Member-会员表 #region Member-会员表
/// <summary> /// <summary>
/// 会员表 /// 会员表
@ -1019,9 +1042,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Menu-菜单表(租户平台) #region Menu-菜单表(租户平台)
/// <summary> /// <summary>
/// 菜单表(租户平台) /// 菜单表(租户平台)
@ -1129,6 +1154,7 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -1140,9 +1166,11 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region Notice-公告表 #region Notice-公告表
/// <summary> /// <summary>
/// 公告表 /// 公告表
@ -1251,9 +1279,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region NoticeDetail-公告内容 #region NoticeDetail-公告内容
/// <summary> /// <summary>
/// 公告内容 /// 公告内容
@ -1362,9 +1392,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region PeakValleyConfig-峰谷配置表 #region PeakValleyConfig-峰谷配置表
/// <summary> /// <summary>
/// 峰谷配置表 /// 峰谷配置表
@ -1473,9 +1505,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RechargeCard-充值卡 #region RechargeCard-充值卡
/// <summary> /// <summary>
/// 充值卡 /// 充值卡
@ -1584,9 +1618,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RechargeOrder-充值订单 #region RechargeOrder-充值订单
/// <summary> /// <summary>
/// 充值订单 /// 充值订单
@ -1695,9 +1731,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RechargeSetting-充值金额配置 #region RechargeSetting-充值金额配置
/// <summary> /// <summary>
/// 充值金额配置 /// 充值金额配置
@ -1806,9 +1844,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RfidCard-RFID卡 #region RfidCard-RFID卡
/// <summary> /// <summary>
/// RFID卡 /// RFID卡
@ -1917,9 +1957,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region RoleMenu-租户权限表 #region RoleMenu-租户权限表
/// <summary> /// <summary>
/// 租户权限表 /// 租户权限表
@ -2028,9 +2070,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Tenant-租户表 #region Tenant-租户表
/// <summary> /// <summary>
/// 租户表 /// 租户表
@ -2139,9 +2183,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region TenantDbConn-租户数据库表 #region TenantDbConn-租户数据库表
/// <summary> /// <summary>
/// 租户数据库表 /// 租户数据库表
@ -2250,9 +2296,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region TenantDomain-租户域名表 #region TenantDomain-租户域名表
/// <summary> /// <summary>
/// 租户域名表 /// 租户域名表
@ -2361,9 +2409,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region TenantExpiration-租户租期表 #region TenantExpiration-租户租期表
/// <summary> /// <summary>
/// 租户租期表 /// 租户租期表
@ -2472,9 +2522,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region User-用户表(租户平台) #region User-用户表(租户平台)
/// <summary> /// <summary>
/// 用户表(租户平台) /// 用户表(租户平台)
@ -2583,9 +2635,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region Version-版本升级表 #region Version-版本升级表
/// <summary> /// <summary>
/// 版本升级表 /// 版本升级表
@ -2694,9 +2748,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region VersionMenu-菜单版本升级表 #region VersionMenu-菜单版本升级表
/// <summary> /// <summary>
/// 菜单版本升级表 /// 菜单版本升级表
@ -2805,9 +2861,11 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
#region VersionTenant-租户版本升级表 #region VersionTenant-租户版本升级表
/// <summary> /// <summary>
/// 租户版本升级表 /// 租户版本升级表
@ -2916,6 +2974,8 @@ namespace APT.OP.WebApi.Controllers.Api
} }
} }
#endregion #endregion
} }

97
APT.MicroApi/APT.PF.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -26,6 +32,7 @@ using APT.MS.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4; using APT.BaseData.Domain.Entities.T4;
#region Annourcement-公告 #region Annourcement-公告
/// <summary> /// <summary>
/// 公告 /// 公告
@ -134,9 +141,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AnnourcementFile-公告附件 #region AnnourcementFile-公告附件
/// <summary> /// <summary>
/// 公告附件 /// 公告附件
@ -245,9 +254,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AnnourcementOrg-公告下属公司 #region AnnourcementOrg-公告下属公司
/// <summary> /// <summary>
/// 公告下属公司 /// 公告下属公司
@ -356,9 +367,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApprovalRole-审批角色 #region ApprovalRole-审批角色
/// <summary> /// <summary>
/// 审批角色 /// 审批角色
@ -467,9 +480,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Approve-审批流主表 #region Approve-审批流主表
/// <summary> /// <summary>
/// 审批流主表 /// 审批流主表
@ -578,9 +593,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveDetail-审批流子表 #region ApproveDetail-审批流子表
/// <summary> /// <summary>
/// 审批流子表 /// 审批流子表
@ -689,9 +706,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveOperationRole-操作角色 #region ApproveOperationRole-操作角色
/// <summary> /// <summary>
/// 操作角色 /// 操作角色
@ -800,9 +819,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveRejectConfig-审批驳回配置表 #region ApproveRejectConfig-审批驳回配置表
/// <summary> /// <summary>
/// 审批驳回配置表 /// 审批驳回配置表
@ -911,9 +932,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveRoleDepartment-分管部门 #region ApproveRoleDepartment-分管部门
/// <summary> /// <summary>
/// 分管部门 /// 分管部门
@ -1022,9 +1045,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveTemp-审批流模板主表 #region ApproveTemp-审批流模板主表
/// <summary> /// <summary>
/// 审批流模板主表 /// 审批流模板主表
@ -1133,9 +1158,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveTempDetail-审批流模板子表 #region ApproveTempDetail-审批流模板子表
/// <summary> /// <summary>
/// 审批流模板子表 /// 审批流模板子表
@ -1244,9 +1271,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AppVersion-App版本发布 #region AppVersion-App版本发布
/// <summary> /// <summary>
/// App版本发布 /// App版本发布
@ -1355,9 +1384,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AppVersionFile-App包文件 #region AppVersionFile-App包文件
/// <summary> /// <summary>
/// App包文件 /// App包文件
@ -1466,12 +1497,14 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region BiplaySet-图片视频
#region BiplaySet-播放设置
/// <summary> /// <summary>
/// 图片视频 /// 播放设置
/// </summary> /// </summary>
[Route("api/PF/BiplaySet")] [Route("api/PF/BiplaySet")]
public partial class BiplaySetController : AuthorizeApiController<T_PF_BIPLAY_SET> public partial class BiplaySetController : AuthorizeApiController<T_PF_BIPLAY_SET>
@ -1577,9 +1610,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Bititle-标语 #region Bititle-标语
/// <summary> /// <summary>
/// 标语 /// 标语
@ -1688,9 +1723,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Bivideoimg-图片视频 #region Bivideoimg-图片视频
/// <summary> /// <summary>
/// 图片视频 /// 图片视频
@ -1799,9 +1836,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region BivideoimgFile-图片视频 #region BivideoimgFile-图片视频
/// <summary> /// <summary>
/// 图片视频 /// 图片视频
@ -1910,9 +1949,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ClientScopes-资源表 #region ClientScopes-资源表
/// <summary> /// <summary>
/// 资源表 /// 资源表
@ -2021,9 +2062,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region CodeRuleRunLog-编码规则跑批表 #region CodeRuleRunLog-编码规则跑批表
/// <summary> /// <summary>
/// 编码规则跑批表 /// 编码规则跑批表
@ -2132,9 +2175,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ComplaintLog-转办记录表 #region ComplaintLog-转办记录表
/// <summary> /// <summary>
/// 转办记录表 /// 转办记录表
@ -2243,9 +2288,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region DataChannel-数据通道 #region DataChannel-数据通道
/// <summary> /// <summary>
/// 数据通道 /// 数据通道
@ -2354,9 +2401,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region DataFrequency-采集频率 #region DataFrequency-采集频率
/// <summary> /// <summary>
/// 采集频率 /// 采集频率
@ -2465,9 +2514,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Fddeback-意见反馈 #region Fddeback-意见反馈
/// <summary> /// <summary>
/// 意见反馈 /// 意见反馈
@ -2576,9 +2627,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FddebackFile-意见反馈附件 #region FddebackFile-意见反馈附件
/// <summary> /// <summary>
/// 意见反馈附件 /// 意见反馈附件
@ -2687,9 +2740,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileDb- #region FileDb-
/// <summary> /// <summary>
/// ///
@ -2798,9 +2853,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileDbFile- #region FileDbFile-
/// <summary> /// <summary>
/// ///
@ -2909,9 +2966,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileType- #region FileType-
/// <summary> /// <summary>
/// ///
@ -3020,9 +3079,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeChart-首页：图标区域 #region FormHomeChart-首页：图标区域
/// <summary> /// <summary>
/// 首页：图标区域 /// 首页：图标区域
@ -3131,9 +3192,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeHmi-首页：HMI区域 #region FormHomeHmi-首页：HMI区域
/// <summary> /// <summary>
/// 首页：HMI区域 /// 首页：HMI区域
@ -3242,9 +3305,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeRanking-首页：排名区域 #region FormHomeRanking-首页：排名区域
/// <summary> /// <summary>
/// 首页：排名区域 /// 首页：排名区域
@ -3353,9 +3418,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeStatistic-首页：统计区域 #region FormHomeStatistic-首页：统计区域
/// <summary> /// <summary>
/// 首页：统计区域 /// 首页：统计区域
@ -3464,9 +3531,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormRelation-关联表单配置 #region FormRelation-关联表单配置
/// <summary> /// <summary>
/// 关联表单配置 /// 关联表单配置
@ -3575,9 +3644,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region HomeTitle-首页方针 #region HomeTitle-首页方针
/// <summary> /// <summary>
/// 首页方针 /// 首页方针
@ -3686,9 +3757,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region MqttConfig-MQTT配置表 #region MqttConfig-MQTT配置表
/// <summary> /// <summary>
/// MQTT配置表 /// MQTT配置表
@ -3797,9 +3870,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region MqttConfigTheme- #region MqttConfigTheme-
/// <summary> /// <summary>
/// ///
@ -3908,9 +3983,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Notice-通知 #region Notice-通知
/// <summary> /// <summary>
/// 通知 /// 通知
@ -4019,9 +4096,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region NoticeFile- #region NoticeFile-
/// <summary> /// <summary>
/// ///
@ -4130,9 +4209,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region PicFilter-图片条件主表 #region PicFilter-图片条件主表
/// <summary> /// <summary>
/// 图片条件主表 /// 图片条件主表
@ -4241,9 +4322,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region PicFilterDetail-图片条件子表 #region PicFilterDetail-图片条件子表
/// <summary> /// <summary>
/// 图片条件子表 /// 图片条件子表
@ -4352,9 +4435,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region QuestionFeedback-问题反馈表 #region QuestionFeedback-问题反馈表
/// <summary> /// <summary>
/// 问题反馈表 /// 问题反馈表
@ -4463,9 +4548,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region QuestionFeedbackFile-问题反馈附件表 #region QuestionFeedbackFile-问题反馈附件表
/// <summary> /// <summary>
/// 问题反馈附件表 /// 问题反馈附件表
@ -4574,9 +4661,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Scopes-资源表 #region Scopes-资源表
/// <summary> /// <summary>
/// 资源表 /// 资源表
@ -4685,9 +4774,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region VersionManage-版本管理表 #region VersionManage-版本管理表
/// <summary> /// <summary>
/// 版本管理表 /// 版本管理表
@ -4796,6 +4887,8 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
} }

4
APT.MicroApi/APT.PP.WebApi/Controllers/Api/SKController.cs
View File

@ -5425,8 +5425,8 @@ namespace APT.PP.WebApi.Controllers.Api
var shiftClassAll = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.DATE_TIME.Date == dt.Date && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList(); var shiftClassAll = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.DATE_TIME.Date == dt.Date && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").ToList();
var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME).ToList(); var shiftClassList = shiftClassAll.Where(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME).ToList();
var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList(); var teamIds = shiftClassList.Select(t => t.TEAM_ID).Distinct().ToList();
var teamInfos = this.GetEntities<T_FM_TEAM>(t => teamIds.Contains(t.ID), new BaseFilter(filter.OrgId)); var teamInfos = this.GetEntities<T_FM_TEAM>(t =>t.ENABLE_STATUS == 0 , new BaseFilter(filter.OrgId));
var teamDepartIds = teamInfos.Select(m => m.DEPARTMENT_ID).Distinct().ToList(); var teamDepartIds = teamInfos.Where(t=>teamIds.Contains(t.ID)).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
var personIds = new List<Guid>(); var personIds = new List<Guid>();
if (shiftClassList != null && shiftClassList.Any()) if (shiftClassList != null && shiftClassList.Any())
{ {

7
APT.MicroApi/APT.PP.WebApi/Controllers/Api/T4/T4Control.cs
View File

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -21,4 +27,5 @@ using APT.Infrastructure.Api;
using APT.BaseData.Domain.ApiModel.PF; using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api namespace APT.PP.WebApi.Controllers.Api
{ {
} }

145
APT.MicroApi/APT.SC.WebApi/Controllers/Api/BIController/BIKanBanController.cs
View File

@ -55,8 +55,13 @@ namespace APT.SC.WebApi.Controllers.Api.BI
public List<RiskTypeRate> riskTypeRate { get; set; } public List<RiskTypeRate> riskTypeRate { get; set; }
//当日工作票排名前三 //当日工作票排名前三
public List<JobTodayTop3> jobTodayTop3 { get; set; } public List<JobTodayTop3> jobTodayTop3 { get; set; }
//当日工作票统计数量
public List<JobTodayQty> jobTodayQty { get; set; }
//隐患整改率 //隐患整改率
public HiddenRectify hiddenRectify { get; set; } public HiddenRectify hiddenRectify { get; set; }
//隐患统计数据
public HiddenSummary hiddenSummary { get; set; }
//各事项排名前三 //各事项排名前三
public List<TaskTop3> taskTop3 { get; set; } public List<TaskTop3> taskTop3 { get; set; }
//作业现场完成情况统计 //作业现场完成情况统计
@ -95,6 +100,16 @@ namespace APT.SC.WebApi.Controllers.Api.BI
public int qty { get; set; } public int qty { get; set; }
} }
/// <summary> /// <summary>
/// 当日工作票统计数量
/// </summary>
public class JobTodayQty
{
public int qty { get; set; }
public Guid workTypeId { get; set; }
public string name { get; set; }
}
/// <summary>
/// 隐患整改率 /// 隐患整改率
/// </summary> /// </summary>
public class HiddenRectify public class HiddenRectify
@ -107,6 +122,22 @@ namespace APT.SC.WebApi.Controllers.Api.BI
public string rate { get; set; } public string rate { get; set; }
} }
/// <summary> /// <summary>
/// 隐患统计数据
/// </summary>
public class HiddenSummary
{
public int majorQty { get; set; }
public int generalQty { get; set; }
public int unfinishQty { get; set; }
public int monthMajorQty { get; set; }
public int unfinishMonthMajorQty { get; set; }
public int monthGeneralQty { get; set; }
public int unfinishMonthGeneralQty { get; set; }
}
/// <summary>
/// 各事项排名前三 /// 各事项排名前三
/// </summary> /// </summary>
public class TaskTopTemp public class TaskTopTemp
@ -268,45 +299,57 @@ namespace APT.SC.WebApi.Controllers.Api.BI
riskData.Fill(tableRisk); riskData.Fill(tableRisk);
result.Data.riskTypeRate = RiskTypeRateData(tableRisk); result.Data.riskTypeRate = RiskTypeRateData(tableRisk);
//当日工作票排名前三 //当日工作票排名前三
string sqlJob = "select * from vhome_jobtop3_today "; //string sqlJob = "select * from vhome_jobtop3_today ";
//SqlCommand comJob = new SqlCommand(sqlJob, connection);
//SqlDataAdapter jobData = new SqlDataAdapter(comJob);
//jobData.Fill(tableJob);
//string sqlJobGroup = "select* from vhome_jobdata_today_group";
//SqlCommand comJobGroup = new SqlCommand(sqlJobGroup, connection);
//SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup);
//jobGroupData.Fill(tableJobGroup);
//result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup);
//当日工作票的统计数量
string sqlJob = "select * from vhome_jobToday ORDER BY NUM";
SqlCommand comJob = new SqlCommand(sqlJob, connection); SqlCommand comJob = new SqlCommand(sqlJob, connection);
SqlDataAdapter jobData = new SqlDataAdapter(comJob); SqlDataAdapter jobData = new SqlDataAdapter(comJob);
jobData.Fill(tableJob); jobData.Fill(tableJob);
string sqlJobGroup = "select* from vhome_jobdata_today_group"; result.Data.jobTodayQty = JobTodayQtyData(tableJob);
SqlCommand comJobGroup = new SqlCommand(sqlJobGroup, connection); //隐患统计数据
SqlDataAdapter jobGroupData = new SqlDataAdapter(comJobGroup); string sqlHidden = "select * from vhome_hiddenSummary";
jobGroupData.Fill(tableJobGroup);
result.Data.jobTodayTop3 = JobTodayTopData(filter.OrgId.Value, tableJob, tableJobGroup);
//隐患整改率
string sqlHidden = "select * from vhome_hidden_data_result ";
SqlCommand comHidden = new SqlCommand(sqlHidden, connection); SqlCommand comHidden = new SqlCommand(sqlHidden, connection);
SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden); SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden);
hiddenData.Fill(tableHidden); hiddenData.Fill(tableHidden);
result.Data.hiddenRectify = HiddenRectifyData(tableHidden); result.Data.hiddenSummary = HiddenSummaryData(tableHidden);
//隐患整改率
//string sqlHidden = "select * from vhome_hidden_data_result ";
//SqlCommand comHidden = new SqlCommand(sqlHidden, connection);
//SqlDataAdapter hiddenData = new SqlDataAdapter(comHidden);
//hiddenData.Fill(tableHidden);
//result.Data.hiddenRectify = HiddenRectifyData(tableHidden);
//各事项排名前三 //各事项排名前三
string sqlTask = "select * from vhome_task_data_result "; //string sqlTask = "select * from vhome_task_data_result ";
SqlCommand comTask = new SqlCommand(sqlTask, connection); //SqlCommand comTask = new SqlCommand(sqlTask, connection);
SqlDataAdapter taskData = new SqlDataAdapter(comTask); //SqlDataAdapter taskData = new SqlDataAdapter(comTask);
taskData.Fill(tableTask); //taskData.Fill(tableTask);
result.Data.taskTop3 = TaskTopData(tableTask); //result.Data.taskTop3 = TaskTopData(tableTask);
//作业现场完成情况统计 //作业现场完成情况统计
string sqlJobRate = "select * from vhome_jobrecord_data "; //string sqlJobRate = "select * from vhome_jobrecord_data ";
SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection); //SqlCommand comJobRate = new SqlCommand(sqlJobRate, connection);
SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate); //SqlDataAdapter jobRateData = new SqlDataAdapter(comJobRate);
jobRateData.Fill(tableJobRate); //jobRateData.Fill(tableJobRate);
result.Data.jobFinishRate = jobFinishRateData(tableJobRate); //result.Data.jobFinishRate = jobFinishRateData(tableJobRate);
//各公司安全检查统计 //各公司安全检查统计
string sqlSafecCheck = "select * from vhome_check_total "; //string sqlSafecCheck = "select * from vhome_check_total ";
SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection); //SqlCommand comSafecCheck = new SqlCommand(sqlSafecCheck, connection);
SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck); //SqlDataAdapter safecCheckData = new SqlDataAdapter(comSafecCheck);
safecCheckData.Fill(tableSafeCheck); //safecCheckData.Fill(tableSafeCheck);
result.Data.safeCheckSum = safeCheckSumData(tableSafeCheck); //result.Data.safeCheckSum = safeCheckSumData(tableSafeCheck);
//各公司危险分类统计 //各公司危险分类统计
string sqlLink = "select * from vhome_operationLink_data "; //string sqlLink = "select * from vhome_operationLink_data ";
SqlCommand comLink = new SqlCommand(sqlLink, connection); //SqlCommand comLink = new SqlCommand(sqlLink, connection);
SqlDataAdapter linkData = new SqlDataAdapter(comLink); //SqlDataAdapter linkData = new SqlDataAdapter(comLink);
linkData.Fill(tableLink); //linkData.Fill(tableLink);
result.Data.linkSum = linkSumData(tableLink); //result.Data.linkSum = linkSumData(tableLink);
connection.Close(); connection.Close();
} }
@ -434,7 +477,28 @@ namespace APT.SC.WebApi.Controllers.Api.BI
} }
return result; return result;
} }
/// <summary>
/// 当日工作票统计数量
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public List<JobTodayQty> JobTodayQtyData(DataTable Table)
{
List<JobTodayQty> result = new List<JobTodayQty>();
if (Table != null && Table.Rows.Count > 0)
{
foreach (DataRow item in Table.Rows)
{
result.Add(new JobTodayQty()
{
qty = int.Parse(Table.Rows[0]["QTY"].ToString()) != 0 ? int.Parse(Table.Rows[0]["QTY"].ToString()) : 0,
workTypeId = Guid.Parse(Table.Rows[0]["WORK_PERMIT_TYPE_ID"].ToString()),
name = Table.Rows[0]["NAME"] != null ? Table.Rows[0]["NAME"].ToString() : null
});
}
}
return result;
}
/// <summary> /// <summary>
/// 隐患整改率 /// 隐患整改率
/// </summary> /// </summary>
@ -452,7 +516,26 @@ namespace APT.SC.WebApi.Controllers.Api.BI
} }
return result; return result;
} }
/// <summary>
/// 隐患统计数据
/// </summary>
/// <param name="filter">参数</param>
/// <returns></returns>
public HiddenSummary HiddenSummaryData(DataTable Table)
{
HiddenSummary result = new HiddenSummary();
if (Table != null && Table.Rows.Count > 0)
{
result.majorQty = int.Parse(Table.Rows[0]["majorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["majorQty"].ToString()) : 0;
result.generalQty = int.Parse(Table.Rows[0]["generalQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["generalQty"].ToString()) : 0;
result.unfinishQty = int.Parse(Table.Rows[0]["unfinishQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishQty"].ToString()) : 0;
result.monthMajorQty = int.Parse(Table.Rows[0]["monthMajorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["monthMajorQty"].ToString()) : 0;
result.unfinishMonthMajorQty = int.Parse(Table.Rows[0]["unfinishMonthMajorQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishMonthMajorQty"].ToString()) : 0;
result.monthGeneralQty = int.Parse(Table.Rows[0]["monthGeneralQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["monthGeneralQty"].ToString()) : 0;
result.unfinishMonthGeneralQty = int.Parse(Table.Rows[0]["unfinishMonthGeneralQty"].ToString()) != 0 ? int.Parse(Table.Rows[0]["unfinishMonthGeneralQty"].ToString()) : 0;
}
return result;
}
/// <summary> /// <summary>
/// 各事项排名前三 /// 各事项排名前三
/// </summary> /// </summary>

1404
APT.MicroApi/APT.SC.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff

2
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerHandReportController.cs
View File

@ -115,7 +115,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
//发消息 //发消息
var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0'); var titleName = "隐患确认单(" + depart?.NAME + DateTime.Now.Month.PadLeft(2,'0') + DateTime.Now.Day.PadLeft(2, '0')+")";
if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913") if (orgId.ToString() == "d9871ba8-0eec-9e4a-bb87-7d5a540d8913")
{ {
titleName = "手动隐患上报完善"; titleName = "手动隐患上报完善";

342
APT.MicroApi/APT.SK.WebApi/Controllers/Api/T4/T4Control.cs
View File

File diff suppressed because it is too large Load Diff