Compare commits
No commits in common. "17168d6dfea126611ff9cb6787a045da4941208d" and "a98e39fd28c6c6ed6fd9ccd08a4a6d072c8fee67" have entirely different histories.
17168d6dfe
...
a98e39fd28
@ -172,10 +172,6 @@ namespace APT.BaseData.Domain.Entities.FM
|
||||
[FormFieldTable]
|
||||
[FormFieldQuery]
|
||||
public DateTime? DEPARTURETIME { get; set; }
|
||||
|
||||
[Description("出生日期")]
|
||||
[FormFieldEdit]
|
||||
public DateTime? BORN_DATE { get; set; }
|
||||
/// <summary>
|
||||
/// 班组
|
||||
/// </summary>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,24 +0,0 @@
|
||||
using System;
|
||||
using Microsoft.EntityFrameworkCore.Migrations;
|
||||
|
||||
namespace APT.Data.Migrations.Migrations
|
||||
{
|
||||
public partial class hmr2025110702 : Migration
|
||||
{
|
||||
protected override void Up(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.AddColumn<DateTime>(
|
||||
name: "BORN_DATE",
|
||||
table: "T_FM_USER",
|
||||
type: "datetime2",
|
||||
nullable: true);
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
migrationBuilder.DropColumn(
|
||||
name: "BORN_DATE",
|
||||
table: "T_FM_USER");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -6744,9 +6744,6 @@ namespace APT.Data.Migrations.Migrations
|
||||
b.Property<Guid?>("APPROVE_ROLE_ID")
|
||||
.HasColumnType("uniqueidentifier");
|
||||
|
||||
b.Property<DateTime?>("BORN_DATE")
|
||||
.HasColumnType("datetime2");
|
||||
|
||||
b.Property<string>("CODE")
|
||||
.IsRequired()
|
||||
.HasMaxLength(50)
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.BD.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.BD;
|
||||
|
||||
#region Hmi-HMI资源表维护
|
||||
/// <summary>
|
||||
/// HMI资源表维护
|
||||
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Picture-图片资源
|
||||
/// <summary>
|
||||
/// 图片资源
|
||||
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PictureFile-资源图片文件
|
||||
/// <summary>
|
||||
/// 资源图片文件
|
||||
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Place-区域表
|
||||
/// <summary>
|
||||
/// 区域表
|
||||
@ -462,8 +449,7 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
/// <param name="filter"></param>
|
||||
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ServerInfo-服务器信息表
|
||||
/// <summary>
|
||||
/// 服务器信息表
|
||||
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SystemInfo-系统信息表
|
||||
/// <summary>
|
||||
/// 系统信息表
|
||||
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region WordTemplate-WORD模板维护
|
||||
/// <summary>
|
||||
/// WORD模板维护
|
||||
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.BS.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.MS.Domain.Entities.BS;
|
||||
|
||||
#region CheckContent-检查内容表
|
||||
/// <summary>
|
||||
/// 检查内容表
|
||||
@ -130,10 +123,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContents-检查内容
|
||||
/// <summary>
|
||||
/// 检查内容
|
||||
@ -241,10 +232,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentCheckType-检查类型
|
||||
/// <summary>
|
||||
/// 检查类型
|
||||
@ -352,10 +341,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
|
||||
/// <summary>
|
||||
/// 检查内容检查类型子表(关联层级)
|
||||
@ -463,10 +450,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentHmRiskArea-检查区域
|
||||
/// <summary>
|
||||
/// 检查区域
|
||||
@ -574,10 +559,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckMain-安全检查库
|
||||
/// <summary>
|
||||
/// 安全检查库
|
||||
@ -685,10 +668,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentMainDepartment-安全检查库责任部门
|
||||
/// <summary>
|
||||
/// 安全检查库责任部门
|
||||
@ -796,10 +777,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckContentQuestion-检查问题
|
||||
/// <summary>
|
||||
/// 检查问题
|
||||
@ -907,10 +886,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckMainLaw-检查库法规
|
||||
/// <summary>
|
||||
/// 检查库法规
|
||||
@ -1018,10 +995,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProject-检查项目
|
||||
/// <summary>
|
||||
/// 检查项目
|
||||
@ -1129,10 +1104,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategory-检查项目分类表
|
||||
/// <summary>
|
||||
/// 检查项目分类表
|
||||
@ -1240,10 +1213,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategoryChecktype-检查项目分类_检查类型
|
||||
/// <summary>
|
||||
/// 检查项目分类_检查类型
|
||||
@ -1351,10 +1322,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectCategoryObject-检查项目分类_检查区域
|
||||
/// <summary>
|
||||
/// 检查项目分类_检查区域
|
||||
@ -1462,10 +1431,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckProjectProjectCategory-检查项目分类
|
||||
/// <summary>
|
||||
/// 检查项目分类
|
||||
@ -1573,10 +1540,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckQuestion-检查问题
|
||||
/// <summary>
|
||||
/// 检查问题
|
||||
@ -1684,10 +1649,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckType-检查类型表
|
||||
/// <summary>
|
||||
/// 检查类型表
|
||||
@ -1794,8 +1757,7 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
/// <param name="filter"></param>
|
||||
@ -1806,10 +1768,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckTypeLevel-检查层级
|
||||
/// <summary>
|
||||
/// 检查层级
|
||||
@ -1917,10 +1877,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CheckTypeMinetype-检查类型生产单元
|
||||
/// <summary>
|
||||
/// 检查类型生产单元
|
||||
@ -2028,10 +1986,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentAreaobject-部门范围
|
||||
/// <summary>
|
||||
/// 部门范围
|
||||
@ -2139,10 +2095,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region OperateLog-操作日志
|
||||
/// <summary>
|
||||
/// 操作日志
|
||||
@ -2250,10 +2204,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSet-制定任务
|
||||
/// <summary>
|
||||
/// 制定任务
|
||||
@ -2361,10 +2313,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetArea-制定任务区域
|
||||
/// <summary>
|
||||
/// 制定任务区域
|
||||
@ -2472,10 +2422,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetDepartmentOut-制定任务排除组织
|
||||
/// <summary>
|
||||
/// 制定任务排除组织
|
||||
@ -2583,10 +2531,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetDepObject-制定任务部门触发范围
|
||||
/// <summary>
|
||||
/// 制定任务部门触发范围
|
||||
@ -2694,10 +2640,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PlanSetObject-制定任务触发范围
|
||||
/// <summary>
|
||||
/// 制定任务触发范围
|
||||
@ -2805,10 +2749,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskCategory-隐患类别
|
||||
/// <summary>
|
||||
/// 隐患类别
|
||||
@ -2916,10 +2858,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskLevelDelayDays-隐患等级最长延期整改天数
|
||||
/// <summary>
|
||||
/// 隐患等级最长延期整改天数
|
||||
@ -3027,10 +2967,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskReason-隐患原因表
|
||||
/// <summary>
|
||||
/// 隐患原因表
|
||||
@ -3138,10 +3076,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmit-隐患上报表
|
||||
/// <summary>
|
||||
/// 隐患上报表
|
||||
@ -3249,10 +3185,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContent-隐患上报明细
|
||||
/// <summary>
|
||||
/// 隐患上报明细
|
||||
@ -3360,10 +3294,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentBack-隐患上报明细退回
|
||||
/// <summary>
|
||||
/// 隐患上报明细退回
|
||||
@ -3471,10 +3403,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDeal-隐患整改记录
|
||||
/// <summary>
|
||||
/// 隐患整改记录
|
||||
@ -3582,10 +3512,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealAfterFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -3693,10 +3621,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -3804,10 +3730,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
|
||||
/// <summary>
|
||||
/// 隐患整改验收人签名
|
||||
@ -3915,10 +3839,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentDealUsersign-隐患整改责任人签名
|
||||
/// <summary>
|
||||
/// 隐患整改责任人签名
|
||||
@ -4026,10 +3948,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentFile-检查任务明细附件表
|
||||
/// <summary>
|
||||
/// 检查任务明细附件表
|
||||
@ -4137,10 +4057,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentReason-隐患上报明细原因
|
||||
/// <summary>
|
||||
/// 隐患上报明细原因
|
||||
@ -4248,10 +4166,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitContentTemp-隐患上报详情待入库
|
||||
/// <summary>
|
||||
/// 隐患上报详情待入库
|
||||
@ -4359,10 +4275,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitDelayApply-延期整改申请
|
||||
/// <summary>
|
||||
/// 延期整改申请
|
||||
@ -4470,10 +4384,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitDelayApplyDetail-延期整改申请详情
|
||||
/// <summary>
|
||||
/// 延期整改申请详情
|
||||
@ -4581,10 +4493,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitFile-检查任务附件表
|
||||
/// <summary>
|
||||
/// 检查任务附件表
|
||||
@ -4692,10 +4602,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitNotice-隐患通知
|
||||
/// <summary>
|
||||
/// 隐患通知
|
||||
@ -4803,10 +4711,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskSubmitNoticePerson-隐患通知
|
||||
/// <summary>
|
||||
/// 隐患通知
|
||||
@ -4914,10 +4820,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskTpm-TPM对接数据
|
||||
/// <summary>
|
||||
/// TPM对接数据
|
||||
@ -5025,10 +4929,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheck-安全检查
|
||||
/// <summary>
|
||||
/// 安全检查
|
||||
@ -5136,10 +5038,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetail-检查明细
|
||||
/// <summary>
|
||||
/// 检查明细
|
||||
@ -5247,10 +5147,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailFile-检查任务明细附件表
|
||||
/// <summary>
|
||||
/// 检查任务明细附件表
|
||||
@ -5358,10 +5256,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailLaw-检查依据
|
||||
/// <summary>
|
||||
/// 检查依据
|
||||
@ -5469,10 +5365,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailQuestion-检查明细问题
|
||||
/// <summary>
|
||||
/// 检查明细问题
|
||||
@ -5580,10 +5474,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailReason-检查明细隐患原因
|
||||
/// <summary>
|
||||
/// 检查明细隐患原因
|
||||
@ -5691,10 +5583,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailReject-检查明细退回
|
||||
/// <summary>
|
||||
/// 检查明细退回
|
||||
@ -5802,10 +5692,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailRejectFile-检查明细退回附件
|
||||
/// <summary>
|
||||
/// 检查明细退回附件
|
||||
@ -5913,10 +5801,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckDetailUser-检查明细人员
|
||||
/// <summary>
|
||||
/// 检查明细人员
|
||||
@ -6024,10 +5910,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckFile-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6135,10 +6019,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckProject-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6246,10 +6128,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckProjectCategory-安全检查文件
|
||||
/// <summary>
|
||||
/// 安全检查文件
|
||||
@ -6357,10 +6237,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRecord-检查记录确认
|
||||
/// <summary>
|
||||
/// 检查记录确认
|
||||
@ -6468,10 +6346,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRecordDetail-检查记录确认明细
|
||||
/// <summary>
|
||||
/// 检查记录确认明细
|
||||
@ -6579,10 +6455,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckRiskArea-检查区域
|
||||
/// <summary>
|
||||
/// 检查区域
|
||||
@ -6690,10 +6564,8 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SafeCheckUsersign-检查签名
|
||||
/// <summary>
|
||||
/// 检查签名
|
||||
@ -6801,8 +6673,6 @@ namespace APT.BS.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -23,7 +17,6 @@ namespace APT.FM.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.FM;
|
||||
using APT.BaseData.Domain.Entities;
|
||||
|
||||
#region Api-API
|
||||
/// <summary>
|
||||
/// API
|
||||
@ -131,10 +124,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseAdd-企业位置信息
|
||||
/// <summary>
|
||||
/// 企业位置信息
|
||||
@ -242,10 +233,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseEnergy-企业能耗配置信息
|
||||
/// <summary>
|
||||
/// 企业能耗配置信息
|
||||
@ -353,10 +342,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BaseInfo-企业基本信息
|
||||
/// <summary>
|
||||
/// 企业基本信息
|
||||
@ -464,10 +451,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfig-部门日历配置表
|
||||
/// <summary>
|
||||
/// 部门日历配置表
|
||||
@ -575,10 +560,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfigDetail-部门日历配置明细表
|
||||
/// <summary>
|
||||
/// 部门日历配置明细表
|
||||
@ -686,10 +669,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCalendarConfigTeam-部门日历配置班组表
|
||||
/// <summary>
|
||||
/// 部门日历配置班组表
|
||||
@ -797,10 +778,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCompletion-XX班完成情况统计
|
||||
/// <summary>
|
||||
/// XX班完成情况统计
|
||||
@ -908,10 +887,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentCompletionSort-班组完成情况前十
|
||||
/// <summary>
|
||||
/// 班组完成情况前十
|
||||
@ -1019,10 +996,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentPost-部门岗位
|
||||
/// <summary>
|
||||
/// 部门岗位
|
||||
@ -1130,10 +1105,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentPostUser-部门岗位人员
|
||||
/// <summary>
|
||||
/// 部门岗位人员
|
||||
@ -1241,10 +1214,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentProductionUnit-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -1352,10 +1323,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentSafeuser-安全员表
|
||||
/// <summary>
|
||||
/// 安全员表
|
||||
@ -1463,10 +1432,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentScheduling-部门排班表
|
||||
/// <summary>
|
||||
/// 部门排班表
|
||||
@ -1574,10 +1541,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentSchedulingDetail-排班信息人员明细表
|
||||
/// <summary>
|
||||
/// 排班信息人员明细表
|
||||
@ -1685,10 +1650,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DepartmentUser-部门人员表
|
||||
/// <summary>
|
||||
/// 部门人员表
|
||||
@ -1796,10 +1759,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Enum-枚举管理
|
||||
/// <summary>
|
||||
/// 枚举管理
|
||||
@ -1907,10 +1868,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Enums-枚举表单
|
||||
/// <summary>
|
||||
/// 枚举表单
|
||||
@ -2018,10 +1977,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region EnumItem-枚举项
|
||||
/// <summary>
|
||||
/// 枚举项
|
||||
@ -2129,10 +2086,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region EnumType-枚举类别
|
||||
/// <summary>
|
||||
/// 枚举类别
|
||||
@ -2240,10 +2195,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region HiddenDangerRectification-隐患整改完成情况统计
|
||||
/// <summary>
|
||||
/// 隐患整改完成情况统计
|
||||
@ -2351,10 +2304,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region JobActivityCompletion-班组作业完成率统计
|
||||
/// <summary>
|
||||
/// 班组作业完成率统计
|
||||
@ -2462,10 +2413,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MessageTemplate-短信模板表
|
||||
/// <summary>
|
||||
/// 短信模板表
|
||||
@ -2573,10 +2522,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Monitoring-服务器监听表
|
||||
/// <summary>
|
||||
/// 服务器监听表
|
||||
@ -2684,10 +2631,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-信息通知表
|
||||
/// <summary>
|
||||
/// 信息通知表
|
||||
@ -2795,10 +2740,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NotificationTask-娑堟伅琛?
|
||||
/// <summary>
|
||||
/// 娑堟伅琛?
|
||||
@ -2906,10 +2849,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
|
||||
/// <summary>
|
||||
/// 寰呭姙琛ㄦ椂闂撮厤缃?
|
||||
@ -3017,10 +2958,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ParamSet-参数设置表
|
||||
/// <summary>
|
||||
/// 参数设置表
|
||||
@ -3128,10 +3067,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ParamSetDepartment-组织关联信息
|
||||
/// <summary>
|
||||
/// 组织关联信息
|
||||
@ -3239,10 +3176,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Person-人员信息
|
||||
/// <summary>
|
||||
/// 人员信息
|
||||
@ -3350,10 +3285,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonCertificateFile-证书
|
||||
/// <summary>
|
||||
/// 证书
|
||||
@ -3461,10 +3394,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonEducationFile-学历证
|
||||
/// <summary>
|
||||
/// 学历证
|
||||
@ -3572,10 +3503,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonIdcardFile-身份证
|
||||
/// <summary>
|
||||
/// 身份证
|
||||
@ -3683,10 +3612,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonSkills-技能
|
||||
/// <summary>
|
||||
/// 技能
|
||||
@ -3794,10 +3721,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PersonWork-工作经历
|
||||
/// <summary>
|
||||
/// 工作经历
|
||||
@ -3905,10 +3830,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskLevelProportion-风险等级占比
|
||||
/// <summary>
|
||||
/// 风险等级占比
|
||||
@ -4016,10 +3939,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RiskTypeProportion-风险类别占比
|
||||
/// <summary>
|
||||
/// 风险类别占比
|
||||
@ -4127,10 +4048,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleDepartment-部门权限
|
||||
/// <summary>
|
||||
/// 部门权限
|
||||
@ -4238,10 +4157,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Snapshot-随手拍
|
||||
/// <summary>
|
||||
/// 随手拍
|
||||
@ -4349,10 +4266,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SnapshotFile-随手拍图片
|
||||
/// <summary>
|
||||
/// 随手拍图片
|
||||
@ -4460,10 +4375,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLimit-数据同步次数限制
|
||||
/// <summary>
|
||||
/// 数据同步次数限制
|
||||
@ -4571,10 +4484,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLog-跑批日志表
|
||||
/// <summary>
|
||||
/// 跑批日志表
|
||||
@ -4682,10 +4593,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncLogDetail-跑批日志明细表
|
||||
/// <summary>
|
||||
/// 跑批日志明细表
|
||||
@ -4793,10 +4702,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region SyncUserRule-用户数据同步例外配置
|
||||
/// <summary>
|
||||
/// 用户数据同步例外配置
|
||||
@ -4904,10 +4811,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Team-班组表
|
||||
/// <summary>
|
||||
/// 班组表
|
||||
@ -5015,10 +4920,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TeamPerson-班组人员关联信息
|
||||
/// <summary>
|
||||
/// 班组人员关联信息
|
||||
@ -5126,10 +5029,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserDepartment-用户部门关联表
|
||||
/// <summary>
|
||||
/// 用户部门关联表
|
||||
@ -5237,10 +5138,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserPost-宀椾綅鍒楄〃
|
||||
/// <summary>
|
||||
/// 宀椾綅鍒楄〃
|
||||
@ -5348,10 +5247,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserProductionUnit-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -5459,10 +5356,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserProductionUnitSet-生产单元
|
||||
/// <summary>
|
||||
/// 生产单元
|
||||
@ -5570,10 +5465,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserSignFile-签名照片
|
||||
/// <summary>
|
||||
/// 签名照片
|
||||
@ -5681,10 +5574,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserTest-测试多选
|
||||
/// <summary>
|
||||
/// 测试多选
|
||||
@ -5792,10 +5683,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region UserVacationSet-人员休假设置
|
||||
/// <summary>
|
||||
/// 人员休假设置
|
||||
@ -5903,10 +5792,8 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region WorkTicketCompletion-关键许可工作票完成情况统计
|
||||
/// <summary>
|
||||
/// 关键许可工作票完成情况统计
|
||||
@ -6014,8 +5901,6 @@ using APT.BaseData.Domain.Entities;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -1,248 +0,0 @@
|
||||
using APT.BaseData.Domain.Entities;
|
||||
using APT.BaseData.Domain.Entities.FM;
|
||||
using APT.BaseData.Domain.Enums;
|
||||
using APT.BaseData.Services.Services.FM;
|
||||
using APT.Infrastructure.Core;
|
||||
using APT.MS.Domain.Entities.FO;
|
||||
using APT.MS.Domain.Enums;
|
||||
using APT.Utility;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using NPOI.SS.Formula.Functions;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace APT.FO.WebApi.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 专业人员履历表
|
||||
/// </summary>
|
||||
[Route("api/FO/FOProfessionalResume")]
|
||||
public partial class ProfessionalResumeController : AuthorizeApiController<T_FO_PROFESSIONAL_RESUME>
|
||||
{
|
||||
[HttpPost, Route("GetEdit")]
|
||||
public JsonActionResult<T_FO_PROFESSIONAL_RESUME> GetEdit([FromBody] KeywordFilter filter)
|
||||
{
|
||||
return SafeExecute(() =>
|
||||
{
|
||||
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
||||
if (string.IsNullOrEmpty(id))
|
||||
this.ThrowError("060010");
|
||||
var entity = this.GetEntity<T_FO_PROFESSIONAL_RESUME>(id, "Nav_ApplyUser", "Nav_Company", "Nav_ApplyDepartment", "Nav_User", "Nav_Educational", "Nav_Category", "Nav_TechPost",
|
||||
"Nav_EducationalFiles.Nav_ImgFile.Nav_File", "Nav_PostFiles.Nav_ImgFile.Nav_File", "Nav_CertificateFiles.Nav_ImgFile.Nav_File", "Nav_MedicalFiles.Nav_ImgFile.Nav_File",
|
||||
"Nav_TrainFiles.Nav_ImgFile.Nav_File", "Nav_OtherFiles.Nav_ImgFile.Nav_File");
|
||||
if (entity != null)
|
||||
{
|
||||
var details = this.GetEntities<T_FO_PROFESSIONAL_RESUME_DETAIL>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File").ToList();
|
||||
entity.Nav_Details = details.OrderByDescending(t => t.START_DATE).ToList();
|
||||
}
|
||||
return entity;
|
||||
});
|
||||
}
|
||||
/// <summary>
|
||||
/// 新增修改
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Route("FullUpdate")]
|
||||
public JsonActionResult<bool> FullUpdate([FromBody] T_FO_PROFESSIONAL_RESUME entity)
|
||||
{
|
||||
return SafeExecute<bool>(() =>
|
||||
{
|
||||
if (entity.AGE > 60)
|
||||
{
|
||||
throw new Exception("年龄不得大于60周岁");
|
||||
}
|
||||
var type = this.GetEntity<T_FO_PROFESSIONAL_CATEGORY>(entity.PROFESSIONAL_CATEGORY_ID.ToString());
|
||||
if (entity.YEAR <= 10 && type!=null && type.NAME =="五职")
|
||||
{
|
||||
throw new Exception("五职人员,从业经历年限要大于10年");
|
||||
}
|
||||
if (entity.YEAR <= 5 && type != null && type.NAME == "五科")
|
||||
{
|
||||
throw new Exception("五职人员,从业经历年限要大于5年");
|
||||
}
|
||||
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||
var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
|
||||
entity.APPLY_USER_ID = loginUserId;
|
||||
entity.APPLY_DEPARTMENT_ID = departmentId;
|
||||
var details = entity.Nav_Details;
|
||||
if (details != null && details.Any())
|
||||
{
|
||||
details = details.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_Details = null;
|
||||
var detailIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_DETAIL>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var detailFileIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_DETAIL_FILE>(t => detailIds.Contains(t.PROFESSIONAL_RESUME_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var detailList = new List<T_FO_PROFESSIONAL_RESUME_DETAIL>();
|
||||
var detailFileList = new List<T_FO_PROFESSIONAL_RESUME_DETAIL_FILE>();
|
||||
if (details != null && details.Any())
|
||||
{
|
||||
foreach (var item in details)
|
||||
{
|
||||
if (item.Nav_DetailFiles != null && item.Nav_DetailFiles.Any())
|
||||
{
|
||||
foreach (var item2 in item.Nav_DetailFiles)
|
||||
{
|
||||
item2.ORG_ID = entity.ORG_ID;
|
||||
item2.PROFESSIONAL_RESUME_DETAIL_ID = item.ID;
|
||||
item2.Nav_ImgFile = null;
|
||||
detailFileList.Add(item2);
|
||||
}
|
||||
}
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_DetailFiles = null;
|
||||
detailList.Add(item);
|
||||
}
|
||||
}
|
||||
var educationals = entity.Nav_EducationalFiles;
|
||||
if (educationals != null && educationals.Any())
|
||||
{
|
||||
educationals = educationals.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_EducationalFiles = null;
|
||||
var educationalIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_EDUCATIONAL_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var educationalList = new List<T_FO_PROFESSIONAL_RESUME_EDUCATIONAL_FILE>();
|
||||
if (educationals != null && educationals.Any())
|
||||
{
|
||||
foreach (var item in educationals)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
educationalList.Add(item);
|
||||
}
|
||||
}
|
||||
var posts = entity.Nav_PostFiles;
|
||||
if (posts != null && posts.Any())
|
||||
{
|
||||
posts = posts.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_PostFiles = null;
|
||||
var postIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_POST_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var postList = new List<T_FO_PROFESSIONAL_RESUME_POST_FILE>();
|
||||
if (posts != null && posts.Any())
|
||||
{
|
||||
foreach (var item in posts)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
postList.Add(item);
|
||||
}
|
||||
}
|
||||
var certificates = entity.Nav_CertificateFiles;
|
||||
if (certificates != null && certificates.Any())
|
||||
{
|
||||
certificates = certificates.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_CertificateFiles = null;
|
||||
var certificateIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_CERTIFICATE_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var certificateList = new List<T_FO_PROFESSIONAL_RESUME_CERTIFICATE_FILE>();
|
||||
if (certificates != null && certificates.Any())
|
||||
{
|
||||
foreach (var item in certificates)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
certificateList.Add(item);
|
||||
}
|
||||
}
|
||||
var medicals = entity.Nav_MedicalFiles;
|
||||
if (medicals != null && medicals.Any())
|
||||
{
|
||||
medicals = medicals.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_MedicalFiles = null;
|
||||
var medicalIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_MEDICAL_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var medicalList = new List<T_FO_PROFESSIONAL_RESUME_MEDICAL_FILE>();
|
||||
if (medicals != null && medicals.Any())
|
||||
{
|
||||
foreach (var item in medicals)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
medicalList.Add(item);
|
||||
}
|
||||
}
|
||||
var trains = entity.Nav_TrainFiles;
|
||||
if (trains != null && trains.Any())
|
||||
{
|
||||
trains = trains.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_TrainFiles = null;
|
||||
var trainIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_TRAIN_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var trainList = new List<T_FO_PROFESSIONAL_RESUME_TRAIN_FILE>();
|
||||
if (trains != null && trains.Any())
|
||||
{
|
||||
foreach (var item in trains)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
trainList.Add(item);
|
||||
}
|
||||
}
|
||||
var others = entity.Nav_OtherFiles;
|
||||
if (others != null && others.Any())
|
||||
{
|
||||
others = others.Where(t => !t.IS_DELETED).ToList();
|
||||
}
|
||||
entity.Nav_OtherFiles = null;
|
||||
var otherIds = this.GetEntities<T_FO_PROFESSIONAL_RESUME_OTHER_FILE>(t => t.PROFESSIONAL_RESUME_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
var otherList = new List<T_FO_PROFESSIONAL_RESUME_OTHER_FILE>();
|
||||
if (others != null && others.Any())
|
||||
{
|
||||
foreach (var item in others)
|
||||
{
|
||||
item.ORG_ID = entity.ORG_ID;
|
||||
item.PROFESSIONAL_RESUME_ID = entity.ID;
|
||||
item.Nav_ImgFile = null;
|
||||
otherList.Add(item);
|
||||
}
|
||||
}
|
||||
this.UnifiedCommit(() =>
|
||||
{
|
||||
if (detailFileIds != null && detailFileIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_DETAIL_FILE>(detailFileIds);
|
||||
if (detailIds != null && detailIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_DETAIL>(detailIds);
|
||||
if (educationalIds != null && educationalIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_EDUCATIONAL_FILE>(educationalIds);
|
||||
if (postIds != null && postIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_POST_FILE>(postIds);
|
||||
if (certificateIds != null && certificateIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_CERTIFICATE_FILE>(certificateIds);
|
||||
if (medicalIds != null && medicalIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_MEDICAL_FILE>(medicalIds);
|
||||
if (trainIds != null && trainIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_TRAIN_FILE>(trainIds);
|
||||
if (otherIds != null && otherIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_PROFESSIONAL_RESUME_OTHER_FILE>(otherIds);
|
||||
if (entity != null)
|
||||
UpdateEntityNoCommit(entity);
|
||||
if (detailList != null && detailList.Any())
|
||||
this.BantchSaveEntityNoCommit(detailList);
|
||||
if (detailFileList != null && detailFileList.Any())
|
||||
this.BantchSaveEntityNoCommit(detailFileList);
|
||||
if (educationalList != null && educationalList.Any())
|
||||
this.BantchSaveEntityNoCommit(educationalList);
|
||||
if (postList != null && postList.Any())
|
||||
this.BantchSaveEntityNoCommit(postList);
|
||||
if (certificateList != null && certificateList.Any())
|
||||
this.BantchSaveEntityNoCommit(certificateList);
|
||||
if (medicalList != null && medicalList.Any())
|
||||
this.BantchSaveEntityNoCommit(medicalList);
|
||||
if (trainList != null && trainList.Any())
|
||||
this.BantchSaveEntityNoCommit(trainList);
|
||||
if (otherList != null && otherList.Any())
|
||||
this.BantchSaveEntityNoCommit(otherList);
|
||||
});
|
||||
return true;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,179 +0,0 @@
|
||||
using APT.BaseData.Domain.Entities;
|
||||
using APT.BaseData.Domain.Entities.FM;
|
||||
using APT.BaseData.Domain.Enums;
|
||||
using APT.BaseData.Domain.IServices.FM;
|
||||
using APT.Infrastructure.Core;
|
||||
using APT.MS.Domain.Entities.FO;
|
||||
using APT.MS.Domain.Enums;
|
||||
using APT.Utility;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace APT.FO.WebApi.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 安全交底表
|
||||
/// </summary>
|
||||
[Route("api/FO/FOTechDisclosureFromSafe")]
|
||||
public partial class TechDisclosureFromSafeController : AuthorizeApiController<T_FO_TECH_DISCLOSURE_FROM_SAFE>
|
||||
{
|
||||
IFMNotificationTaskService NotificationTaskService { get; set; }
|
||||
/// <summary>
|
||||
/// FOPreOperSch
|
||||
/// </summary>
|
||||
/// <param name="codeRuleService"></param>
|
||||
public TechDisclosureFromSafeController(IFMNotificationTaskService notificationTaskService)
|
||||
{
|
||||
NotificationTaskService = notificationTaskService;
|
||||
}
|
||||
[HttpPost, Route("GetEdit")]
|
||||
public JsonActionResult<T_FO_TECH_DISCLOSURE_FROM_SAFE> GetEdit([FromBody] KeywordFilter filter)
|
||||
{
|
||||
return SafeExecute(() =>
|
||||
{
|
||||
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
||||
if (string.IsNullOrEmpty(id))
|
||||
this.ThrowError("060010");
|
||||
var entity = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_SAFE>(id, "Nav_OperationStep", "Nav_User.Nav_Signs.Nav_ImgFile", "Nav_Department");
|
||||
if (entity != null)
|
||||
{
|
||||
var newFilter = new BaseFilter(filter.OrgId);
|
||||
newFilter.SelectField = new List<string> { "ID", "DEAL_STATUS", "TECH_DISCLOSURE_FROM_ID", "USER_ID", "Nav_User.NAME", "Nav_User.CODE", "Nav_User.FILE_PATH", "Nav_User.Nav_Signs.Nav_ImgFile" };
|
||||
var persons = this.GetEntities<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == entity.ID, newFilter).ToList();
|
||||
entity.Nav_Person = persons.OrderBy(t => t.MODIFY_TIME).ThenByDescending(m => m.DEAL_STATUS).ToList();
|
||||
}
|
||||
return entity;
|
||||
});
|
||||
}
|
||||
/// <summary>
|
||||
/// 新增修改
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Route("FullUpdate")]
|
||||
public JsonActionResult<bool> FullUpdate([FromBody] T_FO_TECH_DISCLOSURE_FROM_SAFE entity)
|
||||
{
|
||||
return SafeExecute<bool>(() =>
|
||||
{
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.草稿;
|
||||
var persons = entity.Nav_Person;
|
||||
var deleteIds = this.GetEntities<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m => m.ID).ToList();
|
||||
if (persons != null && persons.Any())
|
||||
{
|
||||
persons = persons.Where(t => !t.IS_DELETED && t.USER_ID != null).ToList();
|
||||
}
|
||||
entity.Nav_Person = null;
|
||||
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
|
||||
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||
var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
|
||||
entity.DEPARTMENT_ID = departmentId;
|
||||
if (string.IsNullOrEmpty(entity.DisclosureContent))
|
||||
{
|
||||
throw new Exception("交底内容必需填写");
|
||||
}
|
||||
entity.DisclosureContent = entity.DisclosureContent.Trim().Replace(" ", "");
|
||||
if (persons != null && persons.Any())
|
||||
{
|
||||
persons.ForEach(t =>
|
||||
{
|
||||
t.ORG_ID = entity.ORG_ID; t.TECH_DISCLOSURE_FROM_ID = entity.ID;
|
||||
t.Nav_User = null;
|
||||
});
|
||||
}
|
||||
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
|
||||
{
|
||||
if (entity.DISCLOSURE_DATE == null || entity.DISCLOSURE_DATE == DateTime.Parse("0001-01-01 00:00:00"))
|
||||
throw new Exception("交底时间必需填写");
|
||||
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.签到中;
|
||||
persons.ForEach(t =>
|
||||
{
|
||||
if (t.USER_ID == loginUserId)
|
||||
t.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
|
||||
});
|
||||
//新增的消息通知
|
||||
var userIds = persons.Where(m => m.USER_ID != null && m.USER_ID != loginUserId).Select(t => (Guid)t.USER_ID).Distinct().ToList();
|
||||
if (userIds != null && userIds.Any())
|
||||
{
|
||||
var UserNames = new List<string>();
|
||||
var user = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && userIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
|
||||
foreach (var u in userIds)
|
||||
{
|
||||
var current = user.FirstOrDefault(t => t.ID == u);
|
||||
UserNames.Add(current?.NAME);
|
||||
}
|
||||
//发消息
|
||||
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
|
||||
notices = NotificationTaskService.InsertUserNoticeTaskModels("安全交底表确认" + DateTime.Now.Month.ToString().PadLeft(2, '0') + DateTime.Now.Day.ToString().PadLeft(2, '0'), entity.ID, entity.ORG_ID, userIds, UserNames, DateTime.Now,
|
||||
dtEnd, (int)FMNoticeTypeEnum.消息, "FO033_SHOWPRINT");
|
||||
}
|
||||
else
|
||||
{
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.已归档;
|
||||
}
|
||||
}
|
||||
this.UnifiedCommit(() =>
|
||||
{
|
||||
if (deleteIds != null && deleteIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(deleteIds);
|
||||
if (entity != null)
|
||||
UpdateEntityNoCommit(entity);
|
||||
if (persons != null && persons.Any())
|
||||
this.BantchSaveEntityNoCommit(persons);
|
||||
if (notices != null && notices.Any())
|
||||
this.BantchSaveEntityNoCommit(notices);
|
||||
});
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 签到同意
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Route("PersonalAgree")]
|
||||
public JsonActionResult<bool> PersonalAgree([FromBody] T_FO_TECH_DISCLOSURE_FROM_SAFE entity)
|
||||
{
|
||||
return SafeExecute<bool>(() =>
|
||||
{
|
||||
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
|
||||
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||
if (entity.TaskID != Guid.Empty)
|
||||
{
|
||||
var currTask = GetEntity<T_FM_NOTIFICATION_TASK>(t => t.ID == entity.TaskID);
|
||||
if (currTask != null)
|
||||
{
|
||||
userID = currTask.USER_ID;
|
||||
}
|
||||
}
|
||||
var tech = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_SAFE>(entity.ID);
|
||||
var user = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.USER_ID == userID, new BaseFilter(orgId));
|
||||
user.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
|
||||
var todoCount = this.GetCount<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.DEAL_STATUS == 0 && t.USER_ID != null && t.USER_ID != userID, new BaseFilter(orgId));
|
||||
if (todoCount == 0 || todoCount == 1)
|
||||
{
|
||||
tech.FORM_STATUS = (int)FOTeamActivityState.已归档;
|
||||
}
|
||||
T_FM_NOTIFICATION_TASK task = null;
|
||||
if (entity.TaskID != Guid.Empty)
|
||||
{
|
||||
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
|
||||
task.SOURCE_FORMCODE = "FO033_SHOWPRINT";
|
||||
}
|
||||
this.UnifiedCommit(() =>
|
||||
{
|
||||
if (tech != null)
|
||||
UpdateEntityNoCommit(tech);
|
||||
if (user != null)
|
||||
this.UpdateEntityNoCommit(user);
|
||||
if (task != null)
|
||||
this.UpdateEntityNoCommit(task);
|
||||
});
|
||||
return true;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,181 +0,0 @@
|
||||
using APT.BaseData.Domain.Entities;
|
||||
using APT.BaseData.Domain.Entities.FM;
|
||||
using APT.BaseData.Domain.Enums;
|
||||
using APT.BaseData.Domain.IServices;
|
||||
using APT.BaseData.Domain.IServices.FM;
|
||||
using APT.Infrastructure.Core;
|
||||
using APT.MS.Domain.Entities.FO;
|
||||
using APT.MS.Domain.Enums;
|
||||
using APT.Utility;
|
||||
using log4net.Filter;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace APT.FO.WebApi.Controllers
|
||||
{
|
||||
/// <summary>
|
||||
/// 技术交底表
|
||||
/// </summary>
|
||||
[Route("api/FO/FOTechDisclosureFromTech")]
|
||||
public partial class TechDisclosureFromTechController : AuthorizeApiController<T_FO_TECH_DISCLOSURE_FROM_TECH>
|
||||
{
|
||||
IFMNotificationTaskService NotificationTaskService { get; set; }
|
||||
/// <summary>
|
||||
/// FOPreOperSch
|
||||
/// </summary>
|
||||
/// <param name="codeRuleService"></param>
|
||||
public TechDisclosureFromTechController(IFMNotificationTaskService notificationTaskService)
|
||||
{
|
||||
NotificationTaskService = notificationTaskService;
|
||||
}
|
||||
[HttpPost, Route("GetEdit")]
|
||||
public JsonActionResult<T_FO_TECH_DISCLOSURE_FROM_TECH> GetEdit([FromBody] KeywordFilter filter)
|
||||
{
|
||||
return SafeExecute(() =>
|
||||
{
|
||||
var id = filter.FilterGroup.Rules.FirstOrDefault(t => t.Field == "ID").Value.ToString();
|
||||
if (string.IsNullOrEmpty(id))
|
||||
this.ThrowError("060010");
|
||||
var entity = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_TECH>(id, "Nav_OperationStep", "Nav_User.Nav_Signs.Nav_ImgFile", "Nav_Department");
|
||||
if (entity != null)
|
||||
{
|
||||
var newFilter = new BaseFilter(filter.OrgId);
|
||||
newFilter.SelectField = new List<string> { "ID", "DEAL_STATUS", "TECH_DISCLOSURE_FROM_ID", "USER_ID", "Nav_User.NAME", "Nav_User.CODE", "Nav_User.FILE_PATH", "Nav_User.Nav_Signs.Nav_ImgFile" };
|
||||
var persons = this.GetEntities<T_FO_TECH_DISCLOSURE_FROM_TECH_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == entity.ID, newFilter).ToList();
|
||||
entity.Nav_Person = persons.OrderBy(t => t.MODIFY_TIME).ThenByDescending(m => m.DEAL_STATUS).ToList();
|
||||
}
|
||||
return entity;
|
||||
});
|
||||
}
|
||||
/// <summary>
|
||||
/// 新增修改
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Route("FullUpdate")]
|
||||
public JsonActionResult<bool> FullUpdate([FromBody] T_FO_TECH_DISCLOSURE_FROM_TECH entity)
|
||||
{
|
||||
return SafeExecute<bool>(() =>
|
||||
{
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.草稿;
|
||||
var persons = entity.Nav_Person;
|
||||
var deleteIds = this.GetEntities<T_FO_TECH_DISCLOSURE_FROM_TECH_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == entity.ID, new BaseFilter(entity.ORG_ID)).Select(m=>m.ID).ToList();
|
||||
if (persons != null && persons.Any())
|
||||
{
|
||||
persons = persons.Where(t => !t.IS_DELETED && t.USER_ID != null).ToList();
|
||||
}
|
||||
entity.Nav_Person = null;
|
||||
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
|
||||
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||
var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
|
||||
entity.DEPARTMENT_ID = departmentId;
|
||||
if (string.IsNullOrEmpty(entity.DisclosureContent))
|
||||
{
|
||||
throw new Exception("交底内容必需填写");
|
||||
}
|
||||
entity.DisclosureContent = entity.DisclosureContent.Trim().Replace(" ", "");
|
||||
if (persons != null && persons.Any())
|
||||
{
|
||||
persons.ForEach(t =>
|
||||
{
|
||||
t.ORG_ID = entity.ORG_ID; t.TECH_DISCLOSURE_FROM_ID = entity.ID;
|
||||
t.Nav_User = null;
|
||||
});
|
||||
}
|
||||
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
|
||||
{
|
||||
if (entity.DISCLOSURE_DATE == null || entity.DISCLOSURE_DATE == DateTime.Parse("0001-01-01 00:00:00"))
|
||||
throw new Exception("交底时间必需填写");
|
||||
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.签到中;
|
||||
persons.ForEach(t =>
|
||||
{
|
||||
if (t.USER_ID == loginUserId)
|
||||
t.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
|
||||
});
|
||||
//新增的消息通知
|
||||
var userIds = persons.Where(m => m.USER_ID != null && m.USER_ID != loginUserId).Select(t => (Guid)t.USER_ID).Distinct().ToList();
|
||||
if (userIds != null && userIds.Any())
|
||||
{
|
||||
var UserNames = new List<string>();
|
||||
var user = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && userIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
|
||||
foreach (var u in userIds)
|
||||
{
|
||||
var current = user.FirstOrDefault(t => t.ID == u);
|
||||
UserNames.Add(current?.NAME);
|
||||
}
|
||||
//发消息
|
||||
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
|
||||
notices = NotificationTaskService.InsertUserNoticeTaskModels("技术交底表确认"+DateTime.Now.Month.ToString().PadLeft(2,'0') + DateTime.Now.Day.ToString().PadLeft(2, '0'), entity.ID, entity.ORG_ID, userIds, UserNames, DateTime.Now,
|
||||
dtEnd, (int)FMNoticeTypeEnum.消息, "FO031_SHOWPRINT");
|
||||
}
|
||||
else
|
||||
{
|
||||
entity.FORM_STATUS = (int)FOTeamActivityState.已归档;
|
||||
}
|
||||
}
|
||||
this.UnifiedCommit(() =>
|
||||
{
|
||||
if (deleteIds != null && deleteIds.Any())
|
||||
this.BantchDeleteEntityNoCommit<T_FO_TECH_DISCLOSURE_FROM_TECH_PERSON>(deleteIds);
|
||||
if (entity != null)
|
||||
UpdateEntityNoCommit(entity);
|
||||
if (persons != null && persons.Any())
|
||||
this.BantchSaveEntityNoCommit(persons);
|
||||
if (notices != null && notices.Any())
|
||||
this.BantchSaveEntityNoCommit(notices);
|
||||
});
|
||||
return true;
|
||||
});
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 签到同意
|
||||
/// </summary>
|
||||
/// <param name="entity"></param>
|
||||
/// <returns></returns>
|
||||
[HttpPost, Route("PersonalAgree")]
|
||||
public JsonActionResult<bool> PersonalAgree([FromBody] T_FO_TECH_DISCLOSURE_FROM_TECH entity)
|
||||
{
|
||||
return SafeExecute<bool>(() =>
|
||||
{
|
||||
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
|
||||
var userID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
|
||||
if (entity.TaskID != Guid.Empty)
|
||||
{
|
||||
var currTask = GetEntity<T_FM_NOTIFICATION_TASK>(t => t.ID == entity.TaskID);
|
||||
if (currTask != null)
|
||||
{
|
||||
userID = currTask.USER_ID;
|
||||
}
|
||||
}
|
||||
var tech = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_TECH>(entity.ID);
|
||||
var user = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_TECH_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.USER_ID == userID, new BaseFilter(orgId));
|
||||
user.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
|
||||
var todoCount = this.GetCount<T_FO_TECH_DISCLOSURE_FROM_TECH_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.DEAL_STATUS == 0 && t.USER_ID != null && t.USER_ID != userID, new BaseFilter(orgId));
|
||||
if (todoCount == 0 || todoCount == 1)
|
||||
{
|
||||
tech.FORM_STATUS = (int)FOTeamActivityState.已归档;
|
||||
}
|
||||
T_FM_NOTIFICATION_TASK task = null;
|
||||
if (entity.TaskID != Guid.Empty)
|
||||
{
|
||||
task = NotificationTaskService.GetTaskFinishModel(entity.TaskID);
|
||||
task.SOURCE_FORMCODE = "FO031_SHOWPRINT";
|
||||
}
|
||||
this.UnifiedCommit(() =>
|
||||
{
|
||||
if (tech != null)
|
||||
UpdateEntityNoCommit(tech);
|
||||
if (user != null)
|
||||
this.UpdateEntityNoCommit(user);
|
||||
if (task != null)
|
||||
this.UpdateEntityNoCommit(task);
|
||||
});
|
||||
return true;
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
File diff suppressed because it is too large
Load Diff
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.LG.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.LG;
|
||||
|
||||
#region Oprate-表单操作日志表
|
||||
/// <summary>
|
||||
/// 表单操作日志表
|
||||
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.NW.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.NW;
|
||||
|
||||
#region Enterprise-子企业表
|
||||
/// <summary>
|
||||
/// 子企业表
|
||||
@ -129,8 +122,7 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
/// <param name="filter"></param>
|
||||
@ -141,10 +133,8 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleDataPerm-子企业数据权限表
|
||||
/// <summary>
|
||||
/// 子企业数据权限表
|
||||
@ -252,10 +242,8 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleMenu-子企业权限表
|
||||
/// <summary>
|
||||
/// 子企业权限表
|
||||
@ -363,8 +351,6 @@ namespace APT.NW.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.OP.WebApi.Controllers.Api
|
||||
{
|
||||
using APT.BaseData.Domain.Entities.OP;
|
||||
|
||||
#region Alluser-用户表(租户平台)
|
||||
/// <summary>
|
||||
/// 用户表(租户平台)
|
||||
@ -130,10 +123,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BillingRule-计费规则表
|
||||
/// <summary>
|
||||
/// 计费规则表
|
||||
@ -241,10 +232,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region BillingRuleVersion-计费规则子表
|
||||
/// <summary>
|
||||
/// 计费规则子表
|
||||
@ -352,10 +341,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ChargeTimeSet-充电时长配置
|
||||
/// <summary>
|
||||
/// 充电时长配置
|
||||
@ -463,10 +450,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Client-客户表
|
||||
/// <summary>
|
||||
/// 客户表
|
||||
@ -574,10 +559,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ClinetOpenid-客户表OpenId
|
||||
/// <summary>
|
||||
/// 客户表OpenId
|
||||
@ -685,10 +668,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CommonQuestion-常见问题
|
||||
/// <summary>
|
||||
/// 常见问题
|
||||
@ -796,10 +777,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileFirmware-充电桩固件表
|
||||
/// <summary>
|
||||
/// 充电桩固件表
|
||||
@ -907,10 +886,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Member-会员表
|
||||
/// <summary>
|
||||
/// 会员表
|
||||
@ -1018,10 +995,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Menu-菜单表(租户平台)
|
||||
/// <summary>
|
||||
/// 菜单表(租户平台)
|
||||
@ -1128,8 +1103,7 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
{
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// <summary>
|
||||
/// 获得树形实体数据
|
||||
/// </summary>
|
||||
/// <param name="filter"></param>
|
||||
@ -1140,10 +1114,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitTreeOrderEntities(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-公告表
|
||||
/// <summary>
|
||||
/// 公告表
|
||||
@ -1251,10 +1223,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NoticeDetail-公告内容
|
||||
/// <summary>
|
||||
/// 公告内容
|
||||
@ -1362,10 +1332,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PeakValleyConfig-峰谷配置表
|
||||
/// <summary>
|
||||
/// 峰谷配置表
|
||||
@ -1473,10 +1441,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeCard-充值卡
|
||||
/// <summary>
|
||||
/// 充值卡
|
||||
@ -1584,10 +1550,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeOrder-充值订单
|
||||
/// <summary>
|
||||
/// 充值订单
|
||||
@ -1695,10 +1659,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RechargeSetting-充值金额配置
|
||||
/// <summary>
|
||||
/// 充值金额配置
|
||||
@ -1806,10 +1768,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RfidCard-RFID卡
|
||||
/// <summary>
|
||||
/// RFID卡
|
||||
@ -1917,10 +1877,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region RoleMenu-租户权限表
|
||||
/// <summary>
|
||||
/// 租户权限表
|
||||
@ -2028,10 +1986,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Tenant-租户表
|
||||
/// <summary>
|
||||
/// 租户表
|
||||
@ -2139,10 +2095,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantDbConn-租户数据库表
|
||||
/// <summary>
|
||||
/// 租户数据库表
|
||||
@ -2250,10 +2204,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantDomain-租户域名表
|
||||
/// <summary>
|
||||
/// 租户域名表
|
||||
@ -2361,10 +2313,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region TenantExpiration-租户租期表
|
||||
/// <summary>
|
||||
/// 租户租期表
|
||||
@ -2472,10 +2422,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region User-用户表(租户平台)
|
||||
/// <summary>
|
||||
/// 用户表(租户平台)
|
||||
@ -2583,10 +2531,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Version-版本升级表
|
||||
/// <summary>
|
||||
/// 版本升级表
|
||||
@ -2694,10 +2640,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionMenu-菜单版本升级表
|
||||
/// <summary>
|
||||
/// 菜单版本升级表
|
||||
@ -2805,10 +2749,8 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionTenant-租户版本升级表
|
||||
/// <summary>
|
||||
/// 租户版本升级表
|
||||
@ -2916,8 +2858,6 @@ namespace APT.OP.WebApi.Controllers.Api
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -25,7 +19,6 @@ namespace APT.PF.WebApi.Controllers.Api
|
||||
using APT.BaseData.Domain.Entities;
|
||||
using APT.BaseData.Domain.Entities.PF;
|
||||
using APT.BaseData.Domain.Entities.T4;
|
||||
|
||||
#region ApprovalRole-审批角色
|
||||
/// <summary>
|
||||
/// 审批角色
|
||||
@ -133,10 +126,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Approve-审批流主表
|
||||
/// <summary>
|
||||
/// 审批流主表
|
||||
@ -244,10 +235,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveDetail-审批流子表
|
||||
/// <summary>
|
||||
/// 审批流子表
|
||||
@ -355,10 +344,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveOperationRole-操作角色
|
||||
/// <summary>
|
||||
/// 操作角色
|
||||
@ -466,10 +453,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveRejectConfig-审批驳回配置表
|
||||
/// <summary>
|
||||
/// 审批驳回配置表
|
||||
@ -577,10 +562,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveRoleDepartment-分管部门
|
||||
/// <summary>
|
||||
/// 分管部门
|
||||
@ -688,10 +671,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveTemp-审批流模板主表
|
||||
/// <summary>
|
||||
/// 审批流模板主表
|
||||
@ -799,10 +780,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ApproveTempDetail-审批流模板子表
|
||||
/// <summary>
|
||||
/// 审批流模板子表
|
||||
@ -910,10 +889,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AppVersion-App版本发布
|
||||
/// <summary>
|
||||
/// App版本发布
|
||||
@ -1021,10 +998,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region AppVersionFile-App包文件
|
||||
/// <summary>
|
||||
/// App包文件
|
||||
@ -1132,10 +1107,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ClientScopes-资源表
|
||||
/// <summary>
|
||||
/// 资源表
|
||||
@ -1243,10 +1216,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region CodeRuleRunLog-编码规则跑批表
|
||||
/// <summary>
|
||||
/// 编码规则跑批表
|
||||
@ -1354,10 +1325,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region ComplaintLog-转办记录表
|
||||
/// <summary>
|
||||
/// 转办记录表
|
||||
@ -1465,10 +1434,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DataChannel-数据通道
|
||||
/// <summary>
|
||||
/// 数据通道
|
||||
@ -1576,10 +1543,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region DataFrequency-采集频率
|
||||
/// <summary>
|
||||
/// 采集频率
|
||||
@ -1687,10 +1652,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Fddeback-意见反馈
|
||||
/// <summary>
|
||||
/// 意见反馈
|
||||
@ -1798,10 +1761,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FddebackFile-意见反馈附件
|
||||
/// <summary>
|
||||
/// 意见反馈附件
|
||||
@ -1909,10 +1870,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileDb-
|
||||
/// <summary>
|
||||
///
|
||||
@ -2020,10 +1979,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileDbFile-
|
||||
/// <summary>
|
||||
///
|
||||
@ -2131,10 +2088,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FileType-
|
||||
/// <summary>
|
||||
///
|
||||
@ -2242,10 +2197,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeChart-首页：图标区域
|
||||
/// <summary>
|
||||
/// 首页：图标区域
|
||||
@ -2353,10 +2306,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeHmi-首页：HMI区域
|
||||
/// <summary>
|
||||
/// 首页：HMI区域
|
||||
@ -2464,10 +2415,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeRanking-首页：排名区域
|
||||
/// <summary>
|
||||
/// 首页：排名区域
|
||||
@ -2575,10 +2524,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormHomeStatistic-首页：统计区域
|
||||
/// <summary>
|
||||
/// 首页：统计区域
|
||||
@ -2686,10 +2633,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region FormRelation-关联表单配置
|
||||
/// <summary>
|
||||
/// 关联表单配置
|
||||
@ -2797,10 +2742,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region HomeTitle-首页方针
|
||||
/// <summary>
|
||||
/// 首页方针
|
||||
@ -2908,10 +2851,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MqttConfig-MQTT配置表
|
||||
/// <summary>
|
||||
/// MQTT配置表
|
||||
@ -3019,10 +2960,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region MqttConfigTheme-
|
||||
/// <summary>
|
||||
///
|
||||
@ -3130,10 +3069,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Notice-通知
|
||||
/// <summary>
|
||||
/// 通知
|
||||
@ -3241,10 +3178,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region NoticeFile-
|
||||
/// <summary>
|
||||
///
|
||||
@ -3352,10 +3287,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PicFilter-图片条件主表
|
||||
/// <summary>
|
||||
/// 图片条件主表
|
||||
@ -3463,10 +3396,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region PicFilterDetail-图片条件子表
|
||||
/// <summary>
|
||||
/// 图片条件子表
|
||||
@ -3574,10 +3505,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region QuestionFeedback-问题反馈表
|
||||
/// <summary>
|
||||
/// 问题反馈表
|
||||
@ -3685,10 +3614,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region QuestionFeedbackFile-问题反馈附件表
|
||||
/// <summary>
|
||||
/// 问题反馈附件表
|
||||
@ -3796,10 +3723,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region Scopes-资源表
|
||||
/// <summary>
|
||||
/// 资源表
|
||||
@ -3907,10 +3832,8 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region VersionManage-版本管理表
|
||||
/// <summary>
|
||||
/// 版本管理表
|
||||
@ -4018,8 +3941,6 @@ using APT.BaseData.Domain.Entities.T4;
|
||||
return WitEntity(null, filter);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
||||
@ -2,12 +2,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
//------------------------------------------------------------------------------
|
||||
// T4模板文件：基础接口类
|
||||
// 此代码由T4模板自动生成
|
||||
@ -21,5 +15,4 @@ using APT.Infrastructure.Api;
|
||||
using APT.BaseData.Domain.ApiModel.PF;
|
||||
namespace APT.PP.WebApi.Controllers.Api
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user