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

Compare commits

base: wyw:ce170e30770fedc754655e9c4d202723a422852b
Branches Tags
wyw:master
..
compare: wyw:1c9f67e3dd95d70017564687072973e61eeec6f3
Branches Tags
wyw:master

2 Commits
ce170e3077 ... 1c9f67e3dd

Author SHA1 Message Date
wyw
1c9f67e3dd 213 2025-10-23 09:59:49 +08:00
wyw
364c3dd77f 1、所有总、子公司数据库链接存入Redis，提供基础方法获取链接 
2、审批角色 添加 是否总部【ISHEAD】属性  ，总部会同步到子公司，子公司不能修改总部传入的数据
3、审批明细 添加【ISHEAD】属性  ，功能暂未处理
4、首页获取待办修改  使不过滤ORGID
5、用户添加时，如果是总公司 同步到子公司，同步修改了一些bug
6、审批页面数据获取方法【FullGet】提供修改前提 后续功能待完善
7、HeadHelper.GetIsHead 判断是否总部 ["Tenant"]"0003"
 2025-10-23 09:54:36 +08:00
28 changed files with 372727 additions and 117229 deletions
Show Stats Expand all files Collapse all files

5
APT.BaseData.Domain/ApiModel/Platform/RedisCacheKey.cs
View File

@ -300,5 +300,10 @@
/// 首页 BI/BIStatiscialAnalysisController/GetJobCompletionSort Key /// 首页 BI/BIStatiscialAnalysisController/GetJobCompletionSort Key
/// </summary> /// </summary>
public const string HomeJobCompletion = "HomeJobCompletion_{0}"; public const string HomeJobCompletion = "HomeJobCompletion_{0}";
/// <summary>
/// 所有数据库链接
/// </summary>
public const string ConnAll = "OPConn";
} }
} }

9
APT.BaseData.Domain/Entities/PF/T_PF_APPROVAL_ROLE.cs
View File

@ -51,5 +51,14 @@ namespace APT.MS.Domain.Entities.PF
public Guid? ROLE_ID { get; set; } public Guid? ROLE_ID { get; set; }
[Description("导航属性：审批角色")] [Description("导航属性：审批角色")]
public virtual T_FM_ROLE Nav_Role { get; set; } public virtual T_FM_ROLE Nav_Role { get; set; }
/// <summary>
/// 是否总部
/// </summary>
[Description("是否总部")]
[FormFieldTable]
[FormFieldQuery]
[FormFieldEdit]
public bool ISHEAD { get; set; }=false;
} }
} }

9
APT.BaseData.Domain/Entities/PF/T_PF_APPROVE_DETAIL.cs
View File

@ -76,5 +76,14 @@ namespace APT.BaseData.Domain.Entities
/// </summary> /// </summary>
[Description("是否取消")] [Description("是否取消")]
public bool ISCANCEL { get; set; } public bool ISCANCEL { get; set; }
/// <summary>
/// 是否总部
/// </summary>
[Description("是否总部")]
[FormFieldTable]
[FormFieldQuery]
[FormFieldEdit]
public bool ISHEAD { get; set; } = false;
} }
} }

52
APT.BaseData.Services/Services/OP/OPTenantDBConnService.cs
View File

@ -1,8 +1,10 @@
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.ApiModel.Platform;
using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities.OP; using APT.BaseData.Domain.Entities.OP;
using APT.BaseData.Domain.Enums.OP; using APT.BaseData.Domain.Enums.OP;
using APT.BaseData.Domain.IServices.OP; using APT.BaseData.Domain.IServices.OP;
using APT.Infrastructure.Api; using APT.Infrastructure.Api;
using APT.Infrastructure.Api.Redis;
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using APT.Migrations; using APT.Migrations;
using Newtonsoft.Json; using Newtonsoft.Json;
@ -23,21 +25,31 @@ namespace APT.BaseData.Services.Services.OP
/// <summary> /// <summary>
/// 获取 除 ORG_IDBeside 之外对应的数据库链接字典 ORG_ID DB_CONN /// 获取 除 ORG_IDBeside 之外对应的数据库链接字典 ORG_ID DB_CONN
/// </summary> /// </summary>
/// <param name="ORG_IDBeside"></param> /// <param name="ORG_IDBeside">过滤值 没有就不过滤</param>
/// <returns></returns> /// <returns></returns>
public Dictionary<Guid, string> GetConnDictionary(Guid? ORG_IDBeside) public Dictionary<Guid, string> GetConnDictionary(Guid? ORG_IDBeside)
{ {
Dictionary<Guid, string> dicORGCONN = new Dictionary<Guid, string>(); Dictionary<Guid, string> dicORGCONN = new Dictionary<Guid, string>();
//从Redis中获取所有数据库链接值
bool isRedisConfig = true;
var redisConfig = APT.Infrastructure.Api.ConfigurationManager.AppSettings["RedisFormConfig"];
if (!string.IsNullOrEmpty(redisConfig))
isRedisConfig = bool.Parse(redisConfig);
if (isRedisConfig)
{
if (CsRedisManager.KeyExists(RedisCacheKey.ConnAll))
dicORGCONN = CsRedisManager.StringGet<Dictionary<Guid, string>>(RedisCacheKey.ConnAll);
}
#region Redis没找到 去数据库查找
if (dicORGCONN == null || dicORGCONN.Count < 1)
{
string conn = string.Empty; string conn = string.Empty;
IEnumerable<T_OP_TENANT> listTent = null; IEnumerable<T_OP_TENANT> listTent = null;
using (var context = new MigrationContext()) using (var context = new MigrationContext())
{ {
Expression<Func<T_OP_TENANT, bool>> expression = e => e.DB_CONN_ID.HasValue; Expression<Func<T_OP_TENANT, bool>> expression = e => e.DB_CONN_ID.HasValue;
if (ORG_IDBeside.HasValue)
{
expression = expression.And(e => e.ID != ORG_IDBeside);
}
listTent = context.GetEntities(expression, null, null); listTent = context.GetEntities(expression, null, null);
List<Guid> listConnID = listTent.Select(e => e.DB_CONN_ID.Value).ToList(); List<Guid> listConnID = listTent.Select(e => e.DB_CONN_ID.Value).ToList();
var listDbConn = context.GetEntities<T_OP_TENANT_DB_CONN>(e => listConnID.Contains(e.ID), null, null); var listDbConn = context.GetEntities<T_OP_TENANT_DB_CONN>(e => listConnID.Contains(e.ID), null, null);
@ -56,6 +68,32 @@ namespace APT.BaseData.Services.Services.OP
dicORGCONN.Add(listTent.First(e => e.DB_CONN_ID == item.ID).ID, conn); dicORGCONN.Add(listTent.First(e => e.DB_CONN_ID == item.ID).ID, conn);
} }
} }
if (isRedisConfig && dicORGCONN.Count > 0)
{
try
{
CsRedisManager.StringSet<Dictionary<Guid, string>>(RedisCacheKey.ConnAll, dicORGCONN);//所有数据库链接 存入 Redis
}
catch { }
}
}
}
}
#endregion
if (dicORGCONN != null && dicORGCONN.Count > 0)
{
if (ORG_IDBeside.HasValue)
{
Dictionary<Guid, string> dicORGCONN1 = new Dictionary<Guid, string>();
foreach (var item in dicORGCONN)
{
if (item.Key == ORG_IDBeside.Value)
continue;
dicORGCONN1.Add(item.Key, item.Value);
}
dicORGCONN = dicORGCONN1;
} }
} }
return dicORGCONN; return dicORGCONN;

129162
APT.Data.Migrations/Migrations/20251021094627_wyw2025102101.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251021094627_wyw2025102101.cs Normal file
View File

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

129165
APT.Data.Migrations/Migrations/20251022074708_wyw2025102201.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

24
APT.Data.Migrations/Migrations/20251022074708_wyw2025102201.cs Normal file
View File

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

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

@ -11691,6 +11691,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<bool>("ISCANCEL") b.Property<bool>("ISCANCEL")
.HasColumnType("bit"); .HasColumnType("bit");
b.Property<bool>("ISHEAD")
.HasColumnType("bit");
b.Property<bool>("IS_ALLOW_UPDATE") b.Property<bool>("IS_ALLOW_UPDATE")
.HasColumnType("bit"); .HasColumnType("bit");
@ -53823,6 +53826,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("FORM_ID") b.Property<Guid?>("FORM_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
b.Property<bool>("ISHEAD")
.HasColumnType("bit");
b.Property<bool>("IS_DELETED") b.Property<bool>("IS_DELETED")
.HasColumnType("bit"); .HasColumnType("bit");

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BD.WebApi.Controllers.Api namespace APT.BD.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.BD; using APT.BaseData.Domain.Entities.BD;
#region Hmi-HMI资源表维护 #region Hmi-HMI资源表维护
/// <summary> /// <summary>
/// HMI资源表维护 /// HMI资源表维护
@ -130,10 +123,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Picture-图片资源 #region Picture-图片资源
/// <summary> /// <summary>
/// 图片资源 /// 图片资源
@ -241,10 +232,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PictureFile-资源图片文件 #region PictureFile-资源图片文件
/// <summary> /// <summary>
/// 资源图片文件 /// 资源图片文件
@ -352,10 +341,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Place-区域表 #region Place-区域表
/// <summary> /// <summary>
/// 区域表 /// 区域表
@ -462,7 +449,6 @@ namespace APT.BD.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -474,10 +460,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region ServerInfo-服务器信息表 #region ServerInfo-服务器信息表
/// <summary> /// <summary>
/// 服务器信息表 /// 服务器信息表
@ -585,10 +569,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SystemInfo-系统信息表 #region SystemInfo-系统信息表
/// <summary> /// <summary>
/// 系统信息表 /// 系统信息表
@ -696,10 +678,8 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region WordTemplate-WORD模板维护 #region WordTemplate-WORD模板维护
/// <summary> /// <summary>
/// WORD模板维护 /// WORD模板维护
@ -807,8 +787,6 @@ namespace APT.BD.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.BS.WebApi.Controllers.Api namespace APT.BS.WebApi.Controllers.Api
{ {
using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.BS;
#region CheckContent-检查内容表 #region CheckContent-检查内容表
/// <summary> /// <summary>
/// 检查内容表 /// 检查内容表
@ -130,10 +123,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContents-检查内容 #region CheckContents-检查内容
/// <summary> /// <summary>
/// 检查内容 /// 检查内容
@ -241,10 +232,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContentCheckType-检查类型 #region CheckContentCheckType-检查类型
/// <summary> /// <summary>
/// 检查类型 /// 检查类型
@ -352,10 +341,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级) #region CheckContentCheckTypeLevel-检查内容检查类型子表(关联层级)
/// <summary> /// <summary>
/// 检查内容检查类型子表(关联层级) /// 检查内容检查类型子表(关联层级)
@ -463,10 +450,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContentHmRiskArea-检查区域 #region CheckContentHmRiskArea-检查区域
/// <summary> /// <summary>
/// 检查区域 /// 检查区域
@ -574,10 +559,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckMain-安全检查库 #region CheckMain-安全检查库
/// <summary> /// <summary>
/// 安全检查库 /// 安全检查库
@ -685,10 +668,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContentMainDepartment-安全检查库责任部门 #region CheckContentMainDepartment-安全检查库责任部门
/// <summary> /// <summary>
/// 安全检查库责任部门 /// 安全检查库责任部门
@ -796,10 +777,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckContentQuestion-检查问题 #region CheckContentQuestion-检查问题
/// <summary> /// <summary>
/// 检查问题 /// 检查问题
@ -907,10 +886,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckMainLaw-检查库法规 #region CheckMainLaw-检查库法规
/// <summary> /// <summary>
/// 检查库法规 /// 检查库法规
@ -1018,10 +995,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckProject-检查项目 #region CheckProject-检查项目
/// <summary> /// <summary>
/// 检查项目 /// 检查项目
@ -1129,10 +1104,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckProjectCategory-检查项目分类表 #region CheckProjectCategory-检查项目分类表
/// <summary> /// <summary>
/// 检查项目分类表 /// 检查项目分类表
@ -1240,10 +1213,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckProjectCategoryChecktype-检查项目分类_检查类型 #region CheckProjectCategoryChecktype-检查项目分类_检查类型
/// <summary> /// <summary>
/// 检查项目分类_检查类型 /// 检查项目分类_检查类型
@ -1351,10 +1322,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckProjectCategoryObject-检查项目分类_检查区域 #region CheckProjectCategoryObject-检查项目分类_检查区域
/// <summary> /// <summary>
/// 检查项目分类_检查区域 /// 检查项目分类_检查区域
@ -1462,10 +1431,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckProjectProjectCategory-检查项目分类 #region CheckProjectProjectCategory-检查项目分类
/// <summary> /// <summary>
/// 检查项目分类 /// 检查项目分类
@ -1573,10 +1540,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckQuestion-检查问题 #region CheckQuestion-检查问题
/// <summary> /// <summary>
/// 检查问题 /// 检查问题
@ -1684,10 +1649,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckType-检查类型表 #region CheckType-检查类型表
/// <summary> /// <summary>
/// 检查类型表 /// 检查类型表
@ -1794,7 +1757,6 @@ namespace APT.BS.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -1806,10 +1768,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region CheckTypeLevel-检查层级 #region CheckTypeLevel-检查层级
/// <summary> /// <summary>
/// 检查层级 /// 检查层级
@ -1917,10 +1877,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CheckTypeMinetype-检查类型生产单元 #region CheckTypeMinetype-检查类型生产单元
/// <summary> /// <summary>
/// 检查类型生产单元 /// 检查类型生产单元
@ -2028,10 +1986,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentAreaobject-部门范围 #region DepartmentAreaobject-部门范围
/// <summary> /// <summary>
/// 部门范围 /// 部门范围
@ -2139,10 +2095,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region OperateLog-操作日志 #region OperateLog-操作日志
/// <summary> /// <summary>
/// 操作日志 /// 操作日志
@ -2250,10 +2204,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PlanSet-制定任务 #region PlanSet-制定任务
/// <summary> /// <summary>
/// 制定任务 /// 制定任务
@ -2361,10 +2313,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PlanSetArea-制定任务区域 #region PlanSetArea-制定任务区域
/// <summary> /// <summary>
/// 制定任务区域 /// 制定任务区域
@ -2472,10 +2422,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PlanSetDepartmentOut-制定任务排除组织 #region PlanSetDepartmentOut-制定任务排除组织
/// <summary> /// <summary>
/// 制定任务排除组织 /// 制定任务排除组织
@ -2583,10 +2531,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PlanSetDepObject-制定任务部门触发范围 #region PlanSetDepObject-制定任务部门触发范围
/// <summary> /// <summary>
/// 制定任务部门触发范围 /// 制定任务部门触发范围
@ -2694,10 +2640,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PlanSetObject-制定任务触发范围 #region PlanSetObject-制定任务触发范围
/// <summary> /// <summary>
/// 制定任务触发范围 /// 制定任务触发范围
@ -2805,10 +2749,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskCategory-隐患类别 #region RiskCategory-隐患类别
/// <summary> /// <summary>
/// 隐患类别 /// 隐患类别
@ -2916,10 +2858,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskLevelDelayDays-隐患等级最长延期整改天数 #region RiskLevelDelayDays-隐患等级最长延期整改天数
/// <summary> /// <summary>
/// 隐患等级最长延期整改天数 /// 隐患等级最长延期整改天数
@ -3027,10 +2967,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskReason-隐患原因表 #region RiskReason-隐患原因表
/// <summary> /// <summary>
/// 隐患原因表 /// 隐患原因表
@ -3138,10 +3076,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmit-隐患上报表 #region RiskSubmit-隐患上报表
/// <summary> /// <summary>
/// 隐患上报表 /// 隐患上报表
@ -3249,10 +3185,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContent-隐患上报明细 #region RiskSubmitContent-隐患上报明细
/// <summary> /// <summary>
/// 隐患上报明细 /// 隐患上报明细
@ -3360,10 +3294,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentBack-隐患上报明细退回 #region RiskSubmitContentBack-隐患上报明细退回
/// <summary> /// <summary>
/// 隐患上报明细退回 /// 隐患上报明细退回
@ -3471,10 +3403,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentDeal-隐患整改记录 #region RiskSubmitContentDeal-隐患整改记录
/// <summary> /// <summary>
/// 隐患整改记录 /// 隐患整改记录
@ -3582,10 +3512,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentDealAfterFile-检查任务附件表 #region RiskSubmitContentDealAfterFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -3693,10 +3621,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentDealFile-检查任务附件表 #region RiskSubmitContentDealFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -3804,10 +3730,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentDealUserchecksign-隐患整改验收人签名 #region RiskSubmitContentDealUserchecksign-隐患整改验收人签名
/// <summary> /// <summary>
/// 隐患整改验收人签名 /// 隐患整改验收人签名
@ -3915,10 +3839,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentDealUsersign-隐患整改责任人签名 #region RiskSubmitContentDealUsersign-隐患整改责任人签名
/// <summary> /// <summary>
/// 隐患整改责任人签名 /// 隐患整改责任人签名
@ -4026,10 +3948,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentFile-检查任务明细附件表 #region RiskSubmitContentFile-检查任务明细附件表
/// <summary> /// <summary>
/// 检查任务明细附件表 /// 检查任务明细附件表
@ -4137,10 +4057,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentReason-隐患上报明细原因 #region RiskSubmitContentReason-隐患上报明细原因
/// <summary> /// <summary>
/// 隐患上报明细原因 /// 隐患上报明细原因
@ -4248,10 +4166,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitContentTemp-隐患上报详情待入库 #region RiskSubmitContentTemp-隐患上报详情待入库
/// <summary> /// <summary>
/// 隐患上报详情待入库 /// 隐患上报详情待入库
@ -4359,10 +4275,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitDelayApply-延期整改申请 #region RiskSubmitDelayApply-延期整改申请
/// <summary> /// <summary>
/// 延期整改申请 /// 延期整改申请
@ -4470,10 +4384,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitDelayApplyDetail-延期整改申请详情 #region RiskSubmitDelayApplyDetail-延期整改申请详情
/// <summary> /// <summary>
/// 延期整改申请详情 /// 延期整改申请详情
@ -4581,10 +4493,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitFile-检查任务附件表 #region RiskSubmitFile-检查任务附件表
/// <summary> /// <summary>
/// 检查任务附件表 /// 检查任务附件表
@ -4692,10 +4602,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitNotice-隐患通知 #region RiskSubmitNotice-隐患通知
/// <summary> /// <summary>
/// 隐患通知 /// 隐患通知
@ -4803,10 +4711,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskSubmitNoticePerson-隐患通知 #region RiskSubmitNoticePerson-隐患通知
/// <summary> /// <summary>
/// 隐患通知 /// 隐患通知
@ -4914,10 +4820,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskTpm-TPM对接数据 #region RiskTpm-TPM对接数据
/// <summary> /// <summary>
/// TPM对接数据 /// TPM对接数据
@ -5025,10 +4929,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheck-安全检查 #region SafeCheck-安全检查
/// <summary> /// <summary>
/// 安全检查 /// 安全检查
@ -5136,10 +5038,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetail-检查明细 #region SafeCheckDetail-检查明细
/// <summary> /// <summary>
/// 检查明细 /// 检查明细
@ -5247,10 +5147,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailFile-检查任务明细附件表 #region SafeCheckDetailFile-检查任务明细附件表
/// <summary> /// <summary>
/// 检查任务明细附件表 /// 检查任务明细附件表
@ -5358,10 +5256,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailLaw-检查依据 #region SafeCheckDetailLaw-检查依据
/// <summary> /// <summary>
/// 检查依据 /// 检查依据
@ -5469,10 +5365,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailQuestion-检查明细问题 #region SafeCheckDetailQuestion-检查明细问题
/// <summary> /// <summary>
/// 检查明细问题 /// 检查明细问题
@ -5580,10 +5474,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailReason-检查明细隐患原因 #region SafeCheckDetailReason-检查明细隐患原因
/// <summary> /// <summary>
/// 检查明细隐患原因 /// 检查明细隐患原因
@ -5691,10 +5583,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailReject-检查明细退回 #region SafeCheckDetailReject-检查明细退回
/// <summary> /// <summary>
/// 检查明细退回 /// 检查明细退回
@ -5802,10 +5692,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailRejectFile-检查明细退回附件 #region SafeCheckDetailRejectFile-检查明细退回附件
/// <summary> /// <summary>
/// 检查明细退回附件 /// 检查明细退回附件
@ -5913,10 +5801,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckDetailUser-检查明细人员 #region SafeCheckDetailUser-检查明细人员
/// <summary> /// <summary>
/// 检查明细人员 /// 检查明细人员
@ -6024,10 +5910,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckFile-安全检查文件 #region SafeCheckFile-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6135,10 +6019,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckProject-安全检查文件 #region SafeCheckProject-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6246,10 +6128,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckProjectCategory-安全检查文件 #region SafeCheckProjectCategory-安全检查文件
/// <summary> /// <summary>
/// 安全检查文件 /// 安全检查文件
@ -6357,10 +6237,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckRecord-检查记录确认 #region SafeCheckRecord-检查记录确认
/// <summary> /// <summary>
/// 检查记录确认 /// 检查记录确认
@ -6468,10 +6346,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckRecordDetail-检查记录确认明细 #region SafeCheckRecordDetail-检查记录确认明细
/// <summary> /// <summary>
/// 检查记录确认明细 /// 检查记录确认明细
@ -6579,10 +6455,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckRiskArea-检查区域 #region SafeCheckRiskArea-检查区域
/// <summary> /// <summary>
/// 检查区域 /// 检查区域
@ -6690,10 +6564,8 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SafeCheckUsersign-检查签名 #region SafeCheckUsersign-检查签名
/// <summary> /// <summary>
/// 检查签名 /// 检查签名
@ -6801,8 +6673,6 @@ namespace APT.BS.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

3
APT.MicroApi/APT.FM.WebApi/App_Start/DIConfig.cs
View File

@ -2,10 +2,12 @@
using APT.BaseData.Domain.IServices.BS; using APT.BaseData.Domain.IServices.BS;
using APT.BaseData.Domain.IServices.EX; using APT.BaseData.Domain.IServices.EX;
using APT.BaseData.Domain.IServices.FM; using APT.BaseData.Domain.IServices.FM;
using APT.BaseData.Domain.IServices.OP;
using APT.BaseData.Domain.IServices.Platform; using APT.BaseData.Domain.IServices.Platform;
using APT.BaseData.Services.DomainServices; using APT.BaseData.Services.DomainServices;
using APT.BaseData.Services.Services.EX; using APT.BaseData.Services.Services.EX;
using APT.BaseData.Services.Services.FM; using APT.BaseData.Services.Services.FM;
using APT.BaseData.Services.Services.OP;
using APT.BaseData.Services.Services.Platform; using APT.BaseData.Services.Services.Platform;
using APT.BaseData.Services.Sys; using APT.BaseData.Services.Sys;
using Autofac; using Autofac;
@ -53,6 +55,7 @@ namespace APT.FM.WebApi.App_Start
builder.RegisterType<PFApproveCallBackSEService>().As<IPFApproveCallBackSEService>().InstancePerLifetimeScope(); builder.RegisterType<PFApproveCallBackSEService>().As<IPFApproveCallBackSEService>().InstancePerLifetimeScope();
builder.RegisterType<FMNotificationTaskService>().As<IFMNotificationTaskService>().InstancePerLifetimeScope(); builder.RegisterType<FMNotificationTaskService>().As<IFMNotificationTaskService>().InstancePerLifetimeScope();
builder.RegisterType<PFApproveCallBackService>().As<IPFApproveCallBackService>().InstancePerLifetimeScope(); builder.RegisterType<PFApproveCallBackService>().As<IPFApproveCallBackService>().InstancePerLifetimeScope();
builder.RegisterType<OPTenantDBConnService>().As<IOPTenantDBConnService>().InstancePerLifetimeScope();
} }
} }
} }

3
APT.MicroApi/APT.FM.WebApi/Controllers/Api/NotificationTaskController.cs
View File

@ -54,7 +54,10 @@ namespace APT.FM.WebApi.Controllers.Api
order2.Field = "TASK_STARTDT"; order2.Field = "TASK_STARTDT";
order2.Order = DbOrder.DESC; order2.Order = DbOrder.DESC;
pageFilter.Orders.Add(order2); pageFilter.Orders.Add(order2);
pageFilter.OrgId = null;
pageFilter.IgnoreOrgRule = true;
var bear = new BaseFilter(); var bear = new BaseFilter();
bear.IgnoreOrgRule = true;
var todoCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7 && s.TASK_ENDDT >= DateTime.Now.AddMonths(-3), bear); var todoCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7 && s.TASK_ENDDT >= DateTime.Now.AddMonths(-3), bear);
var todayNewCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && (s.NOTICE_TYPE == 2 || s.NOTICE_TYPE == 7), bear);//&& s.TASK_STARTDT > shortToday var todayNewCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && s.NOTICE_STATUS == 0 && (s.NOTICE_TYPE == 2 || s.NOTICE_TYPE == 7), bear);//&& s.TASK_STARTDT > shortToday
var doneCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && (s.NOTICE_STATUS == 1 || s.NOTICE_STATUS == 2) && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7, bear); var doneCount = GetCount<T_FM_NOTIFICATION_TASK>(s => s.USER_ID == userId && (s.NOTICE_STATUS == 1 || s.NOTICE_STATUS == 2) && s.NOTICE_TYPE != 2 && s.NOTICE_TYPE != 7, bear);

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -23,7 +17,6 @@ namespace APT.FM.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
#region Api-API #region Api-API
/// <summary> /// <summary>
/// API /// API
@ -131,10 +124,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region BaseAdd-企业位置信息 #region BaseAdd-企业位置信息
/// <summary> /// <summary>
/// 企业位置信息 /// 企业位置信息
@ -242,10 +233,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region BaseEnergy-企业能耗配置信息 #region BaseEnergy-企业能耗配置信息
/// <summary> /// <summary>
/// 企业能耗配置信息 /// 企业能耗配置信息
@ -353,10 +342,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region BaseInfo-企业基本信息 #region BaseInfo-企业基本信息
/// <summary> /// <summary>
/// 企业基本信息 /// 企业基本信息
@ -464,10 +451,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentCalendarConfig-部门日历配置表 #region DepartmentCalendarConfig-部门日历配置表
/// <summary> /// <summary>
/// 部门日历配置表 /// 部门日历配置表
@ -575,10 +560,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentCalendarConfigDetail-部门日历配置明细表 #region DepartmentCalendarConfigDetail-部门日历配置明细表
/// <summary> /// <summary>
/// 部门日历配置明细表 /// 部门日历配置明细表
@ -686,10 +669,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentCalendarConfigTeam-部门日历配置班组表 #region DepartmentCalendarConfigTeam-部门日历配置班组表
/// <summary> /// <summary>
/// 部门日历配置班组表 /// 部门日历配置班组表
@ -797,10 +778,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentCompletion-XX班完成情况统计 #region DepartmentCompletion-XX班完成情况统计
/// <summary> /// <summary>
/// XX班完成情况统计 /// XX班完成情况统计
@ -908,10 +887,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentCompletionSort-班组完成情况前十 #region DepartmentCompletionSort-班组完成情况前十
/// <summary> /// <summary>
/// 班组完成情况前十 /// 班组完成情况前十
@ -1019,10 +996,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentPost-部门岗位 #region DepartmentPost-部门岗位
/// <summary> /// <summary>
/// 部门岗位 /// 部门岗位
@ -1130,10 +1105,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentPostUser-部门岗位人员 #region DepartmentPostUser-部门岗位人员
/// <summary> /// <summary>
/// 部门岗位人员 /// 部门岗位人员
@ -1241,10 +1214,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentProductionUnit-生产单元 #region DepartmentProductionUnit-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -1352,10 +1323,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentSafeuser-安全员表 #region DepartmentSafeuser-安全员表
/// <summary> /// <summary>
/// 安全员表 /// 安全员表
@ -1463,10 +1432,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentScheduling-部门排班表 #region DepartmentScheduling-部门排班表
/// <summary> /// <summary>
/// 部门排班表 /// 部门排班表
@ -1574,10 +1541,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentSchedulingDetail-排班信息人员明细表 #region DepartmentSchedulingDetail-排班信息人员明细表
/// <summary> /// <summary>
/// 排班信息人员明细表 /// 排班信息人员明细表
@ -1685,10 +1650,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DepartmentUser-部门人员表 #region DepartmentUser-部门人员表
/// <summary> /// <summary>
/// 部门人员表 /// 部门人员表
@ -1796,10 +1759,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Enum-枚举管理 #region Enum-枚举管理
/// <summary> /// <summary>
/// 枚举管理 /// 枚举管理
@ -1907,10 +1868,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Enums-枚举表单 #region Enums-枚举表单
/// <summary> /// <summary>
/// 枚举表单 /// 枚举表单
@ -2018,10 +1977,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region EnumItem-枚举项 #region EnumItem-枚举项
/// <summary> /// <summary>
/// 枚举项 /// 枚举项
@ -2129,10 +2086,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region EnumType-枚举类别 #region EnumType-枚举类别
/// <summary> /// <summary>
/// 枚举类别 /// 枚举类别
@ -2240,10 +2195,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region HiddenDangerRectification-隐患整改完成情况统计 #region HiddenDangerRectification-隐患整改完成情况统计
/// <summary> /// <summary>
/// 隐患整改完成情况统计 /// 隐患整改完成情况统计
@ -2351,10 +2304,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityCompletion-班组作业完成率统计 #region JobActivityCompletion-班组作业完成率统计
/// <summary> /// <summary>
/// 班组作业完成率统计 /// 班组作业完成率统计
@ -2462,10 +2413,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region MessageTemplate-短信模板表 #region MessageTemplate-短信模板表
/// <summary> /// <summary>
/// 短信模板表 /// 短信模板表
@ -2573,10 +2522,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Monitoring-服务器监听表 #region Monitoring-服务器监听表
/// <summary> /// <summary>
/// 服务器监听表 /// 服务器监听表
@ -2684,10 +2631,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Notice-信息通知表 #region Notice-信息通知表
/// <summary> /// <summary>
/// 信息通知表 /// 信息通知表
@ -2795,10 +2740,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region NotificationTask-娑堟伅琛? #region NotificationTask-娑堟伅琛?
/// <summary> /// <summary>
/// 娑堟伅琛? /// 娑堟伅琛?
@ -2906,10 +2849,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃? #region NotificationTaskTimeSet-寰呭姙琛ㄦ椂闂撮厤缃?
/// <summary> /// <summary>
/// 寰呭姙琛ㄦ椂闂撮厤缃? /// 寰呭姙琛ㄦ椂闂撮厤缃?
@ -3017,10 +2958,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ParamSet-参数设置表 #region ParamSet-参数设置表
/// <summary> /// <summary>
/// 参数设置表 /// 参数设置表
@ -3128,10 +3067,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ParamSetDepartment-组织关联信息 #region ParamSetDepartment-组织关联信息
/// <summary> /// <summary>
/// 组织关联信息 /// 组织关联信息
@ -3239,10 +3176,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Person-人员信息 #region Person-人员信息
/// <summary> /// <summary>
/// 人员信息 /// 人员信息
@ -3350,10 +3285,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PersonCertificateFile-证书 #region PersonCertificateFile-证书
/// <summary> /// <summary>
/// 证书 /// 证书
@ -3461,10 +3394,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PersonEducationFile-学历证 #region PersonEducationFile-学历证
/// <summary> /// <summary>
/// 学历证 /// 学历证
@ -3572,10 +3503,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PersonIdcardFile-身份证 #region PersonIdcardFile-身份证
/// <summary> /// <summary>
/// 身份证 /// 身份证
@ -3683,10 +3612,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PersonSkills-技能 #region PersonSkills-技能
/// <summary> /// <summary>
/// 技能 /// 技能
@ -3794,10 +3721,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PersonWork-工作经历 #region PersonWork-工作经历
/// <summary> /// <summary>
/// 工作经历 /// 工作经历
@ -3905,10 +3830,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskLevelProportion-风险等级占比 #region RiskLevelProportion-风险等级占比
/// <summary> /// <summary>
/// 风险等级占比 /// 风险等级占比
@ -4016,10 +3939,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RiskTypeProportion-风险类别占比 #region RiskTypeProportion-风险类别占比
/// <summary> /// <summary>
/// 风险类别占比 /// 风险类别占比
@ -4127,10 +4048,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RoleDepartment-部门权限 #region RoleDepartment-部门权限
/// <summary> /// <summary>
/// 部门权限 /// 部门权限
@ -4238,10 +4157,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Snapshot-随手拍 #region Snapshot-随手拍
/// <summary> /// <summary>
/// 随手拍 /// 随手拍
@ -4349,10 +4266,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SnapshotFile-随手拍图片 #region SnapshotFile-随手拍图片
/// <summary> /// <summary>
/// 随手拍图片 /// 随手拍图片
@ -4460,10 +4375,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SyncLimit-数据同步次数限制 #region SyncLimit-数据同步次数限制
/// <summary> /// <summary>
/// 数据同步次数限制 /// 数据同步次数限制
@ -4571,10 +4484,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SyncLog-跑批日志表 #region SyncLog-跑批日志表
/// <summary> /// <summary>
/// 跑批日志表 /// 跑批日志表
@ -4682,10 +4593,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SyncLogDetail-跑批日志明细表 #region SyncLogDetail-跑批日志明细表
/// <summary> /// <summary>
/// 跑批日志明细表 /// 跑批日志明细表
@ -4793,10 +4702,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SyncUserRule-用户数据同步例外配置 #region SyncUserRule-用户数据同步例外配置
/// <summary> /// <summary>
/// 用户数据同步例外配置 /// 用户数据同步例外配置
@ -4904,10 +4811,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Team-班组表 #region Team-班组表
/// <summary> /// <summary>
/// 班组表 /// 班组表
@ -5015,10 +4920,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TeamPerson-班组人员关联信息 #region TeamPerson-班组人员关联信息
/// <summary> /// <summary>
/// 班组人员关联信息 /// 班组人员关联信息
@ -5126,10 +5029,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserDepartment-用户部门关联表 #region UserDepartment-用户部门关联表
/// <summary> /// <summary>
/// 用户部门关联表 /// 用户部门关联表
@ -5237,10 +5138,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserPost-宀椾綅鍒楄〃 #region UserPost-宀椾綅鍒楄〃
/// <summary> /// <summary>
/// 宀椾綅鍒楄〃 /// 宀椾綅鍒楄〃
@ -5348,10 +5247,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserProductionUnit-生产单元 #region UserProductionUnit-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -5459,10 +5356,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserProductionUnitSet-生产单元 #region UserProductionUnitSet-生产单元
/// <summary> /// <summary>
/// 生产单元 /// 生产单元
@ -5570,10 +5465,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserSignFile-签名照片 #region UserSignFile-签名照片
/// <summary> /// <summary>
/// 签名照片 /// 签名照片
@ -5681,10 +5574,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserTest-测试多选 #region UserTest-测试多选
/// <summary> /// <summary>
/// 测试多选 /// 测试多选
@ -5792,10 +5683,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region UserVacationSet-人员休假设置 #region UserVacationSet-人员休假设置
/// <summary> /// <summary>
/// 人员休假设置 /// 人员休假设置
@ -5903,10 +5792,8 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region WorkTicketCompletion-关键许可工作票完成情况统计 #region WorkTicketCompletion-关键许可工作票完成情况统计
/// <summary> /// <summary>
/// 关键许可工作票完成情况统计 /// 关键许可工作票完成情况统计
@ -6014,8 +5901,6 @@ using APT.BaseData.Domain.Entities;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

305
APT.MicroApi/APT.FM.WebApi/Controllers/Api/UserController.cs
View File

@ -34,6 +34,7 @@ using System.Security.Cryptography;
using APT.MS.Domain.Entities.SC.PT; using APT.MS.Domain.Entities.SC.PT;
using Microsoft.Extensions.DependencyModel; using Microsoft.Extensions.DependencyModel;
using APT.MS.Domain.Entities.SK; using APT.MS.Domain.Entities.SK;
using APT.BaseData.Domain.IServices.OP;
namespace APT.FM.WebApi.Controllers.Api.FM namespace APT.FM.WebApi.Controllers.Api.FM
{ {
@ -47,15 +48,18 @@ namespace APT.FM.WebApi.Controllers.Api.FM
IFMUserService UserService { get; set; } IFMUserService UserService { get; set; }
IFMDepartmentService DepartmentService { get; set; } IFMDepartmentService DepartmentService { get; set; }
IFMNotificationTaskService NotificationTaskService { get; set; } IFMNotificationTaskService NotificationTaskService { get; set; }
IOPTenantDBConnService OPTenantDBConnService { get; set; }
/// <summary> /// <summary>
/// ///
/// </summary> /// </summary>
/// <param name="personnelService"></param> /// <param name="personnelService"></param>
public UserController(IFMUserService personnelService, IFMDepartmentService departmentService, IFMNotificationTaskService notificationTaskService) public UserController(IFMUserService personnelService, IFMDepartmentService departmentService, IFMNotificationTaskService notificationTaskService, IOPTenantDBConnService opTenantDBConnService)
{ {
UserService = personnelService; UserService = personnelService;
DepartmentService = departmentService; DepartmentService = departmentService;
NotificationTaskService = notificationTaskService; NotificationTaskService = notificationTaskService;
OPTenantDBConnService = opTenantDBConnService;
} }
/// <summary> /// <summary>
@ -483,110 +487,125 @@ namespace APT.FM.WebApi.Controllers.Api.FM
T_OG_SAFE_PDT_SIGNED_POST signPost = null; T_OG_SAFE_PDT_SIGNED_POST signPost = null;
T_PT_ASSESSMENT_PLAN_AUDIT_TEMP_DETAIL library = null; T_PT_ASSESSMENT_PLAN_AUDIT_TEMP_DETAIL library = null;
T_FM_NOTIFICATION_TASK noticeToday = null; T_FM_NOTIFICATION_TASK noticeToday = null;
if (!isAdd.Any()) if (string.IsNullOrEmpty(entity.CODE))
{ {
throw new Exception("工号不允许为空!");
}
if (entity.CODE.Length <= 3) if (entity.CODE.Length <= 3)
this.ThrowError("050003"); this.ThrowError("050003");
if (string.IsNullOrEmpty(entity.NAME))
{
throw new Exception("姓名不允许为空!");
}
if (entity.Nav_Person.POST_ID == null)
{
throw new Exception("岗位不允许为空!");
}
if (!isAdd.Any())
{
userList = this.GetEntities<T_FM_USER>(t => (t.CODE == entity.CODE || t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID) && t.ORG_ID == entity.ORG_ID, null, "Nav_Department").ToList(); userList = this.GetEntities<T_FM_USER>(t => (t.CODE == entity.CODE || t.APPROVE_ROLE_ID == entity.APPROVE_ROLE_ID) && t.ORG_ID == entity.ORG_ID, null, "Nav_Department").ToList();
var isRepeat = userList.FirstOrDefault(t => t.CODE == entity.CODE); var isRepeat = userList.FirstOrDefault(t => t.CODE == entity.CODE);
if (isRepeat != null) if (isRepeat != null)
this.ThrowError("050001"); this.ThrowError("050001");
if (entity.ORG_ID != Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa")) if (entity.ORG_ID != Guid.Parse("b043b28b-bbc3-c452-6052-4fba1457abfa"))
{ {
#region 新增人员增加三级安全教育 #region //
eduCard = new T_SE_THREE_LEVEL_SAFE_EDU_CARD(); #region //新增人员增加三级安全教育
eduCard.ID = Guid.NewGuid(); //eduCard = new T_SE_THREE_LEVEL_SAFE_EDU_CARD();
eduCard.ID_CARD_NUMBER = entity.ID_CARD; //eduCard.ID = Guid.NewGuid();
eduCard.IN_TIME = entity.ENTRYTIME; //eduCard.ID_CARD_NUMBER = entity.ID_CARD;
eduCard.USER_ID = entity.ID; //eduCard.IN_TIME = entity.ENTRYTIME;
eduCard.DEPARTMENT_ID = entity.DEPARTMENT_ID; //eduCard.USER_ID = entity.ID;
eduCard.LAUNCH_TIME = DateTime.Now; //eduCard.DEPARTMENT_ID = entity.DEPARTMENT_ID;
eduCard.ORG_ID = entity.ORG_ID; //eduCard.LAUNCH_TIME = DateTime.Now;
eduCard.POST_ID = entity.Nav_Person.POST_ID; //eduCard.ORG_ID = entity.ORG_ID;
eduCard.STATUS = SEThreeLevelSafeTrainStatus.公司培训; //eduCard.POST_ID = entity.Nav_Person.POST_ID;
eduCard.LAUNCH_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID; //eduCard.STATUS = SEThreeLevelSafeTrainStatus.公司培训;
eduCard.LAUNCH_DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID; //eduCard.LAUNCH_USER_ID = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
next_train_record = new T_SE_THREE_LEVEL_SAFE_TRAIN_RECORD //eduCard.LAUNCH_DEPARTMENT_ID = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
{ //next_train_record = new T_SE_THREE_LEVEL_SAFE_TRAIN_RECORD
ID = Guid.NewGuid(), //{
EDU_CARD_ID = eduCard.ID, // ID = Guid.NewGuid(),
ORG_ID = eduCard.ORG_ID, // EDU_CARD_ID = eduCard.ID,
THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.公司级 // ORG_ID = eduCard.ORG_ID,
}; // THREE_LEVEL_SAFE_TRAIN_TYPE = SEThreeLevelSafeTrainType.公司级
var train_contents = GetEntity<T_SE_THREE_LEVEL_SAFE_CONTENT>(t => t.THREE_LEVEL_SAFE_TRAIN_TYPE == (SEThreeLevelSafeTrainType)eduCard.STATUS.GetInt()); //};
next_train_record.CONTENT_ID = train_contents.ID; //var train_contents = GetEntity<T_SE_THREE_LEVEL_SAFE_CONTENT>(t => t.THREE_LEVEL_SAFE_TRAIN_TYPE == (SEThreeLevelSafeTrainType)eduCard.STATUS.GetInt());
var postName = GetEntity<T_FM_USER_POST>(eduCard.POST_ID ?? Guid.Empty)?.NAME; //next_train_record.CONTENT_ID = train_contents.ID;
var sendUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部安全员" && t.IS_DELETED == false && t.ENABLE_STATUS == 0); //var postName = GetEntity<T_FM_USER_POST>(eduCard.POST_ID ?? Guid.Empty)?.NAME;
if (sendUser != null) //var sendUser = GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部安全员" && t.IS_DELETED == false && t.ENABLE_STATUS == 0);
{ //if (sendUser != null)
var endTime = entity.ENTRYTIME.AddMonths(1); //{
var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59); // var endTime = entity.ENTRYTIME.AddMonths(1);
sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel("三级安全培训记录-" + entity.NAME + "-" + eduCard.STATUS.GetDescription(), next_train_record.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE042")); // var newEndTime = new DateTime(endTime.Year, endTime.Month, endTime.Day, 23, 59, 59);
} // sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel("三级安全培训记录-" + entity.NAME + "-" + eduCard.STATUS.GetDescription(), next_train_record.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, newEndTime, 1, "SE042"));
//}
#endregion
#region //新增人员触发安全生产责任制
//var post = GetEntity<T_SC_DEPARTMENT_POST>(t => t.Nav_Dept.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.DEPOST_ID == entity.Nav_Person.POST_ID, new string[] { "Nav_Dept.Nav_Post" });
//if (post != null)
//{
// var standardCreate = GetEntity<T_SC_STANDARD_CREATE>(t => t.POST_ID == post.Nav_Dept.POST_ID && t.STATUS == SCSystemEditStatus.已归档 && t.FILE_STATUS == SCSystemFileStatus.有效);
// if (standardCreate != null)
// {
// var chargeUser = GetEntity<T_FM_USER>(t => t.DEPARTMENT_ID == post.Nav_Dept.Nav_Post.DEPARTMENT_ID && t.Nav_Person.POST_ID == post.Nav_Dept.Nav_Post.DEPOST_ID && t.ENABLE_STATUS == 0);
// if (chargeUser != null)
// {
// signRecord = new T_OG_SAFE_PDT_SIGNED
// {
// ID = Guid.NewGuid(),
// ORG_ID = entity.ORG_ID,
// STATUS = (int)PFStandardStatus.Draft,
// TRIGGER_TYPE = OGPersonalSignedTriggerType.新员工触发,
// //TRIGGER_TYPE = OGPersonalSignedTriggerType.手动新增,
// STANDARD_ID = standardCreate.ID,
// FILE_CONTENT = standardCreate.FILE_CONTENT,
// DEPARTMENT_ID = entity.DEPARTMENT_ID,
// ANNUAL = DateTime.Now.Year
// };
// if (chargeUser != null)
// {
// signRecord.CHARGE_USER_ID = chargeUser.ID;
// }
// signPost = new T_OG_SAFE_PDT_SIGNED_POST
// {
// SAFE_PDT_SIGNED_ID = signRecord.ID,
// ID = Guid.NewGuid(),
// ORG_ID = entity.ORG_ID,
// USER_ID = entity.ID,
// POST_ID = entity.Nav_Person.POST_ID,
// CHARGE_USER_ID = signRecord.CHARGE_USER_ID
// };
// sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "安全生产责任制个人签订表", signRecord.ID, entity.ORG_ID, entity.ID, entity.NAME, DateTime.Now, DateTime.Now.AddDays(7), 1, "OG001_SHOWPRINT"));
// }
// }
//}
//else
//{
// if (sendUser != null)
// {
// sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel("请为《" + postName + "》绑定责任制岗位并上传责任状", entity.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, DateTime.Now.AddDays(7), (int)FMNoticeTypeEnum.今日提醒, "PF135"));
// }
//}
#endregion #endregion
#region 新增人员触发安全生产责任制
var post = GetEntity<T_SC_DEPARTMENT_POST>(t => t.Nav_Dept.DEPARTMENT_ID == entity.DEPARTMENT_ID && t.DEPOST_ID == entity.Nav_Person.POST_ID, new string[] { "Nav_Dept.Nav_Post" });
if (post != null)
{
var standardCreate = GetEntity<T_SC_STANDARD_CREATE>(t => t.POST_ID == post.Nav_Dept.POST_ID && t.STATUS == SCSystemEditStatus.已归档 && t.FILE_STATUS == SCSystemFileStatus.有效);
if (standardCreate != null)
{
var chargeUser = GetEntity<T_FM_USER>(t => t.DEPARTMENT_ID == post.Nav_Dept.Nav_Post.DEPARTMENT_ID && t.Nav_Person.POST_ID == post.Nav_Dept.Nav_Post.DEPOST_ID && t.ENABLE_STATUS == 0);
if (chargeUser != null)
{
signRecord = new T_OG_SAFE_PDT_SIGNED
{
ID = Guid.NewGuid(),
ORG_ID = entity.ORG_ID,
STATUS = (int)PFStandardStatus.Draft,
TRIGGER_TYPE = OGPersonalSignedTriggerType.新员工触发,
//TRIGGER_TYPE = OGPersonalSignedTriggerType.手动新增,
STANDARD_ID = standardCreate.ID,
FILE_CONTENT = standardCreate.FILE_CONTENT,
DEPARTMENT_ID = entity.DEPARTMENT_ID,
ANNUAL = DateTime.Now.Year
};
if (chargeUser != null)
{
signRecord.CHARGE_USER_ID = chargeUser.ID;
}
signPost = new T_OG_SAFE_PDT_SIGNED_POST
{
SAFE_PDT_SIGNED_ID = signRecord.ID,
ID = Guid.NewGuid(),
ORG_ID = entity.ORG_ID,
USER_ID = entity.ID,
POST_ID = entity.Nav_Person.POST_ID,
CHARGE_USER_ID = signRecord.CHARGE_USER_ID
};
sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel(DateTime.Now.ToShortDateString() + "安全生产责任制个人签订表", signRecord.ID, entity.ORG_ID, entity.ID, entity.NAME, DateTime.Now, DateTime.Now.AddDays(7), 1, "OG001_SHOWPRINT"));
}
}
}
else
{
if (sendUser != null)
{
sendNotice.Add(NotificationTaskService.InsertUserNoticeTaskModel("请为《" + postName + "》绑定责任制岗位并上传责任状", entity.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, DateTime.Now.AddDays(7), (int)FMNoticeTypeEnum.今日提醒, "PF135"));
}
}
#endregion #endregion
} }
#region 增加新增人员到ops表 //#region 增加新增人员到ops表
using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"])) //using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"]))
{ //{
var tennant = context.GetEntity<T_OP_TENANT>(t => t.ID == entity.ORG_ID, new string[] { "CODE" }).CODE; // var tennant = context.GetEntity<T_OP_TENANT>(t => t.ID == entity.ORG_ID, new string[] { "CODE" }).CODE;
T_OP_ALLUSER alluser = new T_OP_ALLUSER(); // T_OP_ALLUSER alluser = new T_OP_ALLUSER();
alluser.ID = entity.ID; // alluser.ID = entity.ID;
alluser.CODE = entity.CODE; // alluser.CODE = entity.CODE;
alluser.TENANT = tennant; // alluser.TENANT = tennant;
alluser.ORG_ID = entity.ORG_ID; // alluser.ORG_ID = entity.ORG_ID;
alluser.PHONE = entity.PHONE; // alluser.PHONE = entity.PHONE;
context.AddEntity(alluser); // context.AddEntity(alluser);
context.SaveChanges(); // context.SaveChanges();
} //}
#endregion //#endregion
#region //wyw 密码初始化 Xyy+code（姓名拼音首字母(第一个大写) + 工号（取数字） #region //wyw 密码初始化 Xyy+code（姓名拼音首字母(第一个大写) + 工号（取数字）
@ -728,8 +747,8 @@ namespace APT.FM.WebApi.Controllers.Api.FM
} }
if (roleInfo.DEPARTMENT_TYPE != 3 && roleInfo.DEPARTMENT_TYPE != departmentInfo.DEPARTMENT_TYPE) if (roleInfo.DEPARTMENT_TYPE != 3 && roleInfo.DEPARTMENT_TYPE != departmentInfo.DEPARTMENT_TYPE)
{ {
var param = Enum.GetName(typeof(FMDepartmentType), departmentInfo.DEPARTMENT_TYPE); var param = ((FMDepartmentType)departmentInfo.DEPARTMENT_TYPE).GetDescription();
var param2 = Enum.GetName(typeof(FMDepartmentType), roleInfo.DEPARTMENT_TYPE); var param2 = ((FMDepartmentType)roleInfo.DEPARTMENT_TYPE).GetDescription();
throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致"); throw new Exception(departmentInfo.NAME + "是" + param + "," + roleInfo.NAME + "是" + param2 + ",组织层级不一致");
} }
} }
@ -737,10 +756,6 @@ namespace APT.FM.WebApi.Controllers.Api.FM
} }
else else
this.ThrowError("060001"); this.ThrowError("060001");
if (entity.Nav_Person.POST_ID == null)
{
throw new Exception("岗位不允许为空!");
}
//else //else
//{ //{
// //查双控库是否有该辨识岗位，没有的话触发今日提醒给安全员 // //查双控库是否有该辨识岗位，没有的话触发今日提醒给安全员
@ -928,6 +943,38 @@ namespace APT.FM.WebApi.Controllers.Api.FM
} }
} }
var isHead = HeadHelper.GetIsHead(this.Request.Headers);
Dictionary<Guid, string> dicConn = null;
if (isHead)
{
dicConn = OPTenantDBConnService.GetConnDictionary(entity.ORG_ID);
if (dicConn == null)
{
throw new Exception("获取子公司链接失败，请关闭页面刷新后再试");
}
}
#region 总用户库添加
if (!isAdd.Any())
{
using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"]))
{
var tennant = context.GetEntity<T_OP_TENANT>(t => t.ID == entity.ORG_ID, new string[] { "CODE" }).CODE;
T_OP_ALLUSER alluser = new T_OP_ALLUSER();
alluser.ID = entity.ID;
alluser.CODE = entity.CODE;
alluser.TENANT = tennant;
alluser.ORG_ID = entity.ORG_ID;
alluser.PHONE = entity.PHONE;
context.AddEntity(alluser);
context.SaveChanges();
}
}
#endregion
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (person != null) if (person != null)
@ -985,6 +1032,68 @@ namespace APT.FM.WebApi.Controllers.Api.FM
if (noticeToday != null) if (noticeToday != null)
this.UpdateEntityNoCommit(noticeToday); this.UpdateEntityNoCommit(noticeToday);
}); });
#region wyw 如果是总部 人员信息同步到子公司
if (isHead)
{
entity.Nav_Department = null;
entity.Nav_BelongRoles = null;
entity.Nav_BelongRoleGroups = null;
entity.Nav_BelongUserGroups = null;
entity.Nav_UserPhotoFiles = null;
entity.Nav_UserSignFiles = null;
entity.TEAM_ID = null;
entity.Nav_ApproveRole = null;
entity.PROJECT_ID = null;
entity.PRINTER_ID = null;
person.Nav_DepartMent = null;
person.Nav_Post = null;
person.POST_ID = null;
person.Nav_TeamPersons = null;
person.Nav_PersonWorks = null;
person.Nav_PersonSkills = null;
person.Nav_PersonIDCardFiles = null;
person.Nav_PersonEducationFiles = null;
person.Nav_PersonCertificateFiles = null;
int EditC = 0;
foreach (var item in dicConn)
{
try
{
entity.ORG_ID = item.Key;
person.ORG_ID = item.Key;
using (var context = new MigrationContext(item.Value))
{
EditC = context.GetCount<T_FM_USER>(e => e.ID == entity.ID);
entity.DEPARTMENT_ID = context.GetEntity<T_FM_DEPARTMENT>(e => e.PARENT_ID == null && !e.IS_DELETED && e.DEPARTMENT_TYPE == 5, null).ID;
person.DEPARTMENT_ID = entity.DEPARTMENT_ID;
if (EditC > 0)
{
context.UpdateEntity(entity);
context.UpdateEntity(person);
context.SaveChanges();
}
else
{
context.AddEntity(person);
context.AddEntity(entity);
context.SaveChanges();
}
}
}
catch (Exception ex)
{
}
}
}
#endregion
return true; return true;
}); });
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.FO.WebApi.Controllers.Api namespace APT.FO.WebApi.Controllers.Api
{ {
using APT.MS.Domain.Entities.FO; using APT.MS.Domain.Entities.FO;
#region ChangeShiftRecord-岗位交接班记录表 #region ChangeShiftRecord-岗位交接班记录表
/// <summary> /// <summary>
/// 岗位交接班记录表 /// 岗位交接班记录表
@ -130,10 +123,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ChangeShiftRecordAfterUser-接班人员表 #region ChangeShiftRecordAfterUser-接班人员表
/// <summary> /// <summary>
/// 接班人员表 /// 接班人员表
@ -241,10 +232,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ChangeShiftRecordFile-附件表 #region ChangeShiftRecordFile-附件表
/// <summary> /// <summary>
/// 附件表 /// 附件表
@ -352,10 +341,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ChangeShiftRecordPreUser-交班人员表 #region ChangeShiftRecordPreUser-交班人员表
/// <summary> /// <summary>
/// 交班人员表 /// 交班人员表
@ -463,10 +450,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseDealMeasure-作业后处理措施 #region CrucialLicenseDealMeasure-作业后处理措施
/// <summary> /// <summary>
/// 作业后处理措施 /// 作业后处理措施
@ -574,10 +559,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseJob-关键许可工作表 #region CrucialLicenseJob-关键许可工作表
/// <summary> /// <summary>
/// 关键许可工作表 /// 关键许可工作表
@ -685,10 +668,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseJobFile-附件上传 #region CrucialLicenseJobFile-附件上传
/// <summary> /// <summary>
/// 附件上传 /// 附件上传
@ -796,10 +777,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseJobOutsource-关键许可工作表 #region CrucialLicenseJobOutsource-关键许可工作表
/// <summary> /// <summary>
/// 关键许可工作表 /// 关键许可工作表
@ -907,10 +886,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseOutsourceDealMeasure-作业后处理措施 #region CrucialLicenseOutsourceDealMeasure-作业后处理措施
/// <summary> /// <summary>
/// 作业后处理措施 /// 作业后处理措施
@ -1018,10 +995,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseOutsourcePerson-关键许可人员表 #region CrucialLicenseOutsourcePerson-关键许可人员表
/// <summary> /// <summary>
/// 关键许可人员表 /// 关键许可人员表
@ -1129,10 +1104,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseOutsourceSafeConfirm-作业前安全确认 #region CrucialLicenseOutsourceSafeConfirm-作业前安全确认
/// <summary> /// <summary>
/// 作业前安全确认 /// 作业前安全确认
@ -1240,10 +1213,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseOutsourceSafeMeasure-作业流程及安全措施 #region CrucialLicenseOutsourceSafeMeasure-作业流程及安全措施
/// <summary> /// <summary>
/// 作业流程及安全措施 /// 作业流程及安全措施
@ -1351,10 +1322,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicensePerson-关键许可人员表 #region CrucialLicensePerson-关键许可人员表
/// <summary> /// <summary>
/// 关键许可人员表 /// 关键许可人员表
@ -1462,10 +1431,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseSafeConfirm-作业前安全确认 #region CrucialLicenseSafeConfirm-作业前安全确认
/// <summary> /// <summary>
/// 作业前安全确认 /// 作业前安全确认
@ -1573,10 +1540,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CrucialLicenseSafeMeasure-作业流程及安全措施 #region CrucialLicenseSafeMeasure-作业流程及安全措施
/// <summary> /// <summary>
/// 作业流程及安全措施 /// 作业流程及安全措施
@ -1684,10 +1649,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CurrentClassRecord-岗位当班工作记录表 #region CurrentClassRecord-岗位当班工作记录表
/// <summary> /// <summary>
/// 岗位当班工作记录表 /// 岗位当班工作记录表
@ -1795,10 +1758,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CurrentClassRecordFile-附件表 #region CurrentClassRecordFile-附件表
/// <summary> /// <summary>
/// 附件表 /// 附件表
@ -1906,10 +1867,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CurrentClassRecordLabourSupply-岗位当班劳保用品清单 #region CurrentClassRecordLabourSupply-岗位当班劳保用品清单
/// <summary> /// <summary>
/// 岗位当班劳保用品清单 /// 岗位当班劳保用品清单
@ -2017,10 +1976,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CurrentClassRecordUser-岗位当班工作人员表 #region CurrentClassRecordUser-岗位当班工作人员表
/// <summary> /// <summary>
/// 岗位当班工作人员表 /// 岗位当班工作人员表
@ -2128,10 +2085,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Holidays-国家法定假期维护 #region Holidays-国家法定假期维护
/// <summary> /// <summary>
/// 国家法定假期维护 /// 国家法定假期维护
@ -2239,10 +2194,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region HolidaysDetail- #region HolidaysDetail-
/// <summary> /// <summary>
/// ///
@ -2350,10 +2303,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityDetail-作业活动记录(关键/许可)明细表 #region JobActivityDetail-作业活动记录(关键/许可)明细表
/// <summary> /// <summary>
/// 作业活动记录(关键/许可)明细表 /// 作业活动记录(关键/许可)明细表
@ -2461,10 +2412,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityFile-作业活动记录附件表 #region JobActivityFile-作业活动记录附件表
/// <summary> /// <summary>
/// 作业活动记录附件表 /// 作业活动记录附件表
@ -2572,10 +2521,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityFlow-作业流程及安全措施确认 #region JobActivityFlow-作业流程及安全措施确认
/// <summary> /// <summary>
/// 作业流程及安全措施确认 /// 作业流程及安全措施确认
@ -2683,10 +2630,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityFlowFile-作业流程及安全措施附件表 #region JobActivityFlowFile-作业流程及安全措施附件表
/// <summary> /// <summary>
/// 作业流程及安全措施附件表 /// 作业流程及安全措施附件表
@ -2794,10 +2739,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityMeasure-作业后处理措施确认 #region JobActivityMeasure-作业后处理措施确认
/// <summary> /// <summary>
/// 作业后处理措施确认 /// 作业后处理措施确认
@ -2905,10 +2848,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityMeasureFile-作业活动记录附件表 #region JobActivityMeasureFile-作业活动记录附件表
/// <summary> /// <summary>
/// 作业活动记录附件表 /// 作业活动记录附件表
@ -3016,10 +2957,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityPerson-作业活动记录(关键/许可)人员表 #region JobActivityPerson-作业活动记录(关键/许可)人员表
/// <summary> /// <summary>
/// 作业活动记录(关键/许可)人员表 /// 作业活动记录(关键/许可)人员表
@ -3127,10 +3066,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobActivityRecord-作业活动记录表(关键/许可) #region JobActivityRecord-作业活动记录表(关键/许可)
/// <summary> /// <summary>
/// 作业活动记录表(关键/许可) /// 作业活动记录表(关键/许可)
@ -3238,10 +3175,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventDetail-作业活动记录明细表 #region JobEventDetail-作业活动记录明细表
/// <summary> /// <summary>
/// 作业活动记录明细表 /// 作业活动记录明细表
@ -3349,10 +3284,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventFile-作业活动记录附件表 #region JobEventFile-作业活动记录附件表
/// <summary> /// <summary>
/// 作业活动记录附件表 /// 作业活动记录附件表
@ -3460,10 +3393,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventFlow-作业流程及安全措施确认 #region JobEventFlow-作业流程及安全措施确认
/// <summary> /// <summary>
/// 作业流程及安全措施确认 /// 作业流程及安全措施确认
@ -3571,10 +3502,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventFlowFile-作业流程及安全措施附件表 #region JobEventFlowFile-作业流程及安全措施附件表
/// <summary> /// <summary>
/// 作业流程及安全措施附件表 /// 作业流程及安全措施附件表
@ -3682,10 +3611,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventMeasure-作业后处理措施确认 #region JobEventMeasure-作业后处理措施确认
/// <summary> /// <summary>
/// 作业后处理措施确认 /// 作业后处理措施确认
@ -3793,10 +3720,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventMeasureFile-作业活动记录附件表 #region JobEventMeasureFile-作业活动记录附件表
/// <summary> /// <summary>
/// 作业活动记录附件表 /// 作业活动记录附件表
@ -3904,10 +3829,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventPerson-作业活动记录人员表 #region JobEventPerson-作业活动记录人员表
/// <summary> /// <summary>
/// 作业活动记录人员表 /// 作业活动记录人员表
@ -4015,10 +3938,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region JobEventRecord-作业活动记录表 #region JobEventRecord-作业活动记录表
/// <summary> /// <summary>
/// 作业活动记录表 /// 作业活动记录表
@ -4126,10 +4047,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region LabourSupply-劳保用品 #region LabourSupply-劳保用品
/// <summary> /// <summary>
/// 劳保用品 /// 劳保用品
@ -4237,10 +4156,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreOperSch-作业方案讨论记录 #region PreOperSch-作业方案讨论记录
/// <summary> /// <summary>
/// 作业方案讨论记录 /// 作业方案讨论记录
@ -4348,10 +4265,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreOperSchFile-作业方案讨论记录附件 #region PreOperSchFile-作业方案讨论记录附件
/// <summary> /// <summary>
/// 作业方案讨论记录附件 /// 作业方案讨论记录附件
@ -4459,10 +4374,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreOperSchUser-作业方案讨论记录参会人员表 #region PreOperSchUser-作业方案讨论记录参会人员表
/// <summary> /// <summary>
/// 作业方案讨论记录参会人员表 /// 作业方案讨论记录参会人员表
@ -4570,10 +4483,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreShiftMeetingRecord-班前会议记录表 #region PreShiftMeetingRecord-班前会议记录表
/// <summary> /// <summary>
/// 班前会议记录表 /// 班前会议记录表
@ -4681,10 +4592,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreShiftMeetingRecordDetail-导航：上班生产情况 #region PreShiftMeetingRecordDetail-导航：上班生产情况
/// <summary> /// <summary>
/// 导航：上班生产情况 /// 导航：上班生产情况
@ -4792,10 +4701,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreShiftMeetingRecordDetailPost-涉及岗位 #region PreShiftMeetingRecordDetailPost-涉及岗位
/// <summary> /// <summary>
/// 涉及岗位 /// 涉及岗位
@ -4903,10 +4810,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreShiftMeetingRecordFile-班前会议附件 #region PreShiftMeetingRecordFile-班前会议附件
/// <summary> /// <summary>
/// 班前会议附件 /// 班前会议附件
@ -5014,10 +4919,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PreShiftMeetingRecordUser-班前会议记录与会人员表 #region PreShiftMeetingRecordUser-班前会议记录与会人员表
/// <summary> /// <summary>
/// 班前会议记录与会人员表 /// 班前会议记录与会人员表
@ -5125,10 +5028,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Scheduling-工作票排班明细 #region Scheduling-工作票排班明细
/// <summary> /// <summary>
/// 工作票排班明细 /// 工作票排班明细
@ -5236,10 +5137,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SchedulingTemplate-工作票排班模板 #region SchedulingTemplate-工作票排班模板
/// <summary> /// <summary>
/// 工作票排班模板 /// 工作票排班模板
@ -5347,10 +5246,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region SchedulingTemplateDetail-明细表 #region SchedulingTemplateDetail-明细表
/// <summary> /// <summary>
/// 明细表 /// 明细表
@ -5458,10 +5355,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TeamActivity-班组安全活动记录表 #region TeamActivity-班组安全活动记录表
/// <summary> /// <summary>
/// 班组安全活动记录表 /// 班组安全活动记录表
@ -5569,10 +5464,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TeamActivityFile-班组安全活动附件 #region TeamActivityFile-班组安全活动附件
/// <summary> /// <summary>
/// 班组安全活动附件 /// 班组安全活动附件
@ -5680,10 +5573,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TeamActivityUser-班组安全活动人员表 #region TeamActivityUser-班组安全活动人员表
/// <summary> /// <summary>
/// 班组安全活动人员表 /// 班组安全活动人员表
@ -5791,10 +5682,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TeamSlogan-班组口号配置 #region TeamSlogan-班组口号配置
/// <summary> /// <summary>
/// 班组口号配置 /// 班组口号配置
@ -5902,10 +5791,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TechDisclosureFrom-技术交底表 #region TechDisclosureFrom-技术交底表
/// <summary> /// <summary>
/// 技术交底表 /// 技术交底表
@ -6013,10 +5900,8 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TechDisclosurePerson-被交底人员表 #region TechDisclosurePerson-被交底人员表
/// <summary> /// <summary>
/// 被交底人员表 /// 被交底人员表
@ -6124,8 +6009,6 @@ namespace APT.FO.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.LG.WebApi.Controllers.Api namespace APT.LG.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.LG; using APT.BaseData.Domain.Entities.LG;
#region Oprate-表单操作日志表 #region Oprate-表单操作日志表
/// <summary> /// <summary>
/// 表单操作日志表 /// 表单操作日志表
@ -130,8 +123,6 @@ namespace APT.LG.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.NW.WebApi.Controllers.Api namespace APT.NW.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.NW; using APT.BaseData.Domain.Entities.NW;
#region Enterprise-子企业表 #region Enterprise-子企业表
/// <summary> /// <summary>
/// 子企业表 /// 子企业表
@ -129,7 +122,6 @@ namespace APT.NW.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -141,10 +133,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region RoleDataPerm-子企业数据权限表 #region RoleDataPerm-子企业数据权限表
/// <summary> /// <summary>
/// 子企业数据权限表 /// 子企业数据权限表
@ -252,10 +242,8 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RoleMenu-子企业权限表 #region RoleMenu-子企业权限表
/// <summary> /// <summary>
/// 子企业权限表 /// 子企业权限表
@ -363,8 +351,6 @@ namespace APT.NW.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -22,7 +16,6 @@ using APT.BaseData.Domain.ApiModel.PF;
namespace APT.OP.WebApi.Controllers.Api namespace APT.OP.WebApi.Controllers.Api
{ {
using APT.BaseData.Domain.Entities.OP; using APT.BaseData.Domain.Entities.OP;
#region Alluser-用户表(租户平台) #region Alluser-用户表(租户平台)
/// <summary> /// <summary>
/// 用户表(租户平台) /// 用户表(租户平台)
@ -130,10 +123,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region BillingRule-计费规则表 #region BillingRule-计费规则表
/// <summary> /// <summary>
/// 计费规则表 /// 计费规则表
@ -241,10 +232,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region BillingRuleVersion-计费规则子表 #region BillingRuleVersion-计费规则子表
/// <summary> /// <summary>
/// 计费规则子表 /// 计费规则子表
@ -352,10 +341,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ChargeTimeSet-充电时长配置 #region ChargeTimeSet-充电时长配置
/// <summary> /// <summary>
/// 充电时长配置 /// 充电时长配置
@ -463,10 +450,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Client-客户表 #region Client-客户表
/// <summary> /// <summary>
/// 客户表 /// 客户表
@ -574,10 +559,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ClinetOpenid-客户表OpenId #region ClinetOpenid-客户表OpenId
/// <summary> /// <summary>
/// 客户表OpenId /// 客户表OpenId
@ -685,10 +668,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CommonQuestion-常见问题 #region CommonQuestion-常见问题
/// <summary> /// <summary>
/// 常见问题 /// 常见问题
@ -796,10 +777,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FileFirmware-充电桩固件表 #region FileFirmware-充电桩固件表
/// <summary> /// <summary>
/// 充电桩固件表 /// 充电桩固件表
@ -907,10 +886,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Member-会员表 #region Member-会员表
/// <summary> /// <summary>
/// 会员表 /// 会员表
@ -1018,10 +995,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Menu-菜单表(租户平台) #region Menu-菜单表(租户平台)
/// <summary> /// <summary>
/// 菜单表(租户平台) /// 菜单表(租户平台)
@ -1128,7 +1103,6 @@ namespace APT.OP.WebApi.Controllers.Api
{ {
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary> /// <summary>
/// 获得树形实体数据 /// 获得树形实体数据
/// </summary> /// </summary>
@ -1140,10 +1114,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitTreeOrderEntities(null, filter); return WitTreeOrderEntities(null, filter);
} }
} }
#endregion #endregion
#region Notice-公告表 #region Notice-公告表
/// <summary> /// <summary>
/// 公告表 /// 公告表
@ -1251,10 +1223,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region NoticeDetail-公告内容 #region NoticeDetail-公告内容
/// <summary> /// <summary>
/// 公告内容 /// 公告内容
@ -1362,10 +1332,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PeakValleyConfig-峰谷配置表 #region PeakValleyConfig-峰谷配置表
/// <summary> /// <summary>
/// 峰谷配置表 /// 峰谷配置表
@ -1473,10 +1441,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RechargeCard-充值卡 #region RechargeCard-充值卡
/// <summary> /// <summary>
/// 充值卡 /// 充值卡
@ -1584,10 +1550,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RechargeOrder-充值订单 #region RechargeOrder-充值订单
/// <summary> /// <summary>
/// 充值订单 /// 充值订单
@ -1695,10 +1659,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RechargeSetting-充值金额配置 #region RechargeSetting-充值金额配置
/// <summary> /// <summary>
/// 充值金额配置 /// 充值金额配置
@ -1806,10 +1768,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RfidCard-RFID卡 #region RfidCard-RFID卡
/// <summary> /// <summary>
/// RFID卡 /// RFID卡
@ -1917,10 +1877,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region RoleMenu-租户权限表 #region RoleMenu-租户权限表
/// <summary> /// <summary>
/// 租户权限表 /// 租户权限表
@ -2028,10 +1986,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Tenant-租户表 #region Tenant-租户表
/// <summary> /// <summary>
/// 租户表 /// 租户表
@ -2139,10 +2095,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TenantDbConn-租户数据库表 #region TenantDbConn-租户数据库表
/// <summary> /// <summary>
/// 租户数据库表 /// 租户数据库表
@ -2250,10 +2204,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TenantDomain-租户域名表 #region TenantDomain-租户域名表
/// <summary> /// <summary>
/// 租户域名表 /// 租户域名表
@ -2361,10 +2313,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region TenantExpiration-租户租期表 #region TenantExpiration-租户租期表
/// <summary> /// <summary>
/// 租户租期表 /// 租户租期表
@ -2472,10 +2422,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region User-用户表(租户平台) #region User-用户表(租户平台)
/// <summary> /// <summary>
/// 用户表(租户平台) /// 用户表(租户平台)
@ -2583,10 +2531,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Version-版本升级表 #region Version-版本升级表
/// <summary> /// <summary>
/// 版本升级表 /// 版本升级表
@ -2694,10 +2640,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region VersionMenu-菜单版本升级表 #region VersionMenu-菜单版本升级表
/// <summary> /// <summary>
/// 菜单版本升级表 /// 菜单版本升级表
@ -2805,10 +2749,8 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region VersionTenant-租户版本升级表 #region VersionTenant-租户版本升级表
/// <summary> /// <summary>
/// 租户版本升级表 /// 租户版本升级表
@ -2916,8 +2858,6 @@ namespace APT.OP.WebApi.Controllers.Api
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

80
APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApprovalRoleController.cs
View File

@ -2,7 +2,9 @@
using APT.BaseData.Domain.Entities.FM; using APT.BaseData.Domain.Entities.FM;
using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Enums; using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.OP;
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using APT.Migrations;
using APT.MS.Domain.Entities.BS; using APT.MS.Domain.Entities.BS;
using APT.MS.Domain.Entities.HM; using APT.MS.Domain.Entities.HM;
using APT.MS.Domain.Entities.PF; using APT.MS.Domain.Entities.PF;
@ -13,6 +15,7 @@ using Microsoft.AspNetCore.Mvc;
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Transactions;
namespace APT.PF.WebApi.Controllers.Api namespace APT.PF.WebApi.Controllers.Api
{ {
@ -22,6 +25,13 @@ namespace APT.PF.WebApi.Controllers.Api
[Route("api/PF/PFApprovalRole")] [Route("api/PF/PFApprovalRole")]
public partial class ApprovalRoleController : AuthorizeApiController<T_PF_APPROVAL_ROLE> public partial class ApprovalRoleController : AuthorizeApiController<T_PF_APPROVAL_ROLE>
{ {
IOPTenantDBConnService OPTenantDBConnService { get; set; }
public ApprovalRoleController(IOPTenantDBConnService opTenantDBConnService)
{
OPTenantDBConnService = opTenantDBConnService;
}
/// <summary> /// <summary>
/// 更新或新增数据 /// 更新或新增数据
/// </summary> /// </summary>
@ -32,6 +42,12 @@ namespace APT.PF.WebApi.Controllers.Api
{ {
return SafeExecute<bool>(() => return SafeExecute<bool>(() =>
{ {
var isHead = HeadHelper.GetIsHead(this.Request.Headers);
if (entity.ISHEAD && !isHead)
{
throw new Exception("子公司不能修改总公司角色信息！");
}
var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId; var orgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
//var roleCodes = this.GetEntities<T_PF_APPROVAL_ROLE>(t => true, new BaseFilter(orgId)).Select(x => x.NAME).ToList(); //var roleCodes = this.GetEntities<T_PF_APPROVAL_ROLE>(t => true, new BaseFilter(orgId)).Select(x => x.NAME).ToList();
//if (roleCodes.Contains(entity.NAME)) //if (roleCodes.Contains(entity.NAME))
@ -66,13 +82,13 @@ namespace APT.PF.WebApi.Controllers.Api
listRoles.Add(role); listRoles.Add(role);
} }
} }
List <Guid> deleteIds = new List<Guid>(); List<Guid> deleteIds = new List<Guid>();
if (entity.ROLE_ID != null) if (entity.ROLE_ID != null)
{ {
var datas = this.GetEntities<T_PF_APPROVE_OPERATION_ROLE>(t => t.APPROVAL_ROLE_ID == entity.ID, new BaseFilter(orgId)); var datas = this.GetEntities<T_PF_APPROVE_OPERATION_ROLE>(t => t.APPROVAL_ROLE_ID == entity.ID, new BaseFilter(orgId));
if (datas.Any()) if (datas.Any())
{ {
var ids=datas.Select(t => t.ID).ToList(); var ids = datas.Select(t => t.ID).ToList();
deleteIds.AddRange(ids); deleteIds.AddRange(ids);
} }
var role = new T_PF_APPROVE_OPERATION_ROLE(); var role = new T_PF_APPROVE_OPERATION_ROLE();
@ -85,6 +101,15 @@ namespace APT.PF.WebApi.Controllers.Api
{ {
listRoles = listRoles.Distinct(t => t.ROLE_ID).ToList(); listRoles = listRoles.Distinct(t => t.ROLE_ID).ToList();
} }
Dictionary<Guid, string> dicConn = null;
if (isHead)
{
dicConn = OPTenantDBConnService.GetConnDictionary(entity.ORG_ID);
if (dicConn == null)
{
throw new Exception("获取子公司链接失败，请关闭页面刷新后再试");
}
}
UnifiedCommit(() => UnifiedCommit(() =>
{ {
if (entity != null) if (entity != null)
@ -96,6 +121,57 @@ namespace APT.PF.WebApi.Controllers.Api
if (deleteIds != null && deleteIds.Any()) if (deleteIds != null && deleteIds.Any())
BantchDeleteEntityNoCommit<T_PF_APPROVE_OPERATION_ROLE>(deleteIds); //保存子表 BantchDeleteEntityNoCommit<T_PF_APPROVE_OPERATION_ROLE>(deleteIds); //保存子表
}); });
//如果是总部 同时同步到各个子公司
if (isHead)
{
entity.ISHEAD = true;
entity.ROLE_ID = null;
entity.Nav_Role = null;
entity.Nav_ApproveRoles = null;
int EditC = 0;
//using (var scope = new TransactionScope(TransactionScopeAsyncFlowOption.Enabled))
//{
// try
// {
foreach (var item in dicConn)
{
try
{
entity.ORG_ID = item.Key;
using (var context = new MigrationContext(item.Value))
{
EditC = context.GetCount<T_PF_APPROVAL_ROLE>(e => e.ID == entity.ID);
if (EditC > 0)
{
context.UpdateEntity(entity);
context.SaveChanges();
//context.SaveChangesAsync();
}
else
{
context.AddEntity(entity);
context.SaveChanges();
//context.AddAsync(entity);
//context.SaveChangesAsync();
}
}
}
catch (Exception ex)
{
}
}
// //// 所有操作成功，提交事务
// scope.Complete();
// }
// catch (Exception ex)
// {
// // 发生异常，自动回滚（无需手动调用，scope 释放时未 Complete 则回滚）
// throw;
// }
//}
}
return true; return true;
}); });
} }

37
APT.MicroApi/APT.PF.WebApi/Controllers/Api/ApproveController.cs
View File

@ -334,8 +334,8 @@
case "关键许可工作票（二级审批）": case "关键许可工作票（二级审批）":
case "关键许可工作票（三级审批）": case "关键许可工作票（三级审批）":
case "关键许可工作票（四级审批）": case "关键许可工作票（四级审批）":
var job = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(t=>t.ID == entity.DATA_ID, "Nav_OperationStep"); var job = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(t => t.ID == entity.DATA_ID, "Nav_OperationStep");
NoticeTitle = job != null && job.Nav_OperationStep != null ? entity.NAME+"-"+job.Nav_OperationStep?.NAME + "待审批" : NoticeTitle; NoticeTitle = job != null && job.Nav_OperationStep != null ? entity.NAME + "-" + job.Nav_OperationStep?.NAME + "待审批" : NoticeTitle;
endTime = Convert.ToDateTime(DateTime.Now.AddDays(1).ToString("D").ToString()).AddSeconds(-1); endTime = Convert.ToDateTime(DateTime.Now.AddDays(1).ToString("D").ToString()).AddSeconds(-1);
break; break;
default: break; default: break;
@ -645,18 +645,33 @@
[HttpPost, Route("FullGet")] [HttpPost, Route("FullGet")]
public JsonActionResult<T_PF_APPROVE> FullGet([FromBody] KeywordFilter filter) public JsonActionResult<T_PF_APPROVE> FullGet([FromBody] KeywordFilter filter)
{ {
var result = WitEntity(null, filter); return SafeExecute(() =>
if (result.Data != null)
{ {
if (result.Data.APPROVE_TEMP_ID != null) T_PF_APPROVE result = null;
if (!string.IsNullOrEmpty(filter.Parameter1) && filter.OrgId.HasValue && filter.Parameter1 != filter.OrgId.Value.ToString())
{ {
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.Data.APPROVE_TEMP_ID); //集团人员 通过 首页点击 获取对应的数据库链接 返回结果
if (approveTemp != null) //这边怎么调用 原生的 GetEntity 方法
result.Data.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
//ICommonService service = _serviceLocator.GetService<ICommonService>();
}
else
{
result = GetEntity<T_PF_APPROVE>(null, filter, null);
if (result != null)
{
if (result.APPROVE_TEMP_ID != null)
{
var approveTemp = this.GetEntity<T_PF_APPROVE_TEMP>(t => t.ID == result.APPROVE_TEMP_ID);
if (approveTemp != null)
result.REJECT_INTERFACE = approveTemp.REJECT_INTERFACE;
}
result.Nav_ApproveDetails = result.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
} }
result.Data.Nav_ApproveDetails = result.Data.Nav_ApproveDetails.OrderBy(t => t.NUM).ThenBy(m => m.MODIFY_TIME).ToList();
} }
return result; return result;
});
} }
/// <summary> /// <summary>
@ -959,7 +974,7 @@
/// </summary> /// </summary>
/// <param name="id"></param> /// <param name="id"></param>
/// <returns></returns> /// <returns></returns>
private bool BackUpdate_FOJobCrucialLicense(string id,Action action) private bool BackUpdate_FOJobCrucialLicense(string id, Action action)
{ {
//var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, false, "Nav_OperationStep", "Nav_ApplyUser", "Nav_CrucialLicensePerson"); //var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, false, "Nav_OperationStep", "Nav_ApplyUser", "Nav_CrucialLicensePerson");
var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, new string[] { "Nav_OperationStep", "Nav_ApplyUser", "Nav_CrucialLicensePerson" });// wyw var entity = this.GetEntity<T_FO_CRUCIAL_LICENSE_JOB>(id, new string[] { "Nav_OperationStep", "Nav_ApplyUser", "Nav_CrucialLicensePerson" });// wyw
@ -1055,7 +1070,7 @@
}); });
return true; return true;
} }
private bool BackUpdate_FOJobEventRecord(string id,Action action) private bool BackUpdate_FOJobEventRecord(string id, Action action)
{ {
var entity = this.GetEntity<T_FO_JOB_EVENT_RECORD>(id, "Nav_Details"); var entity = this.GetEntity<T_FO_JOB_EVENT_RECORD>(id, "Nav_Details");
entity.FORM_STATUS = (int)FOTeamActivityState.已归档; entity.FORM_STATUS = (int)FOTeamActivityState.已归档;

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

@ -2,12 +2,6 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -25,7 +19,6 @@ namespace APT.PF.WebApi.Controllers.Api
using APT.BaseData.Domain.Entities; using APT.BaseData.Domain.Entities;
using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4; using APT.BaseData.Domain.Entities.T4;
#region ApprovalRole-审批角色 #region ApprovalRole-审批角色
/// <summary> /// <summary>
/// 审批角色 /// 审批角色
@ -133,10 +126,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Approve-审批流主表 #region Approve-审批流主表
/// <summary> /// <summary>
/// 审批流主表 /// 审批流主表
@ -244,10 +235,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveDetail-审批流子表 #region ApproveDetail-审批流子表
/// <summary> /// <summary>
/// 审批流子表 /// 审批流子表
@ -355,10 +344,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveOperationRole-操作角色 #region ApproveOperationRole-操作角色
/// <summary> /// <summary>
/// 操作角色 /// 操作角色
@ -466,10 +453,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveRejectConfig-审批驳回配置表 #region ApproveRejectConfig-审批驳回配置表
/// <summary> /// <summary>
/// 审批驳回配置表 /// 审批驳回配置表
@ -577,10 +562,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveRoleDepartment-分管部门 #region ApproveRoleDepartment-分管部门
/// <summary> /// <summary>
/// 分管部门 /// 分管部门
@ -688,10 +671,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveTemp-审批流模板主表 #region ApproveTemp-审批流模板主表
/// <summary> /// <summary>
/// 审批流模板主表 /// 审批流模板主表
@ -799,10 +780,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ApproveTempDetail-审批流模板子表 #region ApproveTempDetail-审批流模板子表
/// <summary> /// <summary>
/// 审批流模板子表 /// 审批流模板子表
@ -910,10 +889,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region AppVersion-App版本发布 #region AppVersion-App版本发布
/// <summary> /// <summary>
/// App版本发布 /// App版本发布
@ -1021,10 +998,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region AppVersionFile-App包文件 #region AppVersionFile-App包文件
/// <summary> /// <summary>
/// App包文件 /// App包文件
@ -1132,10 +1107,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ClientScopes-资源表 #region ClientScopes-资源表
/// <summary> /// <summary>
/// 资源表 /// 资源表
@ -1243,10 +1216,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region CodeRuleRunLog-编码规则跑批表 #region CodeRuleRunLog-编码规则跑批表
/// <summary> /// <summary>
/// 编码规则跑批表 /// 编码规则跑批表
@ -1354,10 +1325,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region ComplaintLog-转办记录表 #region ComplaintLog-转办记录表
/// <summary> /// <summary>
/// 转办记录表 /// 转办记录表
@ -1465,10 +1434,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DataChannel-数据通道 #region DataChannel-数据通道
/// <summary> /// <summary>
/// 数据通道 /// 数据通道
@ -1576,10 +1543,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region DataFrequency-采集频率 #region DataFrequency-采集频率
/// <summary> /// <summary>
/// 采集频率 /// 采集频率
@ -1687,10 +1652,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Fddeback-意见反馈 #region Fddeback-意见反馈
/// <summary> /// <summary>
/// 意见反馈 /// 意见反馈
@ -1798,10 +1761,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FddebackFile-意见反馈附件 #region FddebackFile-意见反馈附件
/// <summary> /// <summary>
/// 意见反馈附件 /// 意见反馈附件
@ -1909,10 +1870,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FileDb- #region FileDb-
/// <summary> /// <summary>
/// ///
@ -2020,10 +1979,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FileDbFile- #region FileDbFile-
/// <summary> /// <summary>
/// ///
@ -2131,10 +2088,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FileType- #region FileType-
/// <summary> /// <summary>
/// ///
@ -2242,10 +2197,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FormHomeChart-首页：图标区域 #region FormHomeChart-首页：图标区域
/// <summary> /// <summary>
/// 首页：图标区域 /// 首页：图标区域
@ -2353,10 +2306,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FormHomeHmi-首页：HMI区域 #region FormHomeHmi-首页：HMI区域
/// <summary> /// <summary>
/// 首页：HMI区域 /// 首页：HMI区域
@ -2464,10 +2415,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FormHomeRanking-首页：排名区域 #region FormHomeRanking-首页：排名区域
/// <summary> /// <summary>
/// 首页：排名区域 /// 首页：排名区域
@ -2575,10 +2524,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FormHomeStatistic-首页：统计区域 #region FormHomeStatistic-首页：统计区域
/// <summary> /// <summary>
/// 首页：统计区域 /// 首页：统计区域
@ -2686,10 +2633,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region FormRelation-关联表单配置 #region FormRelation-关联表单配置
/// <summary> /// <summary>
/// 关联表单配置 /// 关联表单配置
@ -2797,10 +2742,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region HomeTitle-首页方针 #region HomeTitle-首页方针
/// <summary> /// <summary>
/// 首页方针 /// 首页方针
@ -2908,10 +2851,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region MqttConfig-MQTT配置表 #region MqttConfig-MQTT配置表
/// <summary> /// <summary>
/// MQTT配置表 /// MQTT配置表
@ -3019,10 +2960,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region MqttConfigTheme- #region MqttConfigTheme-
/// <summary> /// <summary>
/// ///
@ -3130,10 +3069,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Notice-通知 #region Notice-通知
/// <summary> /// <summary>
/// 通知 /// 通知
@ -3241,10 +3178,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region NoticeFile- #region NoticeFile-
/// <summary> /// <summary>
/// ///
@ -3352,10 +3287,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PicFilter-图片条件主表 #region PicFilter-图片条件主表
/// <summary> /// <summary>
/// 图片条件主表 /// 图片条件主表
@ -3463,10 +3396,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region PicFilterDetail-图片条件子表 #region PicFilterDetail-图片条件子表
/// <summary> /// <summary>
/// 图片条件子表 /// 图片条件子表
@ -3574,10 +3505,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region QuestionFeedback-问题反馈表 #region QuestionFeedback-问题反馈表
/// <summary> /// <summary>
/// 问题反馈表 /// 问题反馈表
@ -3685,10 +3614,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region QuestionFeedbackFile-问题反馈附件表 #region QuestionFeedbackFile-问题反馈附件表
/// <summary> /// <summary>
/// 问题反馈附件表 /// 问题反馈附件表
@ -3796,10 +3723,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region Scopes-资源表 #region Scopes-资源表
/// <summary> /// <summary>
/// 资源表 /// 资源表
@ -3907,10 +3832,8 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
#region VersionManage-版本管理表 #region VersionManage-版本管理表
/// <summary> /// <summary>
/// 版本管理表 /// 版本管理表
@ -4018,8 +3941,6 @@ using APT.BaseData.Domain.Entities.T4;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
} }
#endregion #endregion
} }

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

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

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

File diff suppressed because it is too large Load Diff

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

File diff suppressed because it is too large Load Diff

22
APT.Utility/HeadHelper.cs Normal file
View File

@ -0,0 +1,22 @@
using APT.Infrastructure.Core;
using Microsoft.AspNetCore.Http;
namespace APT.Utility
{
public class HeadHelper
{
/// <summary>
/// 地球半径
/// </summary>
public const string HeadtelnetCode = "0003";
public static bool GetIsHead(IHeaderDictionary Headers)
{
if (Headers != null && Headers.ContainsKey("Tenant") && Headers["Tenant"] == HeadtelnetCode)
{
return true;
}
return false;
}
}
}

1
APT.Utility/SessionData.cs
View File

@ -24,5 +24,6 @@ namespace APT.Utility
public string MineType { get; set; } public string MineType { get; set; }
public string[] DataRule { get; set; } public string[] DataRule { get; set; }
public bool IsHead { get; set; }
} }
} }