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

Compare commits

base: wyw:2cd428e44688dd5a4756ccd3560c6f4dd663f89f
Branches Tags
wyw:master
..
compare: wyw:97e840dd1742091410ad37965f4a9e604ce2bbb3
Branches Tags
wyw:master

No commits in common. "2cd428e44688dd5a4756ccd3560c6f4dd663f89f" and "97e840dd1742091410ad37965f4a9e604ce2bbb3" have entirely different histories.
2cd428e446 ... 97e840dd17

21 changed files with 146460 additions and 289417 deletions
Show Stats Expand all files Collapse all files

139645
APT.Data.Migrations/Migrations/20260506030816_hmr2026050601.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

34
APT.Data.Migrations/Migrations/20260506030816_hmr2026050601.cs
View File

@ -1,34 +0,0 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026050601 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<int>(
name: "ADD_TYPE",
table: "T_SK_CHECK_SET",
type: "int",
nullable: true);
migrationBuilder.AddColumn<bool>(
name: "IS_SEND",
table: "T_SK_CHECK_SET",
type: "bit",
nullable: false,
defaultValue: false);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ADD_TYPE",
table: "T_SK_CHECK_SET");
migrationBuilder.DropColumn(
name: "IS_SEND",
table: "T_SK_CHECK_SET");
}
}
}

6
APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs
View File

@ -78641,9 +78641,6 @@ namespace APT.Data.Migrations.Migrations
.ValueGeneratedOnAdd()
.HasColumnType("uniqueidentifier");
b.Property<int?>("ADD_TYPE")
.HasColumnType("int");
b.Property<int>("CHECK_CYCLE")
.HasColumnType("int");
@ -78683,9 +78680,6 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("IS_DELETED")
.HasColumnType("bit");
b.Property<bool>("IS_SEND")
.HasColumnType("bit");
b.Property<Guid?>("MODIFIER_ID")
.HasColumnType("uniqueidentifier");

1
APT.MS.Data/Mapping/T4/T4Map.cs
View File

@ -13736,7 +13736,6 @@ builder.Ignore(t => t.TYPE_NAME);
builder.Ignore(t => t.DEPART_NAME);
builder.Ignore(t => t.MINE_NAME);
builder.Ignore(t => t.PRODUCTION_UNIT_ID);
builder.Ignore(t => t.USER_ID);
}
}
#endregion

5
APT.MS.Domain/Entities/SK/T_SK_CHECK_SET.cs
View File

@ -83,10 +83,5 @@ namespace APT.MS.Domain.Entities.SK
[Description("是否自动触发")]
public bool IS_AUTO { get; set; } = false;
[Description("来源")]
[EnumName("SKAddTypeEnum")]
public SKAddTypeEnum? ADD_TYPE { get; set; }
[Description("是否触发")]
public bool IS_SEND { get; set; } = false;
}
}

4
APT.MS.Domain/Entities/SK/T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART.cs
View File

@ -112,9 +112,5 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldIngore]
public Guid? PRODUCTION_UNIT_ID { get; set; }
[DataFieldIngore]
public string USER_ID { get; set; }
}
}

7
APT.MS.Domain/Enums/SK/SKEnums.cs
View File

@ -486,11 +486,4 @@ namespace APT.MS.Domain.Enums.SK
[Description("不同意销号")]
NO = 10,
}
public enum SKAddTypeEnum
{
[Description("企业库同步")]
企业库同步 = 0,
[Description("手动新增")]
手动新增 = 1,
}
}

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -36,7 +30,6 @@ namespace APT.BD.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护
/// <summary>
/// HMI资源表维护
@ -146,12 +139,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region Picture-图片资源
/// <summary>
/// 图片资源
@ -261,12 +252,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region PictureFile-资源图片文件
/// <summary>
/// 资源图片文件
@ -376,12 +365,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region Place-区域表
/// <summary>
/// 区域表
@ -489,7 +476,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -502,12 +488,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
}
#endregion
#region ServerInfo-服务器信息表
/// <summary>
/// 服务器信息表
@ -617,12 +601,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region SystemInfo-系统信息表
/// <summary>
/// 系统信息表
@ -732,12 +714,10 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
#region WordTemplate-WORD模板维护
/// <summary>
/// WORD模板维护
@ -847,9 +827,7 @@ namespace APT.BD.WebApi.Controllers.Api
}
#endregion
}

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -36,7 +30,6 @@ namespace APT.BS.WebApi.Controllers.Api
using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表
/// <summary>
/// 检查内容表
@ -146,12 +139,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContents-检查内容
/// <summary>
/// 检查内容
@ -261,12 +252,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentCheckType-检查类型
/// <summary>
/// 检查类型
@ -376,12 +365,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary>
/// 检查内容检查类型子表(关联层级)
@ -491,12 +478,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentHmRiskArea-检查区域
/// <summary>
/// 检查区域
@ -606,12 +591,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckMain-安全检查库
/// <summary>
/// 安全检查库
@ -721,12 +704,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentMainDepartment-安全检查库责任部门
/// <summary>
/// 安全检查库责任部门
@ -836,12 +817,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckContentQuestion-检查问题
/// <summary>
/// 检查问题
@ -951,12 +930,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckMainLaw-检查库法规
/// <summary>
/// 检查库法规
@ -1066,12 +1043,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProject-检查项目
/// <summary>
/// 检查项目
@ -1181,12 +1156,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategory-检查项目分类表
/// <summary>
/// 检查项目分类表
@ -1296,12 +1269,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary>
/// 检查项目分类_检查类型
@ -1411,12 +1382,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary>
/// 检查项目分类_检查区域
@ -1526,12 +1495,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckProjectProjectCategory-检查项目分类
/// <summary>
/// 检查项目分类
@ -1641,12 +1608,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckQuestion-检查问题
/// <summary>
/// 检查问题
@ -1756,12 +1721,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckType-检查类型表
/// <summary>
/// 检查类型表
@ -1868,7 +1831,6 @@ namespace APT.BS.WebApi.Controllers.Api
{
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -1882,12 +1844,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckTypeLevel-检查层级
/// <summary>
/// 检查层级
@ -1997,12 +1957,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region CheckTypeMinetype-检查类型生产单元
/// <summary>
/// 检查类型生产单元
@ -2112,12 +2070,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region DepartmentAreaobject-部门范围
/// <summary>
/// 部门范围
@ -2227,12 +2183,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region OperateLog-操作日志
/// <summary>
/// 操作日志
@ -2342,12 +2296,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSet-制定任务
/// <summary>
/// 制定任务
@ -2457,12 +2409,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetArea-制定任务区域
/// <summary>
/// 制定任务区域
@ -2572,12 +2522,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetDepartmentOut-制定任务排除组织
/// <summary>
/// 制定任务排除组织
@ -2687,12 +2635,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetDepObject-制定任务部门触发范围
/// <summary>
/// 制定任务部门触发范围
@ -2802,12 +2748,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region PlanSetObject-制定任务触发范围
/// <summary>
/// 制定任务触发范围
@ -2917,12 +2861,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskCategory-隐患类别
/// <summary>
/// 隐患类别
@ -3032,12 +2974,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary>
/// 隐患等级最长延期整改天数
@ -3147,12 +3087,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskReason-隐患原因表
/// <summary>
/// 隐患原因表
@ -3262,12 +3200,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmit-隐患上报表
/// <summary>
/// 隐患上报表
@ -3377,12 +3313,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContent-隐患上报明细
/// <summary>
/// 隐患上报明细
@ -3492,12 +3426,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentBack-隐患上报明细退回
/// <summary>
/// 隐患上报明细退回
@ -3607,12 +3539,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDeal-隐患整改记录
/// <summary>
/// 隐患整改记录
@ -3722,12 +3652,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3837,12 +3765,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -3952,12 +3878,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary>
/// 隐患整改验收人签名
@ -4067,12 +3991,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary>
/// 隐患整改责任人签名
@ -4182,12 +4104,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -4297,12 +4217,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentReason-隐患上报明细原因
/// <summary>
/// 隐患上报明细原因
@ -4412,12 +4330,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary>
/// 隐患上报详情待入库
@ -4527,12 +4443,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitDelayApply-延期整改申请
/// <summary>
/// 延期整改申请
@ -4642,12 +4556,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary>
/// 延期整改申请详情
@ -4757,12 +4669,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitFile-检查任务附件表
/// <summary>
/// 检查任务附件表
@ -4872,12 +4782,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitNotice-隐患通知
/// <summary>
/// 隐患通知
@ -4987,12 +4895,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskSubmitNoticePerson-隐患通知
/// <summary>
/// 隐患通知
@ -5102,12 +5008,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region RiskTpm-TPM对接数据
/// <summary>
/// TPM对接数据
@ -5217,12 +5121,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheck-安全检查
/// <summary>
/// 安全检查
@ -5332,12 +5234,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetail-检查明细
/// <summary>
/// 检查明细
@ -5447,12 +5347,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailFile-检查任务明细附件表
/// <summary>
/// 检查任务明细附件表
@ -5562,12 +5460,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailLaw-检查依据
/// <summary>
/// 检查依据
@ -5677,12 +5573,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailQuestion-检查明细问题
/// <summary>
/// 检查明细问题
@ -5792,12 +5686,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailReason-检查明细隐患原因
/// <summary>
/// 检查明细隐患原因
@ -5907,12 +5799,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailReject-检查明细退回
/// <summary>
/// 检查明细退回
@ -6022,12 +5912,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary>
/// 检查明细退回附件
@ -6137,12 +6025,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckDetailUser-检查明细人员
/// <summary>
/// 检查明细人员
@ -6252,12 +6138,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckFile-安全检查文件
/// <summary>
/// 安全检查文件
@ -6367,12 +6251,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckProject-安全检查文件
/// <summary>
/// 安全检查文件
@ -6482,12 +6364,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckProjectCategory-安全检查文件
/// <summary>
/// 安全检查文件
@ -6597,12 +6477,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRecord-检查记录确认
/// <summary>
/// 检查记录确认
@ -6712,12 +6590,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRecordDetail-检查记录确认明细
/// <summary>
/// 检查记录确认明细
@ -6827,12 +6703,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckRiskArea-检查区域
/// <summary>
/// 检查区域
@ -6942,12 +6816,10 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
#region SafeCheckUsersign-检查签名
/// <summary>
/// 检查签名
@ -7057,9 +6929,7 @@ namespace APT.BS.WebApi.Controllers.Api
}
#endregion
}

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -37,7 +31,6 @@ namespace APT.FM.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities;
#region Api-API
/// <summary>
/// API
@ -147,12 +140,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseAdd-企业位置信息
/// <summary>
/// 企业位置信息
@ -262,12 +253,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseEnergy-企业能耗配置信息
/// <summary>
/// 企业能耗配置信息
@ -377,12 +366,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region BaseInfo-企业基本信息
/// <summary>
/// 企业基本信息
@ -492,12 +479,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfig-部门日历配置表
/// <summary>
/// 部门日历配置表
@ -607,12 +592,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary>
/// 部门日历配置明细表
@ -722,12 +705,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary>
/// 部门日历配置班组表
@ -837,12 +818,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCompletion-XX班完成情况统计
/// <summary>
/// XX班完成情况统计
@ -952,12 +931,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentCompletionSort-班组完成情况前十
/// <summary>
/// 班组完成情况前十
@ -1067,12 +1044,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentPost-部门岗位
/// <summary>
/// 部门岗位
@ -1182,12 +1157,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentPostUser-部门岗位人员
/// <summary>
/// 部门岗位人员
@ -1297,12 +1270,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -1412,12 +1383,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentSafeuser-安全员表
/// <summary>
/// 安全员表
@ -1527,12 +1496,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentScheduling-部门排班表
/// <summary>
/// 部门排班表
@ -1642,12 +1609,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary>
/// 排班信息人员明细表
@ -1757,12 +1722,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region DepartmentUser-部门人员表
/// <summary>
/// 部门人员表
@ -1872,12 +1835,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Enum-枚举管理
/// <summary>
/// 枚举管理
@ -1987,12 +1948,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Enums-枚举表单
/// <summary>
/// 枚举表单
@ -2102,12 +2061,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region EnumItem-枚举项
/// <summary>
/// 枚举项
@ -2217,12 +2174,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region EnumType-枚举类别
/// <summary>
/// 枚举类别
@ -2332,12 +2287,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region HiddenDangerRectification-隐患整改完成情况统计
/// <summary>
/// 隐患整改完成情况统计
@ -2447,12 +2400,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region JobActivityCompletion-班组作业完成率统计
/// <summary>
/// 班组作业完成率统计
@ -2562,12 +2513,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region MessageTemplate-短信模板表
/// <summary>
/// 短信模板表
@ -2677,12 +2626,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Monitoring-服务器监听表
/// <summary>
/// 服务器监听表
@ -2792,12 +2739,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Notice-信息通知表
/// <summary>
/// 信息通知表
@ -2907,12 +2852,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region NotificationTask-娑堟伅琛?
/// <summary>
/// 娑堟伅琛?
@ -3022,12 +2965,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3137,12 +3078,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region ParamSet-参数设置表
/// <summary>
/// 参数设置表
@ -3252,12 +3191,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region ParamSetDepartment-组织关联信息
/// <summary>
/// 组织关联信息
@ -3367,12 +3304,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Person-人员信息
/// <summary>
/// 人员信息
@ -3482,12 +3417,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonCertificateFile-证书
/// <summary>
/// 证书
@ -3597,12 +3530,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonEducationFile-学历证
/// <summary>
/// 学历证
@ -3712,12 +3643,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonIdcardFile-身份证
/// <summary>
/// 身份证
@ -3827,12 +3756,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonSkills-技能
/// <summary>
/// 技能
@ -3942,12 +3869,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region PersonWork-工作经历
/// <summary>
/// 工作经历
@ -4057,12 +3982,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RiskLevelProportion-风险等级占比
/// <summary>
/// 风险等级占比
@ -4172,12 +4095,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RiskTypeProportion-风险类别占比
/// <summary>
/// 风险类别占比
@ -4287,12 +4208,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region RoleDepartment-部门权限
/// <summary>
/// 部门权限
@ -4402,12 +4321,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Snapshot-随手拍
/// <summary>
/// 随手拍
@ -4517,12 +4434,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SnapshotFile-随手拍图片
/// <summary>
/// 随手拍图片
@ -4632,12 +4547,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLimit-数据同步次数限制
/// <summary>
/// 数据同步次数限制
@ -4747,12 +4660,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLog-跑批日志表
/// <summary>
/// 跑批日志表
@ -4862,12 +4773,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncLogDetail-跑批日志明细表
/// <summary>
/// 跑批日志明细表
@ -4977,12 +4886,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region SyncUserRule-用户数据同步例外配置
/// <summary>
/// 用户数据同步例外配置
@ -5092,12 +4999,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region Team-班组表
/// <summary>
/// 班组表
@ -5207,12 +5112,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region TeamPerson-班组人员关联信息
/// <summary>
/// 班组人员关联信息
@ -5322,12 +5225,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserDepartment-用户部门关联表
/// <summary>
/// 用户部门关联表
@ -5437,12 +5338,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserPost-宀椾綅鍒楄〃
/// <summary>
/// 宀椾綅鍒楄〃
@ -5552,12 +5451,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserProductionUnit-生产单元
/// <summary>
/// 生产单元
@ -5667,12 +5564,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserProductionUnitSet-生产单元
/// <summary>
/// 生产单元
@ -5782,12 +5677,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserSignFile-签名照片
/// <summary>
/// 签名照片
@ -5897,12 +5790,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserTest-测试多选
/// <summary>
/// 测试多选
@ -6012,12 +5903,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region UserVacationSet-人员休假设置
/// <summary>
/// 人员休假设置
@ -6127,12 +6016,10 @@ using APT.BaseData.Domain.Entities;
}
#endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary>
/// 关键许可工作票完成情况统计
@ -6242,9 +6129,7 @@ using APT.BaseData.Domain.Entities;
}
#endregion
}

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

File diff suppressed because it is too large Load Diff

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -35,7 +29,6 @@ namespace APT.LG.WebApi.Controllers.Api
{
using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表
/// <summary>
/// 表单操作日志表
@ -144,8 +137,6 @@ namespace APT.LG.WebApi.Controllers.Api
}
}
#endregion
}

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -36,7 +30,6 @@ namespace APT.NW.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表
/// <summary>
/// 子企业表
@ -144,7 +137,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter);
}
/// <summary>
/// 获得树形实体数据
/// </summary>
@ -157,12 +149,10 @@ namespace APT.NW.WebApi.Controllers.Api
}
}
#endregion
#region RoleDataPerm-子企业数据权限表
/// <summary>
/// 子企业数据权限表
@ -272,12 +262,10 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
#region RoleMenu-子企业权限表
/// <summary>
/// 子企业权限表
@ -387,9 +375,7 @@ namespace APT.NW.WebApi.Controllers.Api
}
#endregion
}

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

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

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -39,7 +33,6 @@ using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4;
#region Annourcement-公告
/// <summary>
/// 公告
@ -149,12 +142,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AnnourcementFile-公告附件
/// <summary>
/// 公告附件
@ -264,12 +255,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AnnourcementOrg-公告下属公司
/// <summary>
/// 公告下属公司
@ -379,12 +368,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApprovalRole-审批角色
/// <summary>
/// 审批角色
@ -494,12 +481,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Approve-审批流主表
/// <summary>
/// 审批流主表
@ -609,12 +594,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveDetail-审批流子表
/// <summary>
/// 审批流子表
@ -724,12 +707,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveOperationRole-操作角色
/// <summary>
/// 操作角色
@ -839,12 +820,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveRejectConfig-审批驳回配置表
/// <summary>
/// 审批驳回配置表
@ -954,12 +933,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveRoleDepartment-分管部门
/// <summary>
/// 分管部门
@ -1069,12 +1046,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveTemp-审批流模板主表
/// <summary>
/// 审批流模板主表
@ -1184,12 +1159,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ApproveTempDetail-审批流模板子表
/// <summary>
/// 审批流模板子表
@ -1299,12 +1272,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AppVersion-App版本发布
/// <summary>
/// App版本发布
@ -1414,12 +1385,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region AppVersionFile-App包文件
/// <summary>
/// App包文件
@ -1529,12 +1498,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region BiplaySet-播放设置
/// <summary>
/// 播放设置
@ -1644,12 +1611,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Bititle-标语
/// <summary>
/// 标语
@ -1759,12 +1724,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Bivideoimg-图片视频
/// <summary>
/// 图片视频
@ -1874,12 +1837,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region BivideoimgFile-图片视频
/// <summary>
/// 图片视频
@ -1989,12 +1950,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ClientScopes-资源表
/// <summary>
/// 资源表
@ -2104,12 +2063,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region CodeRuleRunLog-编码规则跑批表
/// <summary>
/// 编码规则跑批表
@ -2219,12 +2176,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region ComplaintLog-转办记录表
/// <summary>
/// 转办记录表
@ -2334,12 +2289,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region DataChannel-数据通道
/// <summary>
/// 数据通道
@ -2449,12 +2402,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region DataFrequency-采集频率
/// <summary>
/// 采集频率
@ -2564,12 +2515,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Fddeback-意见反馈
/// <summary>
/// 意见反馈
@ -2679,12 +2628,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FddebackFile-意见反馈附件
/// <summary>
/// 意见反馈附件
@ -2794,12 +2741,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileDb-
/// <summary>
///
@ -2909,12 +2854,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileDbFile-
/// <summary>
///
@ -3024,12 +2967,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FileType-
/// <summary>
///
@ -3139,12 +3080,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeChart-首页：图标区域
/// <summary>
/// 首页：图标区域
@ -3254,12 +3193,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeHmi-首页：HMI区域
/// <summary>
/// 首页：HMI区域
@ -3369,12 +3306,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeRanking-首页：排名区域
/// <summary>
/// 首页：排名区域
@ -3484,12 +3419,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormHomeStatistic-首页：统计区域
/// <summary>
/// 首页：统计区域
@ -3599,12 +3532,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region FormRelation-关联表单配置
/// <summary>
/// 关联表单配置
@ -3714,12 +3645,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region HomeTitle-首页方针
/// <summary>
/// 首页方针
@ -3829,12 +3758,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region MqttConfig-MQTT配置表
/// <summary>
/// MQTT配置表
@ -3944,12 +3871,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region MqttConfigTheme-
/// <summary>
///
@ -4059,12 +3984,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Notice-通知
/// <summary>
/// 通知
@ -4174,12 +4097,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region NoticeFile-
/// <summary>
///
@ -4289,12 +4210,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region PicFilter-图片条件主表
/// <summary>
/// 图片条件主表
@ -4404,12 +4323,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region PicFilterDetail-图片条件子表
/// <summary>
/// 图片条件子表
@ -4519,12 +4436,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region QuestionFeedback-问题反馈表
/// <summary>
/// 问题反馈表
@ -4634,12 +4549,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region QuestionFeedbackFile-问题反馈附件表
/// <summary>
/// 问题反馈附件表
@ -4749,12 +4662,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region Scopes-资源表
/// <summary>
/// 资源表
@ -4864,12 +4775,10 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
#region VersionManage-版本管理表
/// <summary>
/// 版本管理表
@ -4979,9 +4888,7 @@ using APT.BaseData.Domain.Entities.T4;
}
#endregion
}

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

@ -72,11 +72,6 @@ namespace APT.PP.WebApi.Controllers.Api
public Guid? CheckPostId { get; set; }
public List<CheckListDetail> details { get; set; }
public List<CheckListUser> users { get; set; }
}
public class CheckListUser
{
public Guid? USER_ID { get; set; }
}
public class CheckListDetail
{
@ -6034,14 +6029,12 @@ namespace APT.PP.WebApi.Controllers.Api
{
try
{
//var deleteHidIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_HIDDEN>(t => true, new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteSetIds = this.GetEntities<T_SK_CHECK_SET>(t => t.ADD_TYPE == SKAddTypeEnum.企业库同步, new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteConIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => deleteSetIds.Contains(t.CHECK_SET_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteUserIds = this.GetEntities<T_SK_CHECK_SET_USER>(t => deleteSetIds.Contains(t.CHECK_SET_ID), new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteHidIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_HIDDEN>(t => true, new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteConIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => true, new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
var deleteSetIds = this.GetEntities<T_SK_CHECK_SET>(t => true, new BaseFilter(filter.OrgId)).Select(m => m.ID).ToList();
List<T_SK_CHECK_SET> sets = new List<T_SK_CHECK_SET>();
List<T_SK_CHECK_SET_CONTENTS> setContents = new List<T_SK_CHECK_SET_CONTENTS>();
List<T_SK_CHECK_SET_USER> setUsers = new List<T_SK_CHECK_SET_USER>();
//List<T_SK_CHECK_SET_CONTENTS_HIDDEN> setConHiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<T_SK_CHECK_SET_CONTENTS_HIDDEN> setConHiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<CheckListNew> list = new List<CheckListNew>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> conDepartlist = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
@ -6060,8 +6053,6 @@ namespace APT.PP.WebApi.Controllers.Api
var libContentIds = libraryDetails.Select(t => t.ID).ToList();
//检查层级
var contentDeparts = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>(t => !t.IS_DELETED && libContentIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID), new BaseFilter(filter.OrgId), "Nav_CheckType", "Nav_Department").ToList();
var conDepartIds = contentDeparts.Select(t => t.ID).ToList();
var contentDepartUsers = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_USER>(t => !t.IS_DELETED && conDepartIds.Contains(t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID), new BaseFilter(filter.OrgId)).ToList();
//隐患描述
//var contentHiddens = this.GetEntities<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_HIDDEN>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
//辨识岗位
@ -6073,8 +6064,6 @@ namespace APT.PP.WebApi.Controllers.Api
{
foreach (var item in contentDeparts)
{
var departUsers = contentDepartUsers.Where(t => t.ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART_ID == item.ID).Select(m => m.USER_ID).ToList();
var departUserIds = string.Join(",", departUsers);
var conFirst = contents.FirstOrDefault(t => t.ID == item.ENTERPRISE_LIBRARY_DETAIL_CONTENT_ID);
var detailFirst = libraryDetails.FirstOrDefault(t => t.ID == conFirst?.ENTERPRISE_LIBRARY_DETAIL_ID);
var libFirst = librarys.FirstOrDefault(t => t.ID == detailFirst?.ENTERPRISE_LIBRARY_ID);
@ -6101,7 +6090,6 @@ namespace APT.PP.WebApi.Controllers.Api
de.DEPART_NAME = item.Nav_Department?.NAME;
de.POST_ID = item2.POST_ID;
de.POST_NAME = item2.Nav_Post?.NAME;
de.USER_ID = departUserIds;
conDepartlist.Add(de);
}
}
@ -6146,7 +6134,6 @@ namespace APT.PP.WebApi.Controllers.Api
de.DEPART_NAME = item.Nav_Department?.NAME;
de.POST_ID = userInfo?.Nav_Person?.POST_ID;
de.POST_NAME = item.POST_NAME;
de.USER_ID = departUserIds;
conDepartlist.Add(de);
}
}
@ -6195,34 +6182,6 @@ namespace APT.PP.WebApi.Controllers.Api
}
listNew.details = listDetail.GroupBy(n => new { n.RISK_AREA_ID, n.RISK_NAME, n.CHECK_CONTENTS_ID }).Select(g => g.FirstOrDefault()).OrderBy(t => t.RISK_AREA_NAME).ThenBy(m => m.RISK_NAME).ToList();
}
var depatUserIds = conDepartlist.Where(t => t.DEPARTMENT_ID == item.Key.DEPARTMENT_ID && t.CHECK_TYPE_ID == item.Key.CHECK_TYPE_ID && t.CHECK_TYPE == item.Key.CHECK_TYPE && t.CHECK_CYCLE == item.Key.CHECK_CYCLE && t.PRODUCTION_UNIT_ID == item.Key.PRODUCTION_UNIT_ID && t.POST_NAME == item.Key.POST_NAME && t.POST_ID == item.Key.POST_ID).Select(m => m.USER_ID).ToList();
var depatUserIdList = new List<string>();
if (depatUserIds != null && depatUserIds.Any())
{
foreach (var tem in depatUserIds)
{
var tempUsers = tem.Split(",").ToList();
foreach (var tem2 in depatUserIds)
{
if (!string.IsNullOrEmpty(tem2))
{
depatUserIdList.Add(tem2);
}
}
}
depatUserIdList = depatUserIdList.Distinct().ToList();
}
if (depatUserIdList != null && depatUserIdList.Any())
{
List<CheckListUser> listUser = new List<CheckListUser>();
foreach (var tem in depatUserIdList)
{
CheckListUser user = new CheckListUser();
user.USER_ID = Guid.Parse(tem);
listUser.Add(user);
}
listNew.users = listUser.Distinct(m => m.USER_ID).ToList();
}
list.Add(listNew);
}
list = list.OrderBy(y => y.PRODUCTION_UNIT_ID).ThenBy(x => x.Num).ThenBy(n => n.CheckDepart).ToList();
@ -6240,20 +6199,7 @@ namespace APT.PP.WebApi.Controllers.Api
set.CHECK_CYCLE = item.Cycle;
set.CHECK_TYPE = item.DepartType;
set.POST_NAME = item.CheckPost;
set.ADD_TYPE = SKAddTypeEnum.企业库同步;
set.IS_SEND = true;
sets.Add(set);
if (item.users != null && item.users.Any())
{
foreach (var item2 in item.users)
{
T_SK_CHECK_SET_USER user = new T_SK_CHECK_SET_USER();
user.ORG_ID = filter.OrgId;
user.CHECK_SET_ID = set.ID;
user.USER_ID = item2.USER_ID;
setUsers.Add(user);
}
}
if (item.details != null && item.details.Any())
{
var i = 1;
@ -6301,10 +6247,8 @@ namespace APT.PP.WebApi.Controllers.Api
}
UnifiedCommit(() =>
{
//if (deleteHidIds != null && deleteHidIds.Any())
// BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_HIDDEN>(deleteHidIds);
if (deleteUserIds != null && deleteUserIds.Any())
BantchDeleteEntityNoCommit<T_SK_CHECK_SET_USER>(deleteUserIds);
if (deleteHidIds != null && deleteHidIds.Any())
BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_HIDDEN>(deleteHidIds);
if (deleteConIds != null && deleteConIds.Any())
BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS>(deleteConIds);
if (deleteSetIds != null && deleteSetIds.Any())
@ -6313,8 +6257,6 @@ namespace APT.PP.WebApi.Controllers.Api
BantchSaveEntityNoCommit(sets);
if (setContents != null && setContents.Any())
BantchSaveEntityNoCommit(setContents);
if (setUsers != null && setUsers.Any())
BantchSaveEntityNoCommit(setUsers);
//if (setConHiddens != null && setConHiddens.Any())
// BantchSaveEntityNoCommit(setConHiddens);
});
@ -6329,425 +6271,5 @@ namespace APT.PP.WebApi.Controllers.Api
return true;
});
}
/// <summary>
/// 从检查清单触发安全检查通知
/// </summary>
/// <param name="pageFilter"></param>
/// <returns></returns>
[HttpPost, Route("CheckContentSet")]
public JsonActionResult<bool> CheckContentSet([FromBody] KeywordFilter filter)
{
return SafeExecute<bool>(() =>
{
try
{
var dtNow = DateTime.Now;
var year = dtNow.Year;
var month = dtNow.Month;
var day = dtNow.Day;
var week = dtNow.DayOfWeek;
List<T_SK_PLAN_SET> setList = new List<T_SK_PLAN_SET>();
//查配置表，有配才执行
var timeSets = GetEntities<T_SK_PLAN_SET>(i => i.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList();
if (timeSets != null && timeSets.Any())
{
foreach (var set in timeSets)
{
switch (set.CHECK_CYCLE)
{
case SKPLANCHECKFREQUENCYEnum.Year:
if (set.MONTH == month && set.DATA == day)
{
setList.Add(set);
}
break;
case SKPLANCHECKFREQUENCYEnum.HalfYear:
if ((set.MONTH == month && set.DATA == day) || ((set.MONTH + 6) == month && (set.DATA + 183) == day))
{
setList.Add(set);
}
break;
case SKPLANCHECKFREQUENCYEnum.Date:
setList.Add(set);
break;
//case SKPLANCHECKFREQUENCYEnum.Class:
// setList.Add(set);
break;
case SKPLANCHECKFREQUENCYEnum.Week:
if (set.WEEKDATA != null && (int)set.WEEKDATA.Value == (int)week)
{
setList.Add(set);
}
break;
case SKPLANCHECKFREQUENCYEnum.Month:
if (set.DATA == day)
{
setList.Add(set);
}
break;
case SKPLANCHECKFREQUENCYEnum.Quarter:
if (set.MONTH == 1)
{
if ((month == 1 || month == 4 || month == 7 || month == 10) && set.DATA == day)
{
setList.Add(set);
}
}
if (set.MONTH == 2)
{
if ((month == 2 || month == 5 || month == 8 || month == 11) && set.DATA == day)
{
setList.Add(set);
}
}
if (set.MONTH == 3)
{
if ((month == 3 || month == 6 || month == 9 || month == 12) && set.DATA == day)
{
setList.Add(set);
}
}
break;
default:
break;
}
}
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_SECURITY_INSPECTION_NOTICE> safeNotices = new List<T_SK_SECURITY_INSPECTION_NOTICE>();
List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL> safeDetialNotices = new List<T_SK_SECURITY_INSPECTION_NOTICE_DETAIL>();
List<T_SK_SECURITY_INSPECTION_RECORD> records = new List<T_SK_SECURITY_INSPECTION_RECORD>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL> recordDetails = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL>();
List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER> recordDetailUsers = new List<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER>();
List<CheckListNew> list = new List<CheckListNew>();
List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART> conDepartlist = new List<T_SK_ENTERPRISE_LIBRARY_DETAIL_CONTENT_DEPART>();
if (setList != null && setList.Any())
{
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(filter.OrgId), "Nav_User");
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID != null && !t.CODE.Contains("admin") && t.Nav_Person != null, new BaseFilter(filter.OrgId), "Nav_Person.Nav_Post", "Nav_ApproveRole");
var checkCycles = setList.Select(t => t.CHECK_CYCLE).Distinct().ToList();
//检查清单
var sets = this.GetEntities<T_SK_CHECK_SET>(t => !t.IS_DELETED && t.IS_SEND == true, new BaseFilter(filter.OrgId), "Nav_Department").ToList();
var setIds = sets.Select(t => t.ID).ToList();
//子表
var setDetails = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => !t.IS_DELETED && setIds.Contains(t.CHECK_SET_ID), new BaseFilter(filter.OrgId)).ToList();
var setDetailIds = setDetails.Select(t => t.CHECK_CONTENTS_ID).ToList();
//取检查人
var setUsers = this.GetEntities<T_SK_CHECK_SET_USER>(t => !t.IS_DELETED && setIds.Contains(t.CHECK_SET_ID), new BaseFilter(filter.OrgId)).ToList();
//检查内容
var contents = this.GetEntities<T_SK_CHECK_CONTENTS>(t => !t.IS_DELETED && setDetailIds.Contains(t.ID), new BaseFilter(filter.OrgId)).ToList();
var libContentIds = contents.Select(t => t.ID).ToList();
//检查依据
var contentBasics = this.GetEntities<T_SK_CHECK_CONTENTS_BASIC>(t => !t.IS_DELETED && libContentIds.Contains((Guid)t.CHECK_CONTENTS_ID), new BaseFilter(filter.OrgId)).ToList();
//隐患描述
var contentHiddens = this.GetEntities<T_SK_CHECK_QUESTION>(t => !t.IS_DELETED && libContentIds.Contains((Guid)t.CHECK_CONTENTS_ID), new BaseFilter(filter.OrgId)).ToList();
//岗位排查
var checkTypes = this.GetEntities<T_SK_CHECK_TYPE>(t => true, new BaseFilter(filter.OrgId)).ToList();
var checkTypeIds = checkTypes.Where(t => t.NAME == "岗位排查").Select(x => x.ID).ToList();
var productions = this.GetEntities<T_FM_USER_PRODUCTION_UNIT_SET>(t => !t.IS_DELETED, new BaseFilter(filter.OrgId)).ToList();
if (filter.Parameter1 != null)
{
dtNow = DateTime.Parse(filter.Parameter1);
}
//提前一个小时触发
DateTime minTime = dtNow.AddMinutes(0);
DateTime maxTime = dtNow.AddMinutes(60);
var shiftClassList = this.GetEntities<T_FM_DEPARTMENT_SCHEDULING>(s => s.START_TIME >= minTime && s.START_TIME <= maxTime && s.START_TIME != s.END_TIME && s.Nav_Team.ENABLE_STATUS == 0 && s.TEAM_ID != null, new BaseFilter(filter.OrgId), "Nav_DepartmentSchedulingDetail.Nav_Person").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 teamDepartIds = teamInfos.Select(m => m.DEPARTMENT_ID).Distinct().ToList();
//所有有排班的人员
var personIds = new List<Guid>();
if (shiftClassList != null && shiftClassList.Any())
{
foreach (var item in shiftClassList)
{
if (item.Nav_DepartmentSchedulingDetail != null && item.Nav_DepartmentSchedulingDetail.Any())
{
var ids = item.Nav_DepartmentSchedulingDetail.Select(t => t.PERSON_ID).Distinct().ToList();
personIds.AddRange(ids);
}
}
}
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE", "CREATE_TIME" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && (i.CREATE_TIME.Value.Date == dtNow.Date || i.CREATE_TIME.Value.Date == dtNow.AddDays(-1).Date);
List<T_SK_SECURITY_INSPECTION_NOTICE> noticeExsiss = this.GetOrderEntities(expression, baseFilter).ToList();
baseFilter.SelectField = new string[] { "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID", "APPLY_DEPARTMENT_ID", "APPLY_USER_ID", "PLANCHECKFREQUENCY", "DEPARTMENT_TYPE", "CREATE_TIME" };
Expression<Func<T_SK_SECURITY_INSPECTION_RECORD, bool>> expressionR = i => i.IS_DELETED == false && (i.CREATE_TIME.Value.Date == dtNow.Date || i.CREATE_TIME.Value.Date == dtNow.AddDays(-1).Date);
List<T_SK_SECURITY_INSPECTION_RECORD> recordExsiss = this.GetOrderEntities(expressionR, baseFilter).ToList();
//查有没有休假代理人
var userVacations = this.GetEntities<T_FM_USER_VACATION_SET>(t => t.START_DATE <= dtNow && t.END_DATE >= dtNow, new BaseFilter(filter.GetOrgId()), "Nav_Agent");
//检查清单
if (sets != null && sets.Any())
{
foreach (var item in sets)
{
var departInfo = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID);
var userIds = setUsers.Where(t => t.CHECK_SET_ID == item.ID && t.USER_ID != null).Select(m => (Guid)m.USER_ID).Distinct().ToList();
//触发岗位排查
if (item.CHECK_TYPE_ID != null && checkTypeIds.Contains((Guid)item.CHECK_TYPE_ID))
{
//找检查人
if (userIds == null || !userIds.Any())
{
//没有检查人，根据岗位触发给对应的人，班组级要判断排班
if (item.POST_ID != null)
{
userIds = users.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.Nav_Person != null && t.Nav_Person.POST_ID == item.POST_ID).Select(m => m.ID).ToList();
}
}
//班组级要判断排班
if (departInfo.DEPARTMENT_TYPE == 2)
{
userIds = users.Where(t => userIds.Contains(t.ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList();
}
userIds = userIds.Distinct().ToList();
if (userIds != null && userIds.Any())
{
foreach (var userId in userIds)
{
//取排班
var teamFirst = teamInfos.FirstOrDefault(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID);
var sche = shiftClassList.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);
//触发安全检查记录给对应的岗位工(有排班才触发)
var userInfo = users.FirstOrDefault(t => t.ID == userId);
if (userInfo != null && sche != null)
{
var startTime = sche.START_TIME.AddHours(-1.5);
var startDate = sche.START_TIME.Date.AddDays(-1);
//判断是否重复触发
var exist = recordExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == item.DEPARTMENT_ID && t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE && t.CHECK_TYPE_ID == item.CHECK_TYPE_ID && t.PLANCHECKFREQUENCY == item.CHECK_CYCLE && t.CREATE_TIME.Value.Date == sche.START_TIME.Date);
if (sche.START_TIME.Date != sche.END_TIME.Date)//跨天
{
recordExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == item.DEPARTMENT_ID && t.APPLY_USER_ID == userInfo.ID && t.DEPARTMENT_TYPE == (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE && t.CHECK_TYPE_ID == item.CHECK_TYPE_ID && t.PLANCHECKFREQUENCY == item.CHECK_CYCLE && t.CREATE_TIME >= startTime && (t.CREATE_TIME.Value.Date == sche.START_TIME.Date || t.CREATE_TIME.Value.Date == startDate));
}
//触发岗位排查表
if (exist == null)
{
T_SK_SECURITY_INSPECTION_RECORD record = new T_SK_SECURITY_INSPECTION_RECORD();
record.ORG_ID = filter.OrgId;
record.APPLY_DEPARTMENT_ID = item.DEPARTMENT_ID;
record.APPLY_USER_ID = userInfo.ID;
record.RECORD_USER_ID = userInfo.ID;
record.CHECK_PERSON = userInfo.NAME;
record.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
record.CHECK_TYPE_ID = item.CHECK_TYPE_ID;
record.PLANCHECKFREQUENCY = item.CHECK_CYCLE;
record.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE;
record.STATUS = PFStandardStatus.Draft;
record.ISAUTO = true;
record.NOTICE_CODE = "GWPC" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
records.Add(record);
var details = setDetails.Where(t => t.CHECK_CONTENTS_ID == item.ID).ToList();
if (details != null && details.Any())
{
foreach (var item2 in details)
{
var i = 1;
//var repeat = safeDetialNotices.FirstOrDefault(t => t.SECURITY_INSPECTION_NOTICE_ID == safeNotice.ID && t.RISK_AREA_ID == item2.AREA_ID && t.CHECK_CONTENTS_ID == item2.CHECK_CONTENTS_ID);
//if (repeat == null)
{
T_SK_SECURITY_INSPECTION_RECORD_DETAIL detail = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL();
detail.ORG_ID = filter.OrgId;
detail.SECURITY_INSPECTION_RECORD_ID = record.ID;
detail.RISK_AREA_ID = item2.AREA_ID;
detail.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
detail.CHECKCONTENT = item2.CHECK_CONTENT;
detail.CHECKSTANDARD = item2.CHECK_STANDARD;
detail.NUM = i;
recordDetails.Add(detail);
i++;
T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER deUser = new T_SK_SECURITY_INSPECTION_RECORD_DETAIL_USER();
deUser.ORG_ID = filter.OrgId;
deUser.SECURITY_INSPECTION_RECORD_DETAIL_ID = detail.ID;
deUser.USER_ID = userInfo.ID;
deUser.ISMAINCHECK = true;
recordDetailUsers.Add(deUser);
}
}
}
var date = DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.AddHours(4).Day.PadLeft(2, '0');
var endtime = DateTime.Now.AddHours(24);
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Week)
{
endtime = DateTime.Now.AddDays(7);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Month)
{
endtime = DateTime.Now.AddMonths(1);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.HalfYear)
{
endtime = DateTime.Now.AddMonths(6);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Year)
{
endtime = DateTime.Now.AddMonths(12);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Quarter)
{
endtime = DateTime.Now.AddMonths(3);
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(userInfo.Nav_Person?.Nav_Post?.NAME + "岗位排查记录" + date, record.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK010");
notices.Add(notice);
}
}
}
}
}
else
{
//找检查人
if (userIds == null || !userIds.Any())
{
//没有检查人，根据审批角色触发给对应的人，班组级要判断排班
if (!string.IsNullOrEmpty(item.POST_NAME))
{
userIds = users.Where(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.POST_NAME).Select(m => m.ID).ToList();
if (userIds == null || !userIds.Any())
{
//没有安全员，找部门表负责人字段
var depart = departs.FirstOrDefault(t => t.ID == item.DEPARTMENT_ID && t.USER_ID != null);
if (depart != null)
{
userIds = new List<Guid>();
userIds.Add((Guid)depart.USER_ID);
}
}
}
}
//班组级要判断排班
if (departInfo?.DEPARTMENT_TYPE == 2)
{
var userTempIds = users.Where(t => userIds.Contains(t.ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)).Select(m => m.ID).ToList();
if (userTempIds == null || !userTempIds.Any())
{
//查代理人
userIds = userVacations.Where(t => t.USER_ID != null && t.AGENT_ID != null && userIds.Contains((Guid)t.USER_ID)).Select(m => (Guid)m.AGENT_ID).ToList();
}
}
userIds = userIds.Distinct().ToList();
if (userIds != null && userIds.Any())
{
foreach (var userId in userIds)
{
var setTime = setList.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.CHECK_CYCLE == item.CHECK_CYCLE);
//判断是否重复触发
var exist = noticeExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == item.DEPARTMENT_ID && t.DEPARTMENT_TYPE == (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE && t.CHECK_TYPE_ID == item.CHECK_TYPE_ID && t.PLANCHECKFREQUENCY == item.CHECK_CYCLE && t.CREATE_TIME.Value.Date == dtNow.Date);
//如果是大夜班，跨天的情况下再判断一次，如果存在，就表示今天已触发，只是创建日期是昨天
if (item.POST_NAME == "班组负责人")
{
//取排班
var teamFirst = teamInfos.FirstOrDefault(t => t.DEPARTMENT_ID == item.DEPARTMENT_ID);
var sche = shiftClassList.FirstOrDefault(t => t.TEAM_ID == teamFirst?.ID);
if (sche != null)
{
var startTime = sche.START_TIME.AddHours(-1.5);
var startDate = sche.START_TIME.Date.AddDays(-1);
if (sche.START_TIME.Date != sche.END_TIME.Date || (sche.START_TIME.Date == sche.END_TIME.Date && sche.START_TIME == sche.START_TIME.Date))//跨天
{
exist = noticeExsiss.FirstOrDefault(t => t.APPLY_DEPARTMENT_ID == item.DEPARTMENT_ID && t.DEPARTMENT_TYPE == (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE && t.CHECK_TYPE_ID == item.CHECK_TYPE_ID && t.PLANCHECKFREQUENCY == item.CHECK_CYCLE && t.CREATE_TIME >= startTime && (t.CREATE_TIME.Value.Date == sche.START_TIME.Date || t.CREATE_TIME.Value.Date == startDate));
}
}
}
if ((exist == null && item.POST_NAME == "班组负责人") || (exist == null && item.POST_NAME != "班组负责人" && setTime != null && dtNow.Hour == setTime.CHECKTIME.Value.Hour))
{
T_SK_SECURITY_INSPECTION_NOTICE safeNotice = new T_SK_SECURITY_INSPECTION_NOTICE();
safeNotice.ORG_ID = filter.OrgId;
safeNotice.APPLY_DEPARTMENT_ID = item.DEPARTMENT_ID;
safeNotice.APPLY_USER_ID = userId;
safeNotice.PRODUCTION_UNIT_ID = item.PRODUCTION_UNIT_ID;
safeNotice.CHECK_TYPE_ID = item.CHECK_TYPE_ID;
safeNotice.PLANCHECKFREQUENCY = item.CHECK_CYCLE;
safeNotice.DEPARTMENT_TYPE = (SKDepartmentTypeEnum)departInfo?.DEPARTMENT_TYPE;
safeNotice.STATUS = PFStandardStatus.Draft;
safeNotice.ISAUTO = true;
safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
safeNotices.Add(safeNotice);
var details = setDetails.Where(t => t.CHECK_CONTENTS_ID == item.ID).ToList();
if (details != null && details.Any())
{
foreach (var item2 in details)
{
var i = 1;
//var repeat = safeDetialNotices.FirstOrDefault(t => t.SECURITY_INSPECTION_NOTICE_ID == safeNotice.ID && t.RISK_AREA_ID == item2.AREA_ID && t.CHECK_CONTENTS_ID == item2.CHECK_CONTENTS_ID);
//if (repeat == null)
{
T_SK_SECURITY_INSPECTION_NOTICE_DETAIL detail = new T_SK_SECURITY_INSPECTION_NOTICE_DETAIL();
detail.ORG_ID = filter.OrgId;
detail.SECURITY_INSPECTION_NOTICE_ID = safeNotice.ID;
detail.RISK_AREA_ID = item2.AREA_ID;
detail.CHECK_CONTENTS_ID = item2.CHECK_CONTENTS_ID;
detail.CHECKCONTENT = item2.CHECK_CONTENT;
detail.CHECKSTANDARD = item2.CHECK_STANDARD;
detail.NUM = i;
safeDetialNotices.Add(detail);
}
}
}
var date = DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.AddHours(4).Day.PadLeft(2, '0');
var endtime = DateTime.Now.AddHours(24);
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Week)
{
endtime = DateTime.Now.AddDays(7);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Month)
{
endtime = DateTime.Now.AddMonths(1);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.HalfYear)
{
endtime = DateTime.Now.AddMonths(6);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Year)
{
endtime = DateTime.Now.AddMonths(12);
}
if (item.CHECK_CYCLE == SKPLANCHECKFREQUENCYEnum.Quarter)
{
endtime = DateTime.Now.AddMonths(3);
}
var userName = users.FirstOrDefault(t => t.ID == userId)?.NAME;
var typeName = checkTypes.FirstOrDefault(t => t.ID == item.CHECK_TYPE_ID)?.NAME;
var mineName = productions.FirstOrDefault(t => t.ID == item.PRODUCTION_UNIT_ID)?.NAME;
var notice = NotificationTaskService.InsertUserNoticeTaskModel(mineName + typeName + date, safeNotice.ID, filter.OrgId, userId, userName, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
notices.Add(notice);
}
}
}
}
}
}
}
UnifiedCommit(() =>
{
if (notices != null && notices.Any())
BantchSaveEntityNoCommit(notices);
if (safeNotices != null && safeNotices.Any())
BantchSaveEntityNoCommit(safeNotices);
if (safeDetialNotices != null && safeDetialNotices.Any())
BantchSaveEntityNoCommit(safeDetialNotices);
if (records != null && records.Any())
BantchSaveEntityNoCommit(records);
if (recordDetails != null && recordDetails.Any())
BantchSaveEntityNoCommit(recordDetails);
if (recordDetailUsers != null && recordDetailUsers.Any())
BantchSaveEntityNoCommit(recordDetailUsers);
});
}
catch (Exception ex)
{
if (!string.IsNullOrEmpty(ex.StackTrace))
throw new Exception("错误日志：[StackTrace]" + ex.StackTrace);
else
throw new Exception("【" + HttpContext.Request.Path + "】错误日志：[Message]" + ex.Message);
}
return true;
});
}
}
}

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

@ -13,12 +13,6 @@
//------------------------------------------------------------------------------
// T4模板文件：基础接口类
@ -34,5 +28,4 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.PP.WebApi.Controllers.Api
{
}

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

File diff suppressed because it is too large Load Diff

138
APT.MicroApi/APT.SK.WebApi/Controllers/Api/CheckSetController.cs
View File

@ -55,9 +55,9 @@ namespace APT.SK.WebApi.Controllers.Api
{
return SafeExecute<bool>(() =>
{
//List<T_SK_CHECK_SET_CONTENTS_HIDDEN> hiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
//List<T_SK_CHECK_SET_CONTENTS_BASIC> basics = new List<T_SK_CHECK_SET_CONTENTS_BASIC>();
List<T_SK_CHECK_SET_USER> checkUserList = new List<T_SK_CHECK_SET_USER>();
List<T_SK_CHECK_SET_CONTENTS_HIDDEN> hiddens = new List<T_SK_CHECK_SET_CONTENTS_HIDDEN>();
List<T_SK_CHECK_SET_CONTENTS_BASIC> basics = new List<T_SK_CHECK_SET_CONTENTS_BASIC>();
List<T_SK_CHECK_SET_USER> users = new List<T_SK_CHECK_SET_USER>();
//List<T_SK_CHECK_SET_CONTENTS_AREA> areas = new List<T_SK_CHECK_SET_CONTENTS_AREA>();
//List<T_SK_CHECK_SET_CONTENTS_AREA_RISK> risks = new List<T_SK_CHECK_SET_CONTENTS_AREA_RISK>();
var details = entity.Nav_CheckSetContents;
@ -66,98 +66,48 @@ namespace APT.SK.WebApi.Controllers.Api
entity.Nav_CheckUsers = null;
List<Guid> detailIds = new List<Guid>();
List<Guid> deleteCheckUserIds = new List<Guid>();
//List<Guid> basicIds = new List<Guid>();
List<Guid> basicIds = new List<Guid>();
deleteCheckUserIds = this.GetEntities<T_SK_CHECK_SET_USER>(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
detailIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS>(t => t.CHECK_SET_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//basicIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_BASIC>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
basicIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_BASIC>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
//hiddenIds = this.GetEntities<T_SK_CHECK_SET_CONTENTS_HIDDEN>(t => detailIds.Contains(t.CHECK_CONTENTS_SET_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_Person", "Nav_ApproveRole");
if (entity.DEPARTMENT_ID == null)
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.PRODUCTION_UNIT_ID == entity.PRODUCTION_UNIT_ID && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID);
if (record != null)
{
throw new Exception("检查部门不能为空");
}
if (entity.ADD_TYPE == null)
{
entity.ADD_TYPE = SKAddTypeEnum.手动新增;
}
if (checkUsers != null)
{
checkUsers = checkUsers.Where(t => !t.IS_DELETED).ToList();
throw new Exception("相同检查已存在，请修改检查信息或回到列表页检索");
}
if (checkUsers != null && checkUsers.Any())
{
foreach (var item in checkUsers)
{
T_SK_CHECK_SET_USER u = new T_SK_CHECK_SET_USER();
u.ORG_ID = entity.ORG_ID;
u.CHECK_SET_ID = entity.ID;
u.USER_ID = item.USER_ID;
checkUserList.Add(u);
}
if (checkUserList != null && checkUserList.Any())
{
var userIds = checkUserList.Select(t => t.USER_ID).Distinct().ToList();
var departIds = users.Where(t => userIds.Contains(t.ID) && t.DEPARTMENT_ID != null).Select(m => m.DEPARTMENT_ID).Distinct().ToList();
if (departIds.Count > 1)
{
throw new Exception("检查人员只能是相同组织架构，请删除不同部门人员");
}
var userPostIds = users.Where(t => userIds.Contains(t.ID) && t.Nav_Person != null && t.Nav_Person.POST_ID != null).Select(m => m.Nav_Person.POST_ID).Distinct().ToList();
if (userPostIds.Count > 1)
{
throw new Exception("检查人员只能是相同岗位，请删除不同岗位人员");
}
var userPost = users.FirstOrDefault(t => userIds.Contains(t.ID) && t.Nav_Person != null);
entity.POST_ID = userPost?.Nav_Person?.POST_ID;
var userNames = users.Where(t => userIds.Contains(t.ID)).Select(m => m.NAME).Distinct().ToList();
entity.POST_NAME = string.Join(",", userNames);
}
checkUsers = checkUsers.Where(t => !t.IS_DELETED).ToList();
checkUsers.ForEach(t => t.Nav_User = null);
}
else
{
//默认当前层级安全员，没有就找负责人
var userPost = users.FirstOrDefault(t => t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员") && t.Nav_Person != null);
if (userPost != null)
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID == departId && t.Nav_Person!=null && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (userInfo == null)
{
entity.POST_ID = userPost?.Nav_Person?.POST_ID;
entity.POST_NAME = userPost?.Nav_ApproveRole?.NAME;
userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID == departId && t.Nav_Person != null && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
else
if (userInfo == null)
{
var departPost = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == entity.DEPARTMENT_ID && t.Nav_User != null && t.Nav_User.Nav_Person != null);
if (departPost != null)
var departUser = this.GetEntity<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.ID == departId)?.USER_ID;
if(departUser!=null)
userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.ID == departUser && t.Nav_Person != null);
}
if (userInfo != null)
{
entity.POST_ID = departPost?.Nav_User?.Nav_Person?.POST_ID;
if (departPost?.Nav_User?.Nav_ApproveRole != null)
{
entity.POST_NAME = departPost?.Nav_User?.Nav_ApproveRole?.NAME;
T_SK_CHECK_SET_USER newUser = new T_SK_CHECK_SET_USER();
newUser.ORG_ID = entity.ORG_ID;
newUser.USER_ID = userInfo.ID;
newUser.CHECK_SET_ID = entity.ID;
checkUsers = new List<T_SK_CHECK_SET_USER>();
checkUsers.Add(newUser);
entity.POST_ID = userInfo.Nav_Person?.POST_ID;
}
else
{
if (departPost.DEPARTMENT_TYPE == 0)
{
entity.POST_NAME = "部门安全员";
}
if (departPost.DEPARTMENT_TYPE == 1)
{
entity.POST_NAME = "车间安全员";
}
if (departPost.DEPARTMENT_TYPE == 2)
{
entity.POST_NAME = "班组负责人";
}
if (departPost.DEPARTMENT_TYPE == 3)
{
entity.POST_NAME = "安环部安全员";
}
}
}
}
}
var record = this.GetEntity<T_SK_CHECK_SET>(t => t.ID != entity.ID && t.MineType == entity.MineType && t.CHECK_TYPE == entity.CHECK_TYPE && t.CHECK_TYPE_ID == entity.CHECK_TYPE_ID && t.CHECK_CYCLE == entity.CHECK_CYCLE && t.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.POST_ID == entity.POST_ID);
if (record != null)
{
throw new Exception("相同检查表已存在，请修改检查信息或回到列表页检索");
//throw new Exception("检查人员必须填写");
}
if (details != null && details.Any())
{
@ -175,15 +125,15 @@ namespace APT.SK.WebApi.Controllers.Api
// //conHiddenIds.Add(item2.CHECK_QUESTION_ID);
// }
//}
//if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any())
//{
// foreach (var item2 in item.Nav_ContentsBasics)
// {
// item2.ORG_ID = entity.ORG_ID;
// item2.CHECK_CONTENTS_SET_ID = item.ID;
// basics.Add(item2);
// }
//}
if (item.Nav_ContentsBasics != null && item.Nav_ContentsBasics.Any())
{
foreach (var item2 in item.Nav_ContentsBasics)
{
item2.ORG_ID = entity.ORG_ID;
item2.CHECK_CONTENTS_SET_ID = item.ID;
basics.Add(item2);
}
}
//if (item.Nav_ContentsAreas != null && item.Nav_ContentsAreas.Any())
//{
@ -473,8 +423,8 @@ namespace APT.SK.WebApi.Controllers.Api
details.ForEach(t => { t.Nav_ContentsHiddens = null; t.Nav_ContentsBasics = null; });
this.UnifiedCommit(() =>
{
//if (basicIds != null && basicIds.Any())
// this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_BASIC>(basicIds);
if (basicIds != null && basicIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_CONTENTS_BASIC>(basicIds);
if (deleteCheckUserIds != null && deleteCheckUserIds.Any())
this.BantchDeleteEntityNoCommit<T_SK_CHECK_SET_USER>(deleteCheckUserIds);
if (detailIds != null && detailIds.Any())
@ -485,10 +435,10 @@ namespace APT.SK.WebApi.Controllers.Api
BantchSaveEntityNoCommit(checkUsers);
if (details != null && details.Any())
BantchSaveEntityNoCommit(details);
//if (hiddens != null && hiddens.Any())
// BantchSaveEntityNoCommit(hiddens);
//if (basics != null && basics.Any())
// BantchSaveEntityNoCommit(basics);
if (hiddens != null && hiddens.Any())
BantchSaveEntityNoCommit(hiddens);
if (basics != null && basics.Any())
BantchSaveEntityNoCommit(basics);
//if (areas != null && areas.Any())
// BantchSaveEntityNoCommit(areas);
//if (risks != null && risks.Any())

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

File diff suppressed because it is too large Load Diff