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

2134

Browse Source
This commit is contained in:
wyw 2026-04-23 09:26:18 +08:00
commit c8769e0b27
26 changed files with 281403 additions and 139179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
APT.BaseData.Services/Services/FM/FMFlowPermitService.cs
View File

@ -418,6 +418,9 @@ namespace APT.BaseData.Services.Services.FM
var hm = this.GetEntity<T_HM_EVALUATION_PLAN>(t => t.STATUS == FOPreMeetingStatusEnum.归档); var hm = this.GetEntity<T_HM_EVALUATION_PLAN>(t => t.STATUS == FOPreMeetingStatusEnum.归档);
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(approveTemp.ORG_ID), "Nav_Department", "Nav_ApproveRole").ToList();//((t.APPROVE_ROLE_ID != null && approveRoles.Contains((Guid)t.APPROVE_ROLE_ID)) || listUserID.Contains(t.ID)) var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(approveTemp.ORG_ID), "Nav_Department", "Nav_ApproveRole").ToList();//((t.APPROVE_ROLE_ID != null && approveRoles.Contains((Guid)t.APPROVE_ROLE_ID)) || listUserID.Contains(t.ID))
var userVacations = this.GetEntities<T_FM_USER_VACATION_SET>(t => t.START_DATE <= DateTime.Now && t.END_DATE >= DateTime.Now, new BaseFilter(approveTemp.ORG_ID), "Nav_Agent"); var userVacations = this.GetEntities<T_FM_USER_VACATION_SET>(t => t.START_DATE <= DateTime.Now && t.END_DATE >= DateTime.Now, new BaseFilter(approveTemp.ORG_ID), "Nav_Agent");
var loginUser = users.FirstOrDefault(t => t.ID == loginUserId);
List<Guid> departmentIds = new List<Guid>();
GetDepartmentId((Guid)loginUser.DEPARTMENT_ID, ref departmentIds);
approveTemp.Nav_ApproveTempDetails.ForEach(t => approveTemp.Nav_ApproveTempDetails.ForEach(t =>
{ {
//var user = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == t.APPROVE_ROLE_ID); //var user = users.FirstOrDefault(x => x.APPROVE_ROLE_ID == t.APPROVE_ROLE_ID);
@ -461,7 +464,17 @@ namespace APT.BaseData.Services.Services.FM
} }
detail.Nav_ApproveRole = t.Nav_ApproveRole; detail.Nav_ApproveRole = t.Nav_ApproveRole;
if (detail.APPROVE_USER_ID == null) if (detail.APPROVE_USER_ID == null)
{
var approveRole = this.GetEntity<T_PF_APPROVAL_ROLE>(t => t.ID == detail.APPROVE_ROLE_ID);
if (approveRole != null)
{
var depart = this.GetEntity<T_FM_DEPARTMENT>(t => departmentIds.Contains(t.ID) && t.DEPARTMENT_TYPE == approveRole.DEPARTMENT_TYPE && t.CATEGORY == FMCATEGORY.ACTURE);
if (depart != null)
{
throw new Exception("审批流未找到" + detail.NAME + "，请到用户列表配置对应审批角色"); throw new Exception("审批流未找到" + detail.NAME + "，请到用户列表配置对应审批角色");
}
}
}
if (detail.APPROVE_USER_ID != null) if (detail.APPROVE_USER_ID != null)
appdetails.Add(detail); appdetails.Add(detail);
}); });

77
APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs
View File

@ -2490,22 +2490,73 @@ namespace APT.BaseData.Services.DomainServices
entity.STATUS = PFStandardStatus.Archived; entity.STATUS = PFStandardStatus.Archived;
entity.FIRE_STATUS = FOFireStatus.ApprovingFinish; entity.FIRE_STATUS = FOFireStatus.ApprovingFinish;
T_FM_NOTIFICATION_TASK notice = null; T_FM_NOTIFICATION_TASK notice = null;
T_FO_TECH_DISCLOSURE_FROM_SAFE formSafe = null; var tech = new T_FO_TECH_DISCLOSURE_FROM();
var techUsers = new List<T_FO_TECH_DISCLOSURE_PERSON>();
//触发技术交底表给施工单位负责人 //触发技术交底表给施工单位负责人
if (entity.FIRE_USER_ID != null) if (entity.FIRE_USER_ID != null)
{ {
var sendUser = this.GetEntity<T_FM_USER>(t => t.ID == entity.FIRE_USER_ID); var sendUser = this.GetEntity<T_FM_USER>(t => t.ID == entity.FIRE_USER_ID);
if (sendUser != null) if (sendUser != null)
{ //触发技术交底表
var techForm = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM>(t => t.FIRE_JOB_ID == entity.ID);
if (techForm == null)
{ {
formSafe = new T_FO_TECH_DISCLOSURE_FROM_SAFE(); //取审批流水码
formSafe.ORG_ID = entity.ORG_ID; var sysFilter = new SystemCodeFilter();
formSafe.FIRE_JOB_ID = entity.ID; sysFilter.CodeType = (int)PFCodeRuleType.技术交底表编号;
formSafe.USER_ID = sendUser.ID; sysFilter.Count = 1;
formSafe.DISCLOSURE_DATE = DateTime.Now; sysFilter.OrgId = entity.ORG_ID;
formSafe.DEPARTMENT_ID = sendUser.DEPARTMENT_ID; var codes = CodeRuleService.NewGenSerial(sysFilter);
formSafe.CODE = "AQJD" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999); var codeList = codes.Split(new char[] { ',' });
notice = NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表", formSafe.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now, //主表
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO037"); tech.CODE = codeList[0];
tech.ORG_ID = entity.ORG_ID;
tech.OPERATION_STEP_ID = entity.OPERATION_STEP_ID;
tech.FIRE_JOB_ID = entity.ID;
tech.JOB_LOCATION = entity.JOB_LOCATION;
tech.DISCLOSURE_PERSON_ID = sendUser.ID;
tech.IS_AUTO = (int)ISImportantEnum.是;
tech.IS_OUTSOURCE = false;
tech.RELATED_ID = null;
if (entity.SAFE_USER_ID != null)
{
T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
person.ORG_ID = entity.ORG_ID;
person.USER_ID = entity.SAFE_USER_ID;
person.TECH_DISCLOSURE_FROM_ID = tech.ID;
person.CREATER_ID = entity.CREATER_ID;
techUsers.Add(person);
}
if (entity.Nav_Users != null && entity.Nav_Users.Any())
{
entity.Nav_Users.ForEach(t =>
{
T_FO_TECH_DISCLOSURE_PERSON person = new T_FO_TECH_DISCLOSURE_PERSON();
person.ORG_ID = t.ORG_ID;
person.USER_ID = t.USER_ID;
person.TECH_DISCLOSURE_FROM_ID = tech.ID;
person.CREATER_ID = t.CREATER_ID;
techUsers.Add(person);
});
}
techUsers = techUsers.Where(m => m.USER_ID != null).Distinct(t => t.USER_ID).ToList();
notice = NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表", tech.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO019");
}
else
{
entity.STATUS = PFStandardStatus.Archived;
tech = null; techUsers = null;
}
//formSafe = new T_FO_TECH_DISCLOSURE_FROM_SAFE();
//formSafe.ORG_ID = entity.ORG_ID;
//formSafe.FIRE_JOB_ID = entity.ID;
//formSafe.USER_ID = sendUser.ID;
//formSafe.DISCLOSURE_DATE = DateTime.Now;
//formSafe.DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
//formSafe.CODE = "AQJD" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
} }
} }
//if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users != null && entity.Nav_Users.Any()) //if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users != null && entity.Nav_Users.Any())
@ -2535,8 +2586,10 @@ namespace APT.BaseData.Services.DomainServices
BantchSaveEntityNoCommit(listTaskNext); BantchSaveEntityNoCommit(listTaskNext);
if (entity != null) if (entity != null)
this.UpdateEntityNoCommit(entity); this.UpdateEntityNoCommit(entity);
if (formSafe != null) if (tech != null)
this.UpdateEntityNoCommit(formSafe); this.UpdateEntityNoCommit(tech);
if (techUsers != null && techUsers.Count > 0)
BantchSaveEntityNoCommit(techUsers);
if (notice != null) if (notice != null)
this.UpdateEntityNoCommit(notice); this.UpdateEntityNoCommit(notice);
}); });

139300
APT.Data.Migrations/Migrations/20260422090706_hmr2026042201.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

45
APT.Data.Migrations/Migrations/20260422090706_hmr2026042201.cs Normal file
View File

@ -0,0 +1,45 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026042201 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<Guid>(
name: "FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_FO_TECH_DISCLOSURE_FROM_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM",
column: "FIRE_JOB_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_FO_TECH_DISCLOSURE_FROM_T_FO_FIRE_JOB_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM",
column: "FIRE_JOB_ID",
principalTable: "T_FO_FIRE_JOB",
principalColumn: "ID",
onDelete: ReferentialAction.Restrict);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropForeignKey(
name: "FK_T_FO_TECH_DISCLOSURE_FROM_T_FO_FIRE_JOB_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM");
migrationBuilder.DropIndex(
name: "IX_T_FO_TECH_DISCLOSURE_FROM_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM");
migrationBuilder.DropColumn(
name: "FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM");
}
}
}

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

@ -38921,6 +38921,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("ENTITY_ORG_TPYE") b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int"); .HasColumnType("int");
b.Property<Guid?>("FIRE_JOB_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID") b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier"); .HasColumnType("uniqueidentifier");
@ -38977,6 +38980,8 @@ namespace APT.Data.Migrations.Migrations
b.HasIndex("DISCLOSURE_PERSON_ID"); b.HasIndex("DISCLOSURE_PERSON_ID");
b.HasIndex("FIRE_JOB_ID");
b.HasIndex("JOB_NAME_ID"); b.HasIndex("JOB_NAME_ID");
b.HasIndex("JOB_NAME_OUTSOURCE_ID"); b.HasIndex("JOB_NAME_OUTSOURCE_ID");
@ -112801,6 +112806,11 @@ namespace APT.Data.Migrations.Migrations
.HasForeignKey("DISCLOSURE_PERSON_ID") .HasForeignKey("DISCLOSURE_PERSON_ID")
.OnDelete(DeleteBehavior.Restrict); .OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB", "Nav_FireJob")
.WithMany()
.HasForeignKey("FIRE_JOB_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_CRUCIAL_LICENSE_JOB", "Nav_JobName") b.HasOne("APT.MS.Domain.Entities.FO.T_FO_CRUCIAL_LICENSE_JOB", "Nav_JobName")
.WithMany() .WithMany()
.HasForeignKey("JOB_NAME_ID") .HasForeignKey("JOB_NAME_ID")
@ -112826,6 +112836,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_DisclosurePerson"); b.Navigation("Nav_DisclosurePerson");
b.Navigation("Nav_FireJob");
b.Navigation("Nav_JobName"); b.Navigation("Nav_JobName");
b.Navigation("Nav_JobNameOut"); b.Navigation("Nav_JobNameOut");

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

@ -1805,6 +1805,7 @@ builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.IS_OVERTIME); builder.Ignore(t => t.IS_OVERTIME);
builder.Ignore(t => t.CONTEXT); builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.PARENT_NAME).HasMaxLength(500); builder.Property(t => t.PARENT_NAME).HasMaxLength(500);
builder.Ignore(t => t.USER_NAME);
} }
} }
#endregion #endregion
@ -2296,6 +2297,7 @@ builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).
builder.Property(t => t.CODE).HasMaxLength(100); builder.Property(t => t.CODE).HasMaxLength(100);
builder.HasOne(t => t.Nav_OperationStep).WithMany().HasForeignKey(t => t.OPERATION_STEP_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_OperationStep).WithMany().HasForeignKey(t => t.OPERATION_STEP_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_JobName).WithMany().HasForeignKey(t => t.JOB_NAME_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_JobName).WithMany().HasForeignKey(t => t.JOB_NAME_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_FireJob).WithMany().HasForeignKey(t => t.FIRE_JOB_ID).OnDelete(DeleteBehavior.Restrict);
builder.HasOne(t => t.Nav_JobNameOut).WithMany().HasForeignKey(t => t.JOB_NAME_OUTSOURCE_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_JobNameOut).WithMany().HasForeignKey(t => t.JOB_NAME_OUTSOURCE_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.JOB_LOCATION).HasMaxLength(500); builder.Property(t => t.JOB_LOCATION).HasMaxLength(500);
builder.HasOne(t => t.Nav_DisclosurePerson).WithMany().HasForeignKey(t => t.DISCLOSURE_PERSON_ID).OnDelete(DeleteBehavior.Restrict); builder.HasOne(t => t.Nav_DisclosurePerson).WithMany().HasForeignKey(t => t.DISCLOSURE_PERSON_ID).OnDelete(DeleteBehavior.Restrict);

4
APT.MS.Domain/Entities/FO/T_FO_JOB_EVENT_RECORD.cs
View File

@ -93,5 +93,9 @@ namespace APT.MS.Domain.Entities.FO
[Description("部门名称")] [Description("部门名称")]
public string PARENT_NAME { get; set; } public string PARENT_NAME { get; set; }
[Description("作业人员")]
[DataFieldIngore]
public string USER_NAME { get; set; }
} }
} }

12
APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM.cs
View File

@ -49,7 +49,19 @@ namespace APT.MS.Domain.Entities.FO
[Description("导航属性：关键许可工作票")] [Description("导航属性：关键许可工作票")]
public T_FO_CRUCIAL_LICENSE_JOB Nav_JobName { get; set; } public T_FO_CRUCIAL_LICENSE_JOB Nav_JobName { get; set; }
/// <summary>
/// 动火工作票
/// </summary>
[Description("动火工作票")]
[DataFieldForeignKey("Nav_FireJob")]
[FormFieldEdit]
public Guid? FIRE_JOB_ID { get; set; }
/// <summary>
/// 导航属性：动火工作票
/// </summary>
[Description("导航属性：动火工作票")]
public T_FO_FIRE_JOB Nav_FireJob { get; set; }
/// <summary> /// <summary>
/// 关键许可工作票 /// 关键许可工作票

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

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

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

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

49
APT.MicroApi/APT.FM.WebApi/Controllers/Api/OrganizationController.cs
View File

@ -1,18 +1,27 @@
using APT.BaseData.Domain.IServices; using APT.BaseData.Domain.Enums.PF;
using APT.BaseData.Domain.IServices;
using APT.BaseData.Domain.IServices.OP;
using APT.BaseData.Services.Services.OP;
using APT.Infrastructure.Core; using APT.Infrastructure.Core;
using APT.Migrations;
using APT.MS.Domain.Entities.SK;
using APT.Utility;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Linq; using System.Linq;
using APT.Utility;
using System.Linq.Expressions; using System.Linq.Expressions;
using System;
namespace APT.FM.WebApi.Controllers.Api.FM namespace APT.FM.WebApi.Controllers.Api.FM
{ {
[Route("api/FM/Organization")] [Route("api/FM/Organization")]
public class OrganizationController : AuthorizeTreeApiController<T_FM_ORGANIZATION> public class OrganizationController : AuthorizeTreeApiController<T_FM_ORGANIZATION>
{ {
IOPTenantDBConnService OPTenantDBConnService { get; set; }
public OrganizationController(IOPTenantDBConnService opTenantDBConnService)
{
OPTenantDBConnService = opTenantDBConnService;
}
/// <summary> /// <summary>
/// 查询 /// 查询
/// </summary> /// </summary>
@ -189,5 +198,37 @@ namespace APT.FM.WebApi.Controllers.Api.FM
filter.IgnoreOrgRule = true; filter.IgnoreOrgRule = true;
return WitEntity(null, filter); return WitEntity(null, filter);
} }
/// <summary>
/// 从集团取数据
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
[HttpPost, Route("JTOrderEntities")]
public JsonActionResult<IEnumerable<T_FM_ORGANIZATION>> JTOrderEntities([FromBody] KeywordFilter filter)
{
var orgId = filter.OrgId;
filter.OrgId = null;
filter.IgnoreOrgRule = true;
var result = new JsonActionResult<IEnumerable<T_FM_ORGANIZATION>>();
string strConn = OPTenantDBConnService.GetConnByORGID(new Guid(FilePathHead.JY.GetDescription()));
Dictionary<string, DbOrder> orders = new Dictionary<string, DbOrder>();
orders.Add("CREATE_TIME", DbOrder.DESC);
using (var context = new MigrationContext(strConn))
{
Expression<Func<T_FM_ORGANIZATION, bool>> expression = t => true;
var parentRule = filter.FilterGroup.Rules.FirstOrDefault(i => i.Field == "PARENT_ID");
if (parentRule != null && string.IsNullOrEmpty(parentRule.Value.ToString()))
{
expression = expression.And(i => i.ID == orgId);
}
var temps = context.GetOrderEntities(expression, orders, null);
if (temps != null && temps.Any())
{
result.Data = temps.ToList();
result.TotalCount = result.Data.Count();
}
}
return result;
}
} }
} }

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

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

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

@ -1558,5 +1558,49 @@ namespace APT.FM.WebApi.Controllers.Api.FM
return user; return user;
}); });
} }
/// <summary>
/// 更新用户公司
/// </summary>
/// <param name="filter"></param>
/// <returns></returns>
[HttpPost, Route("ChangeCompany")]
public JsonActionResult<bool> ChangeCompany([FromBody] KeywordFilter filter)
{
return SafeExecute<bool>(() =>
{
var userID = filter.Keyword;
var userIDGUID = new Guid(userID);
var OrgId = APT.Infrastructure.Api.AppContext.CurrentSession.OrgId;
BaseFilter BaseFilter = new BaseFilter(OrgId);
var user = this.GetEntity<T_FM_USER>(userID);
if (!string.IsNullOrEmpty(filter.Parameter1))
{
var orgIDGUID = new Guid(filter.Parameter1);
using (var context = new MigrationContext(ConfigurationManager.ConnectionStrings["default"]))
{
var allUser = context.GetEntity<T_OP_ALLUSER>(t => t.CODE == user.CODE, new string[] { "ID,CODE,ORG_ID,TENANT" });
if (allUser != null)
{
allUser.TENANT = filter.Parameter1.Substring(0,3);
allUser.ORG_ID = orgIDGUID;
context.UpdateEntity(allUser);
context.SaveChanges();
}
}
user.ENABLE_STATUS = 1;
}
else
{
throw new Exception("请先选择公司");
}
this.UnifiedCommit(() =>
{
this.UpdateEntityNoCommit(user);
});
return true;
});
}
} }
} }

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

@ -757,7 +757,7 @@ namespace APT.FO.WebApi.Controllers
var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID; var manageDepartId = this.GetEntity<T_FM_USER>(t => t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == "安环部负责人" && t.ENABLE_STATUS == 0)?.DEPARTMENT_ID;
if (loginUserCode == "admin" || loginDepartmentId == manageDepartId) if (loginUserCode == "admin" || loginDepartmentId == manageDepartId)
{ {
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser"); result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(null, pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");
} }
else else
{ {
@ -766,7 +766,7 @@ namespace APT.FO.WebApi.Controllers
DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds); DepartmentService.GetDepartmentIds(pageFilter.OrgId.Value, departmentId, ref departmentIds);
if (departmentIds != null && departmentIds.Any()) if (departmentIds != null && departmentIds.Any())
{ {
result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter, "Nav_CreateUser");//|| dataIds.Contains(t.ID) result = this.GetOrderPageEntities<T_FO_JOB_EVENT_RECORD>(t => t.Nav_CreateUser.DEPARTMENT_ID != null && departmentIds.Contains(t.Nav_CreateUser.DEPARTMENT_ID.Value), pageFilter, "Nav_CreateUser", "Nav_JobEventPerson.Nav_User");//|| dataIds.Contains(t.ID)
} }
else else
result.Data = null; result.Data = null;
@ -781,6 +781,11 @@ namespace APT.FO.WebApi.Controllers
var depart = GetDEPARTMENTLevel(departments, (Guid)t.Nav_CreateUser.DEPARTMENT_ID); var depart = GetDEPARTMENTLevel(departments, (Guid)t.Nav_CreateUser.DEPARTMENT_ID);
t.PARENT_NAME = depart?.NAME; t.PARENT_NAME = depart?.NAME;
} }
if (t.Nav_JobEventPerson != null && t.Nav_JobEventPerson.Any())
{
var names = t.Nav_JobEventPerson.Select(m => m.Nav_User?.NAME).ToList();
t.USER_NAME = string.Join(", ", names);
}
}); });
if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString())) if (filter != null && !string.IsNullOrEmpty(filter.Value.ToString()))
result.Data = result.Data.Where(t => t.PARENT_NAME != null && t.PARENT_NAME.Contains(filter.Value.ToString())); result.Data = result.Data.Where(t => t.PARENT_NAME != null && t.PARENT_NAME.Contains(filter.Value.ToString()));

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

@ -145,7 +145,9 @@ namespace APT.FO.WebApi.Controllers.Api.FO
{ {
var user = GetEntity<T_FM_USER>(t => t.ID == userID); var user = GetEntity<T_FM_USER>(t => t.ID == userID);
if (user != null) if (user != null)
entity.DEPARTMENT_ID = user.DEPARTMENT_ID; {
entity.DEPARTMENT_ID = GetEntity<T_FM_DEPARTMENT>(t => t.ID == user.DEPARTMENT_ID)?.PARENT_ID;
}
} }
if (entity.USER_ID == null) if (entity.USER_ID == null)
{ {

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

File diff suppressed because it is too large Load Diff

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

@ -134,11 +134,62 @@ namespace APT.FO.WebApi.Controllers
t.Nav_RelatedUser = null; t.Nav_User = null; t.Nav_RelatedUser = null; t.Nav_User = null;
}); });
} }
T_FO_FIRE_JOB job = null;
if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify")) if (entity.PUBLISH != null && entity.PUBLISH.Equals("SaveAndNotify"))
{ {
if (entity.DISCLOSURE_DATE == null || entity.DISCLOSURE_DATE == DateTime.Parse("0001-01-01 00:00:00")) if (entity.DISCLOSURE_DATE == null || entity.DISCLOSURE_DATE == DateTime.Parse("0001-01-01 00:00:00"))
throw new Exception("交底时间必需填写"); throw new Exception("交底时间必需填写");
if (entity.IS_OUTSOURCE == true && entity.RELATED_ID != null) if (entity.FIRE_JOB_ID != null)
{
persons.ForEach(t =>
{
t.RELATED_USER_ID = null;
if (t.USER_ID == loginUserId)
t.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
});
//新增的消息通知
var userIds = persons.Where(m => m.USER_ID != null && m.USER_ID != loginUserId).Select(t => (Guid)t.USER_ID).Distinct().ToList();
if (userIds != null && userIds.Any())
{
entity.FORM_STATUS = (int)FOTeamActivityState.签到中;
var UserNames = new List<string>();
var user = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && userIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
foreach (var u in userIds)
{
var current = user.FirstOrDefault(t => t.ID == u);
UserNames.Add(current?.NAME);
}
//发消息
DateTime dtEnd = NotificationTaskService.GetTaskEndTime(FMTASKTYPE.JobSite, entity.ORG_ID.Value, DateTime.Now, null, null);
notices = NotificationTaskService.InsertUserNoticeTaskModels("安全技术交底表确认", entity.ID, entity.ORG_ID, userIds, UserNames, DateTime.Now,
dtEnd, (int)FMNoticeTypeEnum.消息, "FO019_SHOWPRINT");
}
else
{
job = this.GetEntity<T_FO_FIRE_JOB>(t => t.ID == entity.FIRE_JOB_ID);
if (job != null)
{
entity.FORM_STATUS = (int)FOTeamActivityState.已归档;
job.IS_RUN = true;
job.FIRE_STATUS = FOFireStatus.Sign;
var jobUsers = this.GetEntities<T_FO_FIRE_JOB_USER>(t => t.FIRE_JOB_ID == job.ID, new BaseFilter(job.ORG_ID));
var userType = this.GetEntity<T_OG_RELATED_USER_TYPE>(t => t.NAME == "动火操作人员");
var sendUser = jobUsers.FirstOrDefault(t => t.USER_TYPE_ID == userType.ID);
if (sendUser != null)
{
var userName = this.GetEntity<T_FM_USER>(t => t.ID == sendUser.USER_ID)?.NAME;
var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", job.ID, job.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1");
notices.Add(notice);
}
}
else
{
throw new Exception("未找到动火作业工作票，请联系管理员排查");
}
}
}
else if (entity.IS_OUTSOURCE == true && entity.RELATED_ID != null)
{ {
var userIds = new List<Guid>(); var userIds = new List<Guid>();
persons.ForEach(t => persons.ForEach(t =>
@ -415,6 +466,8 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(flowList); this.BantchSaveEntityNoCommit(flowList);
if (measureList != null && measureList.Any()) if (measureList != null && measureList.Any())
this.BantchSaveEntityNoCommit(measureList); this.BantchSaveEntityNoCommit(measureList);
if (job != null)
this.UpdateEntityNoCommit(job);
}); });
return true; return true;
}); });
@ -490,12 +543,32 @@ namespace APT.FO.WebApi.Controllers
List<T_FO_JOB_ACTIVITY_DETAIL> detailList = new List<T_FO_JOB_ACTIVITY_DETAIL>(); List<T_FO_JOB_ACTIVITY_DETAIL> detailList = new List<T_FO_JOB_ACTIVITY_DETAIL>();
List<T_FO_JOB_ACTIVITY_FLOW> flowList = new List<T_FO_JOB_ACTIVITY_FLOW>(); List<T_FO_JOB_ACTIVITY_FLOW> flowList = new List<T_FO_JOB_ACTIVITY_FLOW>();
List<T_FO_JOB_ACTIVITY_MEASURE> measureList = new List<T_FO_JOB_ACTIVITY_MEASURE>(); List<T_FO_JOB_ACTIVITY_MEASURE> measureList = new List<T_FO_JOB_ACTIVITY_MEASURE>();
T_FO_FIRE_JOB job = null;
var todoCount = this.GetCount<T_FO_TECH_DISCLOSURE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.DEAL_STATUS == 0 && t.USER_ID != null, new BaseFilter(orgId)); var todoCount = this.GetCount<T_FO_TECH_DISCLOSURE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.DEAL_STATUS == 0 && t.USER_ID != null, new BaseFilter(orgId));
var isExist = this.GetEntity<T_FO_JOB_ACTIVITY_RECORD>(t => t.TECH_DISCLOSURE_ID == tech.ID); var isExist = this.GetEntity<T_FO_JOB_ACTIVITY_RECORD>(t => t.TECH_DISCLOSURE_ID == tech.ID);
if (todoCount == 0 || todoCount == 1) if (todoCount == 0 || todoCount == 1)
{ {
tech.FORM_STATUS = (int)FOTeamActivityState.已归档; tech.FORM_STATUS = (int)FOTeamActivityState.已归档;
if (isExist == null) if (tech.FIRE_JOB_ID != null)
{
job = this.GetEntity<T_FO_FIRE_JOB>(t => t.ID == tech.FIRE_JOB_ID);
if (job != null)
{
job.IS_RUN = true;
job.FIRE_STATUS = FOFireStatus.Sign;
var jobUsers = this.GetEntities<T_FO_FIRE_JOB_USER>(t => t.FIRE_JOB_ID == job.ID, new BaseFilter(job.ORG_ID));
var userType = this.GetEntity<T_OG_RELATED_USER_TYPE>(t => t.NAME == "动火操作人员");
var sendUser = jobUsers.FirstOrDefault(t => t.USER_TYPE_ID == userType.ID);
if (sendUser != null)
{
var userName = this.GetEntity<T_FM_USER>(t => t.ID == sendUser.USER_ID)?.NAME;
var notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", job.ID, job.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1");
notices.Add(notice);
}
}
}
else if (isExist == null)
{ {
//自动生成作业活动记录表 //自动生成作业活动记录表
record = new T_FO_JOB_ACTIVITY_RECORD(); record = new T_FO_JOB_ACTIVITY_RECORD();
@ -695,6 +768,8 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(flowList); this.BantchSaveEntityNoCommit(flowList);
if (measureList != null && measureList.Any()) if (measureList != null && measureList.Any())
this.BantchSaveEntityNoCommit(measureList); this.BantchSaveEntityNoCommit(measureList);
if (job != null)
UpdateEntityNoCommit(job);
}); });
return true; return true;
}); });

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

File diff suppressed because it is too large Load Diff

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

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

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

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

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

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

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

@ -8,6 +8,12 @@
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// T4模板文件：基础接口类 // T4模板文件：基础接口类
// 此代码由T4模板自动生成 // 此代码由T4模板自动生成
@ -26,6 +32,7 @@ using APT.MS.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.PF; using APT.BaseData.Domain.Entities.PF;
using APT.BaseData.Domain.Entities.T4; using APT.BaseData.Domain.Entities.T4;
#region Annourcement-公告 #region Annourcement-公告
/// <summary> /// <summary>
/// 公告 /// 公告
@ -134,9 +141,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AnnourcementFile-公告附件 #region AnnourcementFile-公告附件
/// <summary> /// <summary>
/// 公告附件 /// 公告附件
@ -245,9 +254,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AnnourcementOrg-公告下属公司 #region AnnourcementOrg-公告下属公司
/// <summary> /// <summary>
/// 公告下属公司 /// 公告下属公司
@ -356,9 +367,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApprovalRole-审批角色 #region ApprovalRole-审批角色
/// <summary> /// <summary>
/// 审批角色 /// 审批角色
@ -467,9 +480,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Approve-审批流主表 #region Approve-审批流主表
/// <summary> /// <summary>
/// 审批流主表 /// 审批流主表
@ -578,9 +593,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveDetail-审批流子表 #region ApproveDetail-审批流子表
/// <summary> /// <summary>
/// 审批流子表 /// 审批流子表
@ -689,9 +706,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveOperationRole-操作角色 #region ApproveOperationRole-操作角色
/// <summary> /// <summary>
/// 操作角色 /// 操作角色
@ -800,9 +819,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveRejectConfig-审批驳回配置表 #region ApproveRejectConfig-审批驳回配置表
/// <summary> /// <summary>
/// 审批驳回配置表 /// 审批驳回配置表
@ -911,9 +932,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveRoleDepartment-分管部门 #region ApproveRoleDepartment-分管部门
/// <summary> /// <summary>
/// 分管部门 /// 分管部门
@ -1022,9 +1045,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveTemp-审批流模板主表 #region ApproveTemp-审批流模板主表
/// <summary> /// <summary>
/// 审批流模板主表 /// 审批流模板主表
@ -1133,9 +1158,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ApproveTempDetail-审批流模板子表 #region ApproveTempDetail-审批流模板子表
/// <summary> /// <summary>
/// 审批流模板子表 /// 审批流模板子表
@ -1244,9 +1271,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AppVersion-App版本发布 #region AppVersion-App版本发布
/// <summary> /// <summary>
/// App版本发布 /// App版本发布
@ -1355,9 +1384,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region AppVersionFile-App包文件 #region AppVersionFile-App包文件
/// <summary> /// <summary>
/// App包文件 /// App包文件
@ -1466,116 +1497,6 @@ using APT.BaseData.Domain.Entities.T4;
} }
}
#endregion
#region Bititle-标语
/// <summary>
/// 标语
/// </summary>
[Route("api/PF/Bititle")]
public partial class BititleController : AuthorizeApiController<T_PF_BITITLE>
{
/// <summary>
/// 查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Entities")]
public JsonActionResult<IEnumerable<T_PF_BITITLE>> Entities([FromBody]KeywordFilter filter)
{
return WitEntities(null, filter);
}
/// <summary>
/// 排序查询所有数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderEntities")]
public JsonActionResult<IEnumerable<T_PF_BITITLE>> OrderEntities([FromBody]KeywordFilter filter)
{
return WitOrderEntities(null, filter);
}
/// <summary>
/// 分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Paged")]
public PagedActionResult<T_PF_BITITLE> Paged([FromBody]KeywordPageFilter pageFilter)
{
return WitPaged(null, pageFilter);
}
/// <summary>
/// 排序分页查询数据
/// </summary>
/// <param name="pageFilter">分页过滤实体</param>
/// <returns></returns>
[HttpPost, Route("OrderPaged")]
public PagedActionResult<T_PF_BITITLE> OrderPaged([FromBody]KeywordPageFilter pageFilter)
{
return WitOrderPaged(null, pageFilter);
}
/// <summary>
/// 根据主键删除数据
/// </summary>
/// <param name="id">主键ID</param>
/// <returns></returns>
[HttpGet, Route("Delete")]
public JsonActionResult<bool> Delete(string id)
{
return WitRealDelete(id);
}
/// <summary>
/// 更新或新增数据
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("Update")]
public JsonActionResult<bool> Update([FromBody]T_PF_BITITLE entity)
{
return WitUpdate(entity);
}
/// <summary>
/// 批量更新
/// </summary>
/// <param name="entity">对象实体</param>
/// <returns></returns>
[HttpPost, Route("BatchUpdate")]
public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_PF_BITITLE> entity)
{
return WitBantchUpdate(entity?.Data);
}
/// <summary>
/// 批量删除数据
/// </summary>
/// <param name="ids">id字符串（id用逗号分隔）</param>
/// <returns></returns>
[HttpGet, Route("BatchDelete")]
public JsonActionResult<bool> BatchDelete(string ids)
{
return WitRealBatchDelete(ids);
}
/// <summary>
/// 获得单条实体数据
/// </summary>
/// <param name="filter">过滤实体</param>
/// <returns></returns>
[HttpPost, Route("Get")]
public JsonActionResult<T_PF_BITITLE> Get([FromBody] KeywordFilter filter)
{
return WitEntity(null, filter);
}
} }
#endregion #endregion
@ -1688,9 +1609,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region CodeRuleRunLog-编码规则跑批表 #region CodeRuleRunLog-编码规则跑批表
/// <summary> /// <summary>
/// 编码规则跑批表 /// 编码规则跑批表
@ -1799,9 +1722,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region ComplaintLog-转办记录表 #region ComplaintLog-转办记录表
/// <summary> /// <summary>
/// 转办记录表 /// 转办记录表
@ -1910,9 +1835,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region DataChannel-数据通道 #region DataChannel-数据通道
/// <summary> /// <summary>
/// 数据通道 /// 数据通道
@ -2021,9 +1948,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region DataFrequency-采集频率 #region DataFrequency-采集频率
/// <summary> /// <summary>
/// 采集频率 /// 采集频率
@ -2132,9 +2061,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Fddeback-意见反馈 #region Fddeback-意见反馈
/// <summary> /// <summary>
/// 意见反馈 /// 意见反馈
@ -2243,9 +2174,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FddebackFile-意见反馈附件 #region FddebackFile-意见反馈附件
/// <summary> /// <summary>
/// 意见反馈附件 /// 意见反馈附件
@ -2354,9 +2287,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileDb- #region FileDb-
/// <summary> /// <summary>
/// ///
@ -2465,9 +2400,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileDbFile- #region FileDbFile-
/// <summary> /// <summary>
/// ///
@ -2576,9 +2513,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FileType- #region FileType-
/// <summary> /// <summary>
/// ///
@ -2687,9 +2626,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeChart-首页：图标区域 #region FormHomeChart-首页：图标区域
/// <summary> /// <summary>
/// 首页：图标区域 /// 首页：图标区域
@ -2798,9 +2739,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeHmi-首页：HMI区域 #region FormHomeHmi-首页：HMI区域
/// <summary> /// <summary>
/// 首页：HMI区域 /// 首页：HMI区域
@ -2909,9 +2852,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeRanking-首页：排名区域 #region FormHomeRanking-首页：排名区域
/// <summary> /// <summary>
/// 首页：排名区域 /// 首页：排名区域
@ -3020,9 +2965,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormHomeStatistic-首页：统计区域 #region FormHomeStatistic-首页：统计区域
/// <summary> /// <summary>
/// 首页：统计区域 /// 首页：统计区域
@ -3131,9 +3078,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region FormRelation-关联表单配置 #region FormRelation-关联表单配置
/// <summary> /// <summary>
/// 关联表单配置 /// 关联表单配置
@ -3242,9 +3191,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region HomeTitle-首页方针 #region HomeTitle-首页方针
/// <summary> /// <summary>
/// 首页方针 /// 首页方针
@ -3353,9 +3304,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region MqttConfig-MQTT配置表 #region MqttConfig-MQTT配置表
/// <summary> /// <summary>
/// MQTT配置表 /// MQTT配置表
@ -3464,9 +3417,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region MqttConfigTheme- #region MqttConfigTheme-
/// <summary> /// <summary>
/// ///
@ -3575,9 +3530,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Notice-通知 #region Notice-通知
/// <summary> /// <summary>
/// 通知 /// 通知
@ -3686,9 +3643,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region NoticeFile- #region NoticeFile-
/// <summary> /// <summary>
/// ///
@ -3797,9 +3756,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region PicFilter-图片条件主表 #region PicFilter-图片条件主表
/// <summary> /// <summary>
/// 图片条件主表 /// 图片条件主表
@ -3908,9 +3869,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region PicFilterDetail-图片条件子表 #region PicFilterDetail-图片条件子表
/// <summary> /// <summary>
/// 图片条件子表 /// 图片条件子表
@ -4019,9 +3982,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region QuestionFeedback-问题反馈表 #region QuestionFeedback-问题反馈表
/// <summary> /// <summary>
/// 问题反馈表 /// 问题反馈表
@ -4130,9 +4095,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region QuestionFeedbackFile-问题反馈附件表 #region QuestionFeedbackFile-问题反馈附件表
/// <summary> /// <summary>
/// 问题反馈附件表 /// 问题反馈附件表
@ -4241,9 +4208,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region Scopes-资源表 #region Scopes-资源表
/// <summary> /// <summary>
/// 资源表 /// 资源表
@ -4352,9 +4321,11 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
#region VersionManage-版本管理表 #region VersionManage-版本管理表
/// <summary> /// <summary>
/// 版本管理表 /// 版本管理表
@ -4463,6 +4434,8 @@ using APT.BaseData.Domain.Entities.T4;
} }
} }
#endregion #endregion
} }

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

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

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

File diff suppressed because it is too large Load Diff

17
APT.MicroApi/APT.SK.WebApi/Controllers/Api/EnterpriseLibraryController.cs
View File

@ -310,6 +310,11 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
var checkTypeId = departList.FirstOrDefault(t => t.CHECK_TYPE_ID == null);
if (checkTypeId != null)
{
throw new Exception("管控措施->检查内容下面存在检查类型为空的数据，请逐一检查维护");
}
//辨识层级 //辨识层级
var postdepartIds = libraryPost.Select(t => t.DEPARTMENT_ID).Distinct().ToList(); var postdepartIds = libraryPost.Select(t => t.DEPARTMENT_ID).Distinct().ToList();
var identitylLevel = departments.Where(m => postdepartIds.Contains(m.ID)).Select(t => t.DEPARTMENT_TYPE).Distinct().ToList(); var identitylLevel = departments.Where(m => postdepartIds.Contains(m.ID)).Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
@ -321,11 +326,15 @@ namespace APT.SK.WebApi.Controllers.Api
{ {
throw new Exception("辨识岗位不能为空"); throw new Exception("辨识岗位不能为空");
} }
//是否有虚拟组织
var departVir = departments.FirstOrDefault(m => postdepartIds.Contains(m.ID)&& m.CATEGORY == FMCATEGORY.VIRTUAL);
//管控层级 //管控层级
var controlLevel = libraryDepart.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList(); var controlLevel = libraryDepart.Select(t => t.DEPARTMENT_TYPE).Distinct().ToList();
var count = controlLevel.Count(); var count = controlLevel.Count();
//检查层级 //检查层级
var checkLevel = departList.Select(t => t.CHECK_TYPE).Distinct().ToList(); var checkLevel = departList.Select(t => t.CHECK_TYPE).Distinct().ToList();
if (departVir == null)
{
if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险) if (entity.EVALUATE_LEVEL == SKEvaluateLevelEnum.重大风险)
{ {
if (count >= 4 && controlLevel.Contains(SKDepartmentTypeEnum.公司级)) if (count >= 4 && controlLevel.Contains(SKDepartmentTypeEnum.公司级))
@ -396,7 +405,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
} }
}
if (controlLevel != null && controlLevel.Any()) if (controlLevel != null && controlLevel.Any())
{ {
foreach (var level in controlLevel) foreach (var level in controlLevel)
@ -1350,7 +1359,7 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
result = this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter); result = null;//this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter);
} }
} }
else if (!string.IsNullOrEmpty(pageFilter.Keyword)) else if (!string.IsNullOrEmpty(pageFilter.Keyword))
@ -1363,12 +1372,12 @@ namespace APT.SK.WebApi.Controllers.Api
} }
else else
{ {
result = this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter); result = null;//this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter);
} }
} }
else else
{ {
result = this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter); result = null;//this.GetOrderPageEntities<T_FM_USER_POST>(null, pageFilter);
} }
return result; return result;
} }

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

File diff suppressed because it is too large Load Diff