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

加字段

Browse Source
This commit is contained in:
何美荣 2025-12-10 16:58:54 +08:00
parent 366610fa66
commit db6b913f0d
23 changed files with 137656 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2487,22 +2487,40 @@ namespace APT.BaseData.Services.DomainServices
{
var entity = this.GetEntity<T_FO_FIRE_JOB>(modelApp.DATA_ID, "Nav_Users");
entity.STATUS = PFStandardStatus.Archived;
entity.FIRE_STATUS = FOFireStatus.ApprovingFinish;
T_FM_NOTIFICATION_TASK notice = null;
if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users != null && entity.Nav_Users.Any())
T_FO_TECH_DISCLOSURE_FROM_SAFE formSafe = null;
//触发技术交底表给施工单位负责人
if (entity.FIRE_USER_ID != null)
{
entity.IS_RUN = true;
entity.FIRE_STATUS = FOFireStatus.Sign;
var userType = this.GetEntity<T_OG_RELATED_USER_TYPE>(t => t.NAME == "动火操作人员");
var sendUser = entity.Nav_Users.FirstOrDefault(t => t.USER_TYPE_ID == userType.ID);
var sendUser = this.GetEntity<T_FM_USER>(t => t.ID == entity.FIRE_USER_ID);
if (sendUser != null)
{
var userName = this.GetEntity<T_FM_USER>(t => t.ID == sendUser.USER_ID)?.NAME;
notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", entity.ID, entity.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043");
}
}
else
entity.FIRE_STATUS = FOFireStatus.ApprovingFinish;
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.DEPARTMENT_ID = sendUser.DEPARTMENT_ID;
formSafe.CODE = "AQJD" + DateTime.Now.ToShortDateString().Replace("/", "") + new Random().Next(1, 999);
notice = NotificationTaskService.InsertUserNoticeTaskModel("安全技术交底表", formSafe.ID, entity.ORG_ID, sendUser.ID, sendUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO037");
}
}
//if (entity.JOB_DATE.Value.AddMinutes(-30) <= DateTime.Now && entity.IS_RUN == false && entity.Nav_Users != null && entity.Nav_Users.Any())
//{
//entity.IS_RUN = true;
//entity.FIRE_STATUS = FOFireStatus.Sign;
//var userType = this.GetEntity<T_OG_RELATED_USER_TYPE>(t => t.NAME == "动火操作人员");
//var sendUser = entity.Nav_Users.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;
// notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", entity.ID, entity.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
// DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1");
//}
//}
//else
// entity.FIRE_STATUS = FOFireStatus.ApprovingFinish;
UnifiedCommit(() =>
{
if (modelApp != null)
@ -11495,11 +11513,14 @@ namespace APT.BaseData.Services.DomainServices
{
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_ApproveRole");
var departs = this.GetEntities<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0, new BaseFilter(entity.ORG_ID), "Nav_User");
var checkQuestionIds = reportDetails.Select(t => t.CHECK_QUESTION_ID).Distinct().ToList();
var hidDescrips = this.GetEntities<T_SK_CHECK_QUESTION>(t => checkQuestionIds.Contains(t.ID), new BaseFilter(entity.ORG_ID));
var random = new Random();
foreach (var detail in reportDetails)
{
var departId = users.FirstOrDefault(t => t.ID == detail.RECITIFY_USER_ID).DEPARTMENT_ID;
var departFirst = departs.FirstOrDefault(t => t.ID == departId);
var hidDescrip = hidDescrips.FirstOrDefault(t => t.ID == detail.CHECK_QUESTION_ID);
if (detail.RECITIFY_USER_ID == entity.APPLY_USER_ID)
{
var acceptUser = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
@ -11536,7 +11557,9 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11595,8 +11618,8 @@ namespace APT.BaseData.Services.DomainServices
detail.CHECKTIME = DateTime.Now;
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.ORG_ID = detail.ORG_ID;
record.APPLY_USER_ID = entity.APPLY_USER_ID;
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = user.ID;
record.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
record.HIDDEN_DANGER_REPORT_ID = entity.ID;
record.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
record.HIDDEN_DANGER_CONFIRM_ID = null;
@ -11616,6 +11639,8 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_QUESTION_ID = detail.CHECK_QUESTION_ID;
record.CHECK_CONTENTS_ID = detail.CHECK_CONTENTS_ID;
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11662,21 +11687,31 @@ namespace APT.BaseData.Services.DomainServices
detail.Nav_ReportDetailBasics = null;
}
else
{
{
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
}
T_SK_HIDDEN_DANGER_RECTIFY_NOTICE notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
notice.ORG_ID = detail.ORG_ID;
notice.HIDDEN_DANGER_REPORT_ID = entity.ID;
notice.HIDDEN_DANGER_REPORT_DETAIL_ID = detail.ID;
notice.HIDDEN_DANGER_CONFIRM_ID = null;
notice.APPLY_USER_ID = entity.APPLY_USER_ID;
notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
notice.APPLY_USER_ID = user.ID;
notice.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
notice.MineType = entity.MineType;
notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
notice.PLANCHECKFREQUENCY = entity.PLANCHECKFREQUENCY;
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
notice.CHECK_PERSON = entity.CHECK_PERSON;
notice.CHECK_PERSON = entity.CHECK_PERSON;
notice.NOTICE_CODE = entity.NOTICE_CODE;
notices.Add(notice);
if (entity.Nav_ReportFiles != null && entity.Nav_ReportFiles.Any())
{
@ -11702,7 +11737,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_LEVEL = detail.HIDDEN_LEVEL;
noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetails.Add(noticeDetail);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11737,15 +11773,6 @@ namespace APT.BaseData.Services.DomainServices
noticeReasonList.Add(file);
}
}
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFirst?.USER_ID);
}
if (user != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改通知表", notice.ID, notice.ORG_ID, user.ID, user.NAME, DateTime.Now,
@ -11935,6 +11962,7 @@ namespace APT.BaseData.Services.DomainServices
//}
if (entity != null && entity.RECITIFY_USER_ID != null)
{
var hidDescrip = this.GetEntity<T_SK_CHECK_QUESTION>(t => t.ID ==entity.CHECK_QUESTION_ID);
var departId = users.FirstOrDefault(t => t.ID == entity.RECITIFY_USER_ID).DEPARTMENT_ID;
var departFist = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId);
if (entity.RECITIFY_USER_ID == entity.APPLY_USER_ID)
@ -11971,7 +11999,8 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12014,8 +12043,8 @@ namespace APT.BaseData.Services.DomainServices
acceptUser = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = entity.APPLY_USER_ID;
record.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
record.APPLY_USER_ID = user.ID;
record.ORG_ID = entity.ORG_ID;
record.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID;
record.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
@ -12035,7 +12064,8 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_PERSON = user.NAME;
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12069,13 +12099,22 @@ namespace APT.BaseData.Services.DomainServices
}
}
else
{
{
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
notice = new T_SK_HIDDEN_DANGER_RECTIFY_NOTICE();
notice.ORG_ID = entity.ORG_ID;
notice.HIDDEN_DANGER_REPORT_ID = entity.Nav_Report?.ID;
notice.HIDDEN_DANGER_CONFIRM_ID = entity.ID;
notice.APPLY_USER_ID = entity.APPLY_USER_ID;
notice.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
notice.APPLY_USER_ID = user.ID;
notice.APPLY_DEPARTMENT_ID = user.DEPARTMENT_ID;
notice.MineType = entity.MineType;
notice.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
notice.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
@ -12083,6 +12122,7 @@ namespace APT.BaseData.Services.DomainServices
notice.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
notice.CREATE_TIME = entity.Nav_Report?.CREATE_TIME;
notice.CHECK_PERSON = entity.Nav_ApplyUser?.NAME;
notice.NOTICE_CODE = entity.NOTICE_CODE;
if (entity.Nav_Files != null && entity.Nav_Files.Any())
{
foreach (var item in entity.Nav_Files)
@ -12103,8 +12143,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.CHECKCONTENT = entity.CHECKCONTENT;
noticeDetail.CHECKPROOF = entity.CHECKPROOF;
noticeDetail.CHECKSTANDARD = entity.CHECKSTANDARD;
noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
noticeDetail.RECTIFICATION_MEASURES = entity.RECTIFICATION_MEASURES;
noticeDetail.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetail.HIDDEN_LEVEL = entity.HIDDEN_LEVEL;
noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME;
@ -12132,15 +12172,6 @@ namespace APT.BaseData.Services.DomainServices
noticeReasonList.Add(file);
}
}
var user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (user == null)
{
user = users.FirstOrDefault(t => t.DEPARTMENT_ID == departId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (user == null)
{
user = users.FirstOrDefault(t => t.ID == departFist?.USER_ID);
}
if (user != null)
{
var sendNotice = NotificationTaskService.InsertUserNoticeTaskModel("隐患整改通知表", notice.ID, notice.ORG_ID, user.ID, user.NAME, DateTime.Now,

137040
APT.Data.Migrations/Migrations/20251210082458_hmr2025121001.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

133
APT.Data.Migrations/Migrations/20251210082458_hmr2025121001.cs Normal file
View File

@ -0,0 +1,133 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2025121001 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_RECORD",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_NOTICE",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_REPORT",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_HAND_REPORT",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_CONFIRM",
type: "nvarchar(50)",
maxLength: 50,
nullable: true);
migrationBuilder.AddColumn<Guid>(
name: "FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE",
type: "uniqueidentifier",
nullable: true);
migrationBuilder.CreateIndex(
name: "IX_T_FO_TECH_DISCLOSURE_FROM_SAFE_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE",
column: "FIRE_JOB_ID");
migrationBuilder.AddForeignKey(
name: "FK_T_FO_TECH_DISCLOSURE_FROM_SAFE_T_FO_FIRE_JOB_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE",
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_SAFE_T_FO_FIRE_JOB_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE");
migrationBuilder.DropIndex(
name: "IX_T_FO_TECH_DISCLOSURE_FROM_SAFE_FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_RECORD");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_SECURITY_INSPECTION_NOTICE");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_REPORT");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_RECORD");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_HAND_REPORT");
migrationBuilder.DropColumn(
name: "NOTICE_CODE",
table: "T_SK_HIDDEN_DANGER_CONFIRM");
migrationBuilder.DropColumn(
name: "FIRE_JOB_ID",
table: "T_FO_TECH_DISCLOSURE_FROM_SAFE");
}
}
}

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

@ -38345,6 +38345,9 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("ENTITY_ORG_TPYE")
.HasColumnType("int");
b.Property<Guid?>("FIRE_JOB_ID")
.HasColumnType("uniqueidentifier");
b.Property<Guid?>("FLOW_ID")
.HasColumnType("uniqueidentifier");
@ -38391,6 +38394,8 @@ namespace APT.Data.Migrations.Migrations
b.HasIndex("DEPARTMENT_ID");
b.HasIndex("FIRE_JOB_ID");
b.HasIndex("OPERATION_STEP_ID");
b.HasIndex("ORG_ID");
@ -79981,6 +79986,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -80321,6 +80330,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -80604,6 +80617,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -81134,6 +81151,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -81550,6 +81571,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -86682,6 +86707,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -87036,6 +87065,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -87543,6 +87576,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<int>("MineType")
.HasColumnType("int");
b.Property<string>("NOTICE_CODE")
.HasMaxLength(50)
.HasColumnType("nvarchar(50)");
b.Property<Guid?>("ORG_ID")
.IsRequired()
.HasColumnType("uniqueidentifier");
@ -110930,6 +110967,11 @@ namespace APT.Data.Migrations.Migrations
.HasForeignKey("DEPARTMENT_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_JOB", "Nav_Job")
.WithMany()
.HasForeignKey("FIRE_JOB_ID")
.OnDelete(DeleteBehavior.Restrict);
b.HasOne("APT.MS.Domain.Entities.HM.T_HM_OPERATION_STEP", "Nav_OperationStep")
.WithMany()
.HasForeignKey("OPERATION_STEP_ID")
@ -110948,6 +110990,8 @@ namespace APT.Data.Migrations.Migrations
b.Navigation("Nav_Department");
b.Navigation("Nav_Job");
b.Navigation("Nav_OperationStep");
b.Navigation("Nav_Org");

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

@ -2245,6 +2245,7 @@ builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelet
builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.DisclosureContent).HasMaxLength(2000);
builder.Ignore(t => t.PUBLISH);
builder.HasOne(t => t.Nav_Job).WithMany().HasForeignKey(t => t.FIRE_JOB_ID).OnDelete(DeleteBehavior.Restrict);
}
}
#endregion
@ -13718,6 +13719,7 @@ builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -13780,6 +13782,7 @@ builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Ignore(t => t.PUBLISH);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -13836,6 +13839,7 @@ builder.Property(t => t.ImplementUser).HasMaxLength(500);
builder.Property(t => t.AcceptUser).HasMaxLength(500);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -13942,6 +13946,7 @@ builder.Property(t => t.REMARK).HasMaxLength(500);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -14015,6 +14020,7 @@ builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -15002,6 +15008,7 @@ builder.Ignore(t => t.PUBLISH);
builder.Ignore(t => t.CONTEXT);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -15070,6 +15077,7 @@ builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelet
builder.HasOne(t => t.Nav_RecordUser).WithMany().HasForeignKey(t => t.RECORD_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion
@ -15162,6 +15170,7 @@ builder.Property(t => t.CHECK_PERSON).HasMaxLength(500);
builder.Ignore(t => t.PUBLISH);
builder.Property(t => t.ApplyDepartmentName).HasMaxLength(50);
builder.Property(t => t.ApplyPostName).HasMaxLength(50);
builder.Property(t => t.NOTICE_CODE).HasMaxLength(50);
}
}
#endregion

13
APT.MS.Domain/Entities/FO/T_FO_TECH_DISCLOSURE_FROM_SAFE.cs
View File

@ -94,5 +94,18 @@ namespace APT.MS.Domain.Entities.FO
[Description("附件")]
[FormFieldEdit]
public ICollection<T_FO_TECH_DISCLOSURE_FROM_SAFE_FILE> Nav_Files { get; set; }
/// <summary>
/// 关联工作票
/// </summary>
[Description("关联工作票")]
[DataFieldForeignKey("Nav_Job")]
public Guid? FIRE_JOB_ID { get; set; }
/// <summary>
/// 导航属性：关联工作票
/// </summary>
[Description("导航属性：关联工作票")]
public T_FO_FIRE_JOB Nav_Job { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_CONFIRM.cs
View File

@ -233,6 +233,10 @@ namespace APT.MS.Domain.Entities.SK
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_REASON> Nav_Reasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_CONFIRM_REASON> Nav_Reasons { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_HAND_REPORT.cs
View File

@ -88,6 +88,10 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_NOTICE.cs
View File

@ -144,6 +144,10 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_RECTIFY_RECORD.cs
View File

@ -288,6 +288,10 @@ namespace APT.MS.Domain.Entities.SK
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> Nav_RectifyReasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_RECORD_REASON> Nav_RectifyReasons { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_HIDDEN_DANGER_REPORT.cs
View File

@ -114,6 +114,10 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_NOTICE.cs
View File

@ -111,6 +111,10 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

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

@ -131,6 +131,9 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

6
APT.MS.Domain/Entities/SK/T_SK_SECURITY_INSPECTION_RECORD_SUMMARY.cs
View File

@ -112,6 +112,10 @@ namespace APT.MS.Domain.Entities.SK
public string ApplyDepartmentName { get; set; }
[DataFieldLength(50)]
[Description("发起人岗位")]
public string ApplyPostName { get; set; }
public string ApplyPostName { get; set; }
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
}
}

54
APT.MicroApi/APT.FO.WebApi/Controllers/FireJobController.cs
View File

@ -91,7 +91,7 @@ namespace APT.FO.WebApi.Controllers
var record = this.GetEntities<T_FO_FIRE_JOB>(t => t.CREATE_TIME.Value.Date == DateTime.Now.Date,new BaseFilter(entity.ORG_ID)).OrderByDescending(m => m.CREATE_TIME).FirstOrDefault();
if (record != null)
{
var codeTake = record.CODE.Reverse().Take(3).ToString();
var codeTake = record.CODE.Substring(record.CODE.Length - 3).ToString();
var temp = int.Parse(codeTake) + 1;
num = temp.ToString().PadLeft(3, '0');
}
@ -99,12 +99,38 @@ namespace APT.FO.WebApi.Controllers
}
if (entity.FIRE_USER_ID == null)
{
throw new Exception("动火负责人必须填写");
throw new Exception("施工单位负责人必须填写");
}
if (entity.SAFE_USER_ID == null)
{
throw new Exception("安全管理人员必须填写");
}
if (entity.JOB_DATE == null)
{
throw new Exception("计划开始时间必须填写");
}
if (entity.JOB_END_DATE == null)
{
throw new Exception("计划结束时间必须填写");
}
entity.ACT_DATE = entity.JOB_DATE;
entity.ACT_END_DATE = entity.JOB_END_DATE;
if (entity.JOB_END_DATE > entity.JOB_DATE.Value.AddHours(8))
{
throw new Exception("计划开始和计划结束时间不能超过8小时");
}
if (entity.ACT_DATE != null && entity.ACT_DATE < entity.JOB_DATE)
{
throw new Exception("动火实际开始时间不能早于计划开始时间");
}
if (entity.ACT_END_DATE!=null && entity.ACT_END_DATE > entity.JOB_END_DATE)
{
throw new Exception("动火实际结束时间不能晚于计划结束时间");
}
if (entity.LEAVE_DATE!=null && entity.ACT_END_DATE != null && entity.LEAVE_DATE < entity.ACT_END_DATE.Value.AddHours(1))
{
throw new Exception("离开现场时间必须大于实际动火结束时间1小时以上");
}
var details = entity.Nav_Details;
if (details != null && details.Any())
{
@ -312,8 +338,8 @@ namespace APT.FO.WebApi.Controllers
throw new Exception("动火实际结束时间必须填写");
if (entity.LEAVE_DATE == null)
throw new Exception("离开现场时间必须填写");
if (monitorFileList == null || !monitorFileList.Any())
throw new Exception("必须上传完工验收附件");
//if (monitorFileList == null || !monitorFileList.Any())
// throw new Exception("必须上传完工验收附件");
var detailNeed = detailList.FirstOrDefault(t => (t.JOB_STEP == FOJobStepEnum.Ing && t.IS_CONFIRM_NEW == false) || (t.JOB_STEP == FOJobStepEnum.After && t.IS_CONFIRM_NEW == false));
if (detailNeed != null)
throw new Exception("作业中或作业后未全部确认！");
@ -344,8 +370,8 @@ namespace APT.FO.WebApi.Controllers
throw new Exception("不可动火请稍后再进行验收");
if (entity.ACT_DATE == null)
throw new Exception("动火实际开始时间必须填写");
if (fireFileList == null || !fireFileList.Any())
throw new Exception("必须上传现场条件验收附件");
//if (fireFileList == null || !fireFileList.Any())
// throw new Exception("必须上传现场条件验收附件");
var detailNeed = detailList.FirstOrDefault(t => t.JOB_STEP == FOJobStepEnum.Pre && t.IS_CONFIRM_NEW == false);
if (detailNeed != null)
throw new Exception("作业前未全部确认！");
@ -361,17 +387,17 @@ namespace APT.FO.WebApi.Controllers
}
else
{
//没有审阅人就触发给监护人填写
var monitorUser = this.GetEntity<T_FM_USER>(t => t.ID == entity.MONITOR_USER_ID);
//没有审阅人就触发给安全管理人员填写,原设计是监护人entity.MONITOR_USER_ID
var monitorUser = this.GetEntity<T_FM_USER>(t => t.ID == entity.SAFE_USER_ID);
if (monitorUser != null)
{
entity.FIRE_STATUS = FOFireStatus.Monitor;
notices.Add(NotificationTaskService.InsertUserNoticeTaskModel("动火作业全程监护", entity.ID, entity.ORG_ID, monitorUser.ID, monitorUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043"));
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_2"));
}
else
{
throw new Exception("监护人不能为空，请联系管理员补充填写");
throw new Exception("安全管理人员不能为空，请联系管理员补充填写");
}
}
}
@ -523,17 +549,17 @@ namespace APT.FO.WebApi.Controllers
}
if (fire.USER_DEAL_STATUS == FOUserShiftStatusEnum.已处理 && fire.SAFE_DEAL_STATUS == FOUserShiftStatusEnum.已处理 && fire.DISPATCH_DEAL_STATUS == FOUserShiftStatusEnum.已处理)
{
//触发给监护人填写
var monitorUser = this.GetEntity<T_FM_USER>(t => t.ID == fire.MONITOR_USER_ID);
//触发给安全管理人员填写
var monitorUser = this.GetEntity<T_FM_USER>(t => t.ID == fire.SAFE_USER_ID);
if (monitorUser != null)
{
fire.FIRE_STATUS = FOFireStatus.Monitor;
notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业全程监护", fire.ID, fire.ORG_ID, monitorUser.ID, monitorUser.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043");
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_2");
}
else
{
throw new Exception("监护人不能为空，请联系管理员补充填写");
throw new Exception("安全管理人员不能为空，请联系管理员补充填写");
}
}
}

49
APT.MicroApi/APT.FO.WebApi/Controllers/TechDisclosureFromSafeController.cs
View File

@ -4,6 +4,7 @@ using APT.BaseData.Domain.Enums;
using APT.BaseData.Domain.IServices.FM;
using APT.Infrastructure.Core;
using APT.MS.Domain.Entities.FO;
using APT.MS.Domain.Entities.OG;
using APT.MS.Domain.Enums;
using APT.Utility;
using Microsoft.AspNetCore.Mvc;
@ -72,6 +73,7 @@ namespace APT.FO.WebApi.Controllers
files = files.Where(t => !t.IS_DELETED).ToList();
}
entity.Nav_Files = null;
T_FO_FIRE_JOB job = null;
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
var loginUserId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departmentId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
@ -123,6 +125,25 @@ namespace APT.FO.WebApi.Controllers
else
{
entity.FORM_STATUS = (int)FOTeamActivityState.已归档;
if (entity.FIRE_JOB_ID != null)
{
job = this.GetEntity<T_FO_FIRE_JOB>(t => t.ID == entity.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);
}
}
}
}
}
this.UnifiedCommit(() =>
@ -139,6 +160,8 @@ namespace APT.FO.WebApi.Controllers
this.BantchSaveEntityNoCommit(files);
if (notices != null && notices.Any())
this.BantchSaveEntityNoCommit(notices);
if (job != null)
UpdateEntityNoCommit(job);
});
return true;
});
@ -164,13 +187,33 @@ namespace APT.FO.WebApi.Controllers
userID = currTask.USER_ID;
}
}
T_FO_FIRE_JOB job = null;
T_FM_NOTIFICATION_TASK notice = null;
var tech = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_SAFE>(entity.ID);
var user = this.GetEntity<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.USER_ID == userID, new BaseFilter(orgId));
user.DEAL_STATUS = FOUserShiftStatusEnum.已处理;
var todoCount = this.GetCount<T_FO_TECH_DISCLOSURE_FROM_SAFE_PERSON>(t => t.TECH_DISCLOSURE_FROM_ID == tech.ID && t.DEAL_STATUS == 0 && t.USER_ID != null && t.USER_ID != userID, new BaseFilter(orgId));
if (todoCount == 0 || todoCount == 1)
if (todoCount == 0)
{
tech.FORM_STATUS = (int)FOTeamActivityState.已归档;
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;
notice = NotificationTaskService.InsertUserNoticeTaskModel("动火作业现场条件验收", job.ID, job.ORG_ID, (Guid)sendUser.USER_ID, userName, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "FO043_1");
}
}
}
}
T_FM_NOTIFICATION_TASK task = null;
if (entity.TaskID != Guid.Empty)
@ -186,6 +229,10 @@ namespace APT.FO.WebApi.Controllers
this.UpdateEntityNoCommit(user);
if (task != null)
this.UpdateEntityNoCommit(task);
if (job != null)
this.UpdateEntityNoCommit(job);
if (notice != null)
this.AddEntityNoCommit(notice);
});
return true;
});

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

@ -591,7 +591,7 @@ namespace APT.PP.WebApi.Controllers.Api
filter.IgnoreDataRule = true;
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID", "PRODUCTION_UNIT_ID", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
baseFilter.SelectField = new string[] { "ID", "PRODUCTION_UNIT_ID","NOTICE_CODE", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
"Nav_CheckNoticeDetails.RISK_AREA_ID","Nav_CheckNoticeDetails.CHECK_CONTENTS_ID","Nav_CheckNoticeDetails.CHECKCONTENT","Nav_CheckNoticeDetails.CHECKPROOF","Nav_CheckNoticeDetails.CHECKSTANDARD",
"Nav_CheckNoticeFiles.IMG_FILE_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailUsers.USER_ID", "Nav_CheckNoticeDetails.Nav_CheckNoticeDetailBasics.LAW_ID" }; //指定字段，包括导航属性
Expression<Func<T_SK_SECURITY_INSPECTION_NOTICE, bool>> expression = i => i.IS_DELETED == false && i.CHECK_TIME != null && i.CHECK_TIME.Value.Date == DateTime.Now.Date && i.CHECK_TIME.Value.Hour == dtNow.Hour && i.STATUS == PFStandardStatus.Archived;
@ -638,6 +638,7 @@ namespace APT.PP.WebApi.Controllers.Api
record.ISAUTO = true;
record.STATUS = PFStandardStatus.Draft;
record.RECORD_USER_ID = userItem;
record.NOTICE_CODE = item.NOTICE_CODE;
if (item.Nav_CheckNoticeFiles != null && item.Nav_CheckNoticeFiles.Any())
{
foreach (var item2 in item.Nav_CheckNoticeFiles)
@ -772,34 +773,169 @@ namespace APT.PP.WebApi.Controllers.Api
var week = dtNow.DayOfWeek;
filter.IgnoreDataRule = true;
//查记录表，检查时间第二天12点自动转为已办
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
List<T_FM_NOTIFICATION_TASK> tasks = new List<T_FM_NOTIFICATION_TASK>();
List<T_FM_NOTIFICATION_TASK> noticeTasks = new List<T_FM_NOTIFICATION_TASK>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY> summarys = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_FILE> summaryFiles = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_FILE>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL> summaryDetails = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER> summaryDetailUsers = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC> summaryDetailBasics = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC>();
List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE> summaryDetailFiles = new List<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE>();
var baseFilter = new BaseFilter(filter.GetOrgId());
baseFilter.IgnoreDataRule = true;
baseFilter.SelectField = new string[] { "ID", "MineType", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
"SECURITY_INSPECTION_NOTICE_ID","STATUS","TYPE_ID", "Nav_CheckRecordDetails.SECURITY_INSPECTION_RECORD_ID","Nav_CheckRecordDetails.CHECK_RESULT","Nav_CheckRecordDetails.CHECK_QUESTION_ID",
"Nav_CheckRecordDetails.HIDDEN_DESCRIPTION","Nav_CheckRecordDetails.HIDDEN_LEVEL","Nav_CheckRecordDetails.HIDDEN_PLACE","Nav_CheckRecordDetails.MARK",
"Nav_CheckRecordDetails.RISK_AREA_ID","Nav_CheckRecordDetails.CHECK_CONTENTS_ID","Nav_CheckRecordDetails.CHECKCONTENT","Nav_CheckRecordDetails.CHECKPROOF","Nav_CheckRecordDetails.CHECKSTANDARD",
"Nav_CheckRecordFiles.IMG_FILE_ID","Nav_CheckRecordFiles.SECURITY_INSPECTION_RECORD_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.IMG_FILE_ID",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.SECURITY_INSPECTION_RECORD_DETAIL_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.USER_ID",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISMAINCHECK","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.CHECKTIME","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISCHECK",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.SECURITY_INSPECTION_RECORD_DETAIL_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.SECURITY_INSPECTION_RECORD_DETAIL_ID",
"Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.LAW_ID" }; //指定字段，包括导航属性
var records = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(i => i.CHECK_TIME.Value.AddDays(1).Date == DateTime.Now.Date && DateTime.Now.Hour == 12, baseFilter).ToList();
if (records != null && records.Any())
{
var noticeIds = records.Select(i => i.ID).ToList();
tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => noticeIds.Contains((Guid)t.SOURCE_DATA_ID) && t.NOTICE_STATUS == 0, new BaseFilter(filter.OrgId)).ToList();
tasks.ForEach(t => t.NOTICE_STATUS = 4);
var sourceIds = tasks.Select(i => i.SOURCE_DATA_ID).ToList();
records.Where(t => sourceIds.Contains(t.ID)).ForEach(m => m.STATUS = PFStandardStatus.Close);
records.Where(t => !sourceIds.Contains(t.ID)).ForEach(m => m.STATUS = PFStandardStatus.Archived);
//baseFilter.SelectField = new string[] { "ID", "MineType", "CHECK_TYPE_ID","APPLY_DEPARTMENT_ID","APPLY_USER_ID","PLANCHECKFREQUENCY","DEPARTMENT_TYPE","CHECK_TIME","CHECK_PERSON",
// "SECURITY_INSPECTION_NOTICE_ID","STATUS","TYPE_ID", "Nav_CheckRecordDetails.SECURITY_INSPECTION_RECORD_ID","Nav_CheckRecordDetails.CHECK_RESULT","Nav_CheckRecordDetails.CHECK_QUESTION_ID",
// "Nav_CheckRecordDetails.HIDDEN_DESCRIPTION","Nav_CheckRecordDetails.HIDDEN_LEVEL","Nav_CheckRecordDetails.HIDDEN_PLACE","Nav_CheckRecordDetails.MARK",
// "Nav_CheckRecordDetails.RISK_AREA_ID","Nav_CheckRecordDetails.CHECK_CONTENTS_ID","Nav_CheckRecordDetails.CHECKCONTENT","Nav_CheckRecordDetails.CHECKPROOF","Nav_CheckRecordDetails.CHECKSTANDARD",
// "Nav_CheckRecordFiles.IMG_FILE_ID","Nav_CheckRecordFiles.SECURITY_INSPECTION_RECORD_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.IMG_FILE_ID",
// "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles.SECURITY_INSPECTION_RECORD_DETAIL_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.USER_ID",
// "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISMAINCHECK","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.CHECKTIME","Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.ISCHECK",
// "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers.SECURITY_INSPECTION_RECORD_DETAIL_ID","Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.SECURITY_INSPECTION_RECORD_DETAIL_ID",
// "Nav_CheckRecordDetails.Nav_CheckRecordDetailBasics.LAW_ID" }; //指定字段，包括导航属性
var notices = GetEntities<T_SK_SECURITY_INSPECTION_NOTICE>(i => i.CHECK_TIME.Value.AddDays(1).Date == dtNow.Date && i.CHECK_TIME.Value.AddDays(1).Hour == dtNow.Hour && i.Nav_CheckType != null && !i.Nav_CheckType.NAME.Contains("岗位排查"), baseFilter);
var noticeIds = notices.Select(t => t.ID).ToList();
var sumRecords = GetEntities<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY>(t => t.SECURITY_INSPECTION_NOTICE_ID != null && noticeIds.Contains((Guid)t.SECURITY_INSPECTION_NOTICE_ID), baseFilter);
var sumNoticeIds = sumRecords.Select(m => m.SECURITY_INSPECTION_NOTICE_ID).Distinct().ToList();
var needDealIds = noticeIds.Where(t => !sumNoticeIds.Contains(t)).ToList();
var records = GetEntities<T_SK_SECURITY_INSPECTION_RECORD>(i => i.SECURITY_INSPECTION_NOTICE_ID != null && needDealIds.Contains((Guid)i.SECURITY_INSPECTION_NOTICE_ID), baseFilter, "Nav_CheckRecordFiles", "Nav_CheckRecordDetails.Nav_CheckRecordDetailUsers", "Nav_CheckRecordDetails.Nav_CheckRecordDetailFiles").ToList();
if (records != null && records.Any())
{
var recordIds = records.Select(i => i.ID).ToList();
//处理未提交的待办
tasks = this.GetEntities<T_FM_NOTIFICATION_TASK>(t => recordIds.Contains((Guid)t.SOURCE_DATA_ID) && t.NOTICE_STATUS == 0, null).ToList();
tasks.ForEach(t => t.NOTICE_STATUS = 4);
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0 && !t.CODE.Contains("admin"), null, "Nav_Department");
//处理记录表状态
var sourceIds = tasks.Select(i => i.SOURCE_DATA_ID).ToList();
records.Where(t => sourceIds.Contains(t.ID)).ForEach(m => m.STATUS = PFStandardStatus.Close);
//触发汇总表
foreach (var id in needDealIds)
{
var noticeFirst = notices.FirstOrDefault(t => t.ID == id);
var user = users.FirstOrDefault(t => t.ID == noticeFirst?.APPLY_USER_ID);
if (user != null)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY sum = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY();
sum.ORG_ID = noticeFirst.ORG_ID;
sum.SECURITY_INSPECTION_NOTICE_ID = id;
sum.APPLY_DEPARTMENT_ID = noticeFirst.APPLY_DEPARTMENT_ID;
sum.APPLY_USER_ID = noticeFirst.APPLY_USER_ID;
sum.CHECK_PERSON = noticeFirst.CHECK_PERSON;
sum.CHECK_TIME = noticeFirst.CHECK_TIME;
sum.SECURITY_INSPECTION_RECORD_ID = records.FirstOrDefault(t => t.SECURITY_INSPECTION_NOTICE_ID == id)?.ID;
sum.MineType = noticeFirst.MineType;
sum.CHECK_TYPE_ID = noticeFirst.CHECK_TYPE_ID;
sum.PLANCHECKFREQUENCY = noticeFirst.PLANCHECKFREQUENCY;
sum.DEPARTMENT_TYPE = noticeFirst.DEPARTMENT_TYPE;
sum.STATUS = PFStandardStatus.Draft;
sum.NOTICE_CODE = noticeFirst.NOTICE_CODE;
summarys.Add(sum);
var files = records.Where(t => t.SECURITY_INSPECTION_NOTICE_ID == id).SelectMany(m => m.Nav_CheckRecordFiles).ToList();
if (files != null && files.Any())
{
var fileNews = files.GroupBy(t => t.IMG_FILE_ID).Select(g => g.FirstOrDefault()).ToList();
foreach (var item in fileNews)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_FILE fi = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_FILE();
fi.SECURITY_INSPECTION_RECORD_SUMMARY_ID = sum.ID;
fi.ORG_ID = sum.ORG_ID;
fi.IMG_FILE_ID = item.IMG_FILE_ID;
summaryFiles.Add(fi);
}
}
var details = records.Where(t => t.SECURITY_INSPECTION_NOTICE_ID == id).SelectMany(m => m.Nav_CheckRecordDetails).ToList();
if (details != null && details.Any())
{
var detailTempNews = details.Where(t => t.CHECK_RESULT == SKCheckResultEnum.Yes).ToList();
var detailTemps = details.Where(t => t.CHECK_RESULT != SKCheckResultEnum.Yes).GroupBy(m => new { m.RISK_AREA_ID, m.CHECK_CONTENTS_ID }).Select(g => g.FirstOrDefault()).ToList();
foreach (var itemDetail in detailTemps)
{
var hasRecord = detailTempNews.FirstOrDefault(t => t.RISK_AREA_ID == itemDetail.RISK_AREA_ID && t.CHECK_CONTENTS_ID == itemDetail.CHECK_CONTENTS_ID);
if (hasRecord == null)
{
detailTempNews.Add(itemDetail);
}
}
foreach (var itemDetail in detailTempNews)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL summaryDetail = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL();
summaryDetail.ORG_ID = sum.ORG_ID;
summaryDetail.SECURITY_INSPECTION_RECORD_SUMMARY_ID = sum.ID;
summaryDetail.RISK_AREA_ID = itemDetail.RISK_AREA_ID;
summaryDetail.CHECK_CONTENTS_ID = itemDetail.CHECK_CONTENTS_ID;
summaryDetail.CHECK_QUESTION_ID = itemDetail.CHECK_QUESTION_ID;
summaryDetail.CHECKCONTENT = itemDetail.CHECKCONTENT;
summaryDetail.CHECKPROOF = itemDetail.CHECKPROOF;
summaryDetail.CHECKSTANDARD = itemDetail.CHECKSTANDARD;
summaryDetail.CHECK_RESULT = itemDetail.CHECK_RESULT;
summaryDetail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(itemDetail.HIDDEN_DESCRIPTION) ? itemDetail.Nav_Question?.DESCREPTION : itemDetail.HIDDEN_DESCRIPTION;
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
foreach (var itemUser in itemDetail.Nav_CheckRecordDetailUsers)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER summaryUser = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_USER();
summaryUser.ORG_ID = sum.ORG_ID;
summaryUser.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryUser.Nav_User = null;
summaryUser.USER_ID = itemUser.USER_ID;
summaryDetailUsers.Add(summaryUser);
}
}
if (itemDetail.Nav_CheckRecordDetailBasics != null && itemDetail.Nav_CheckRecordDetailBasics.Any())
{
foreach (var itemBasic in itemDetail.Nav_CheckRecordDetailBasics)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC summaryBasic = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_BASIC();
summaryBasic.ORG_ID = sum.ORG_ID;
summaryBasic.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryBasic.Nav_Law = null;
summaryBasic.LAW_ID = itemBasic.LAW_ID;
summaryDetailBasics.Add(summaryBasic);
}
}
if (itemDetail.Nav_CheckRecordDetailFiles != null && itemDetail.Nav_CheckRecordDetailFiles.Any())
{
foreach (var itemFile in itemDetail.Nav_CheckRecordDetailFiles)
{
T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE summaryFile = new T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_FILE();
summaryFile.ORG_ID = sum.ORG_ID;
summaryFile.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID = summaryDetail.ID;
summaryFile.Nav_ImgFile = null;
summaryFile.IMG_FILE_ID = itemFile.IMG_FILE_ID;
summaryDetailFiles.Add(summaryFile);
}
}
}
}
var noticeTask = NotificationTaskService.InsertUserNoticeTaskModel("安全检查记录汇总表-" + user.Nav_Department?.NAME + DateTime.Now.Month.PadLeft(2, '0') + DateTime.Now.Day.PadLeft(2, '0'), sum.ID, sum.ORG_ID, user.ID, user.NAME, DateTime.Now, DateTime.Now.AddDays(1), (int)FMNoticeTypeEnum.消息, "SK012");
noticeTasks.Add(noticeTask);
}
}
}
UnifiedCommit(() =>
{
if (records != null && records.Any())
BantchSaveEntityNoCommit(records);
BantchSaveEntityNoCommit(records);
if (summarys != null && summarys.Any())
BantchSaveEntityNoCommit(summarys);
if (summaryFiles != null && summaryFiles.Any())
BantchSaveEntityNoCommit(summaryFiles);
if (summaryDetails != null && summaryDetails.Any())
BantchSaveEntityNoCommit(summaryDetails);
if (summaryDetailUsers != null && summaryDetailUsers.Any())
BantchSaveEntityNoCommit(summaryDetailUsers);
if (summaryDetailBasics != null && summaryDetailBasics.Any())
BantchSaveEntityNoCommit(summaryDetailBasics);
if (summaryDetailFiles != null && summaryDetailFiles.Any())
BantchSaveEntityNoCommit(summaryDetailFiles);
if (tasks != null && tasks.Any())
BantchSaveEntityNoCommit(tasks);
BantchSaveEntityNoCommit(tasks);
if (noticeTasks != null && noticeTasks.Any())
BantchSaveEntityNoCommit(noticeTasks);
});
}
catch (Exception ex)
@ -5352,6 +5488,7 @@ namespace APT.PP.WebApi.Controllers.Api
var checkList = list.Where(t => t.CheckTypeId != null && !checkTypeIds.Contains((Guid)t.CheckTypeId)).ToList();
if (checkList != null && checkList.Any())
{
var j = 1;
foreach (var item in checkList)
{
var userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
@ -5362,8 +5499,8 @@ namespace APT.PP.WebApi.Controllers.Api
}
if (item.CheckPost == "班组负责人")
{
//判断排班
userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID) && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
//判断排班//取消人员排班判断&& teamDepartIds.Contains(t.DEPARTMENT_ID) && t.PERSON_ID != null && personIds.Contains((Guid)t.PERSON_ID)
userInfo = users.FirstOrDefault(t => t.DEPARTMENT_ID == item.CheckDepartId && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME == item.CheckPost);
}
if (userInfo == null && item.CheckDepartId != null && item.CheckPost != "班组负责人")
{
@ -5397,6 +5534,7 @@ namespace APT.PP.WebApi.Controllers.Api
safeNotice.PLANCHECKFREQUENCY = item.Cycle;
safeNotice.DEPARTMENT_TYPE = item.DepartType;
safeNotice.STATUS = PFStandardStatus.Draft;
safeNotice.NOTICE_CODE = "JCZD" + DateTime.Now.ToString("yyyyMMddHH") + j.ToString().PadLeft(4, '0');
safeNotice.ISAUTO = true;
safeNotices.Add(safeNotice);
if (item.details != null && item.details.Any())
@ -5444,6 +5582,7 @@ namespace APT.PP.WebApi.Controllers.Api
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(item.CheckCycle + "安全检查通知" + date, safeNotice.ID, filter.OrgId, userInfo.ID, userInfo.NAME, DateTime.Now, endtime, (int)FMNoticeTypeEnum.消息, "SK006");
notices.Add(notice);
j++;
}
}
}

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

@ -83,7 +83,31 @@ namespace APT.SK.WebApi.Controllers.Api
}
else
{
throw new Exception("检查人员必须填写");
//默认当前层级安全员，没有就找负责人
var userId = APT.Infrastructure.Api.AppContext.CurrentSession.UserID;
var departId = APT.Infrastructure.Api.AppContext.CurrentSession.DepartmentID;
var userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID == departId && t.Nav_Person!=null && t.Nav_ApproveRole!=null && t.Nav_ApproveRole.NAME.Contains("安全员"));
if (userInfo == null)
{
userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.DEPARTMENT_ID == departId && t.Nav_Person != null && t.Nav_ApproveRole != null && t.Nav_ApproveRole.NAME.Contains("负责人"));
}
if (userInfo == null)
{
var departUser = this.GetEntity<T_FM_DEPARTMENT>(t => t.ENABLE_STATUS == 0 && t.ID == departId)?.USER_ID;
if(departUser!=null)
userInfo = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == 0 && t.ID == departUser && t.Nav_Person != null);
}
if (userInfo != null)
{
T_SK_CHECK_SET_USER newUser = new T_SK_CHECK_SET_USER();
newUser.ORG_ID = entity.ORG_ID;
newUser.USER_ID = userInfo.ID;
newUser.CHECK_SET_ID = entity.ID;
checkUsers = new List<T_SK_CHECK_SET_USER>();
checkUsers.Add(newUser);
entity.POST_ID = userInfo.Nav_Person?.POST_ID;
}
//throw new Exception("检查人员必须填写");
}
if (details != null && details.Any())
{

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

@ -69,6 +69,10 @@ namespace APT.SK.WebApi.Controllers.Api
item.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
item.Nav_ImgFile = null;
}
}
if (string.IsNullOrEmpty(entity.NOTICE_CODE))
{
entity.NOTICE_CODE = "SDSB" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
}
List<T_FM_NOTIFICATION_TASK> notices = new List<T_FM_NOTIFICATION_TASK>();
T_SK_HIDDEN_DANGER_CONFIRM confirm = null;
@ -84,17 +88,18 @@ namespace APT.SK.WebApi.Controllers.Api
{
sendUser = depart.USER_ID;
}
var userName = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID)?.NAME;
var userName = this.GetEntity<T_FM_USER>(t => t.ENABLE_STATUS == (int)FMEnableStatusEnum.启用 && sendUser == t.ID);
confirm = new T_SK_HIDDEN_DANGER_CONFIRM();
confirm.HIDDEN_DANGER_HAND_REPORT_ID = entity.ID;
confirm.ORG_ID = entity.ORG_ID;
confirm.MineType = entity.MineType;
confirm.PRODUCTION_UNIT_ID = entity.PRODUCTION_UNIT_ID;
confirm.APPLY_USER_ID = entity.APPLY_USER_ID;
confirm.APPLY_DEPARTMENT_ID = entity.APPLY_DEPARTMENT_ID;
confirm.APPLY_USER_ID = sendUser;
confirm.APPLY_DEPARTMENT_ID = userName?.DEPARTMENT_ID;
confirm.RISK_AREA_ID = entity.RISK_AREA_ID;
confirm.HIDDEN_PLACE = entity.HIDDEN_PLACE;
confirm.HIDDEN_DESCRIPTION = entity.HIDDEN_DESCRIPTION;
confirm.NOTICE_CODE = entity.NOTICE_CODE;
if (files != null && files.Any())
{
foreach (var file in files)
@ -112,7 +117,7 @@ namespace APT.SK.WebApi.Controllers.Api
{
titleName = "手动隐患上报完善";
}
var notice = NotificationTaskService.InsertUserNoticeTaskModel(titleName, confirm.ID, entity.ORG_ID, (Guid)sendUser, userName, DateTime.Now,
var notice = NotificationTaskService.InsertUserNoticeTaskModel(titleName, confirm.ID, entity.ORG_ID, (Guid)sendUser, userName?.NAME, DateTime.Now,
DateTime.Now.AddHours(24), (int)FMNoticeTypeEnum.消息, "SK018");
notices.Add(notice);
}

8
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyNoticeController.cs
View File

@ -564,6 +564,7 @@ namespace APT.SK.WebApi.Controllers.Api
var todoCount = this.GetCount<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL>(t => notice.ID == t.HIDDEN_DANGER_RECTIFY_NOTICE_ID && t.ACCEPT_USER_ID != userId && t.ISCHECK == false, new BaseFilter(notice.ORG_ID));
if (todoCount == 0)
{
var users = this.GetEntities<T_FM_USER>(t => t.ENABLE_STATUS == 0,new BaseFilter(notice.ORG_ID));
notice.STATUS = PFStandardStatus.Archived;
var random = new Random();
if (notice.Nav_RectifyDetails != null && notice.Nav_RectifyDetails.Any())
@ -574,8 +575,8 @@ namespace APT.SK.WebApi.Controllers.Api
if (detail.IMPLEMENT_USER_ID != null)
{
T_SK_HIDDEN_DANGER_RECTIFY_RECORD record = new T_SK_HIDDEN_DANGER_RECTIFY_RECORD();
record.APPLY_DEPARTMENT_ID = notice.APPLY_DEPARTMENT_ID;
record.APPLY_USER_ID = notice.APPLY_USER_ID;
record.APPLY_DEPARTMENT_ID = users.FirstOrDefault(u => u.ID == detail.IMPLEMENT_USER_ID)?.DEPARTMENT_ID;
record.APPLY_USER_ID = detail.IMPLEMENT_USER_ID;
record.ORG_ID = detail.ORG_ID;
record.HIDDEN_DANGER_REPORT_ID = notice.HIDDEN_DANGER_REPORT_ID;
record.HIDDEN_DANGER_REPORT_DETAIL_ID = notice.HIDDEN_DANGER_REPORT_DETAIL_ID;
@ -601,7 +602,8 @@ namespace APT.SK.WebApi.Controllers.Api
record.IMPLEMENT_USER_ID = detail.IMPLEMENT_USER_ID;
record.STATUS = PFStandardStatus.Draft;
record.CHECK_TYPE_ID = notice.CHECK_TYPE_ID;
record.CHECK_TIME = notice.CHECK_TIME;
record.CHECK_TIME = notice.CHECK_TIME;
record.NOTICE_CODE = notice.NOTICE_CODE;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{

1
APT.MicroApi/APT.SK.WebApi/Controllers/Api/HiddenDangerRectifyRecordController.cs
View File

@ -73,6 +73,7 @@ namespace APT.SK.WebApi.Controllers
entity.CHECK_TIME = record.CHECK_TIME;
entity.CHECK_PERSON = record.CHECK_PERSON;
entity.PRODUCTION_UNIT_ID = record.PRODUCTION_UNIT_ID;
entity.NOTICE_CODE = record.NOTICE_CODE;
}
var photoas = entity.Nav_RectifyPhotoas;
entity.Nav_RectifyPhotoas = null;

6
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs
View File

@ -161,7 +161,11 @@ namespace APT.SK.WebApi.Controllers.Api
if (entity.CHECK_TYPE_ID == null)
throw new Exception("检查类型不能为空");
if (entity.CHECK_TIME == null || entity.CHECK_TIME == DateTime.MinValue)
throw new Exception("检查时间必须填写");
throw new Exception("检查时间必须填写");
if (string.IsNullOrEmpty(entity.NOTICE_CODE))
{
entity.NOTICE_CODE = "JCSD" + DateTime.Now.ToString("yyyyMMddHH") + new Random().Next(1, 9999);
}
entity.ApplyDepartmentName = this.GetEntity<T_FM_DEPARTMENT>(t => t.ID == departId).NAME;
entity.ApplyPostName = this.GetEntity<T_FM_USER>(t => t.ID == userId, "Nav_Person.Nav_Post")?.Nav_Person?.Nav_Post?.NAME;
var details = entity.Nav_CheckNoticeDetails;

5
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordSummaryController.cs
View File

@ -229,6 +229,7 @@ namespace APT.SK.WebApi.Controllers.Api
report.DEPARTMENT_TYPE = entity.DEPARTMENT_TYPE;
report.CHECK_TIME = entity.CHECK_TIME;
report.STATUS = PFStandardStatus.Draft;
report.NOTICE_CODE = entity.NOTICE_CODE;
//if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any())
//{
// foreach (var item in record.Nav_CheckRecordFiles)
@ -420,7 +421,8 @@ namespace APT.SK.WebApi.Controllers.Api
report.PLANCHECKFREQUENCY = record.PLANCHECKFREQUENCY;
report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;
report.CHECK_TIME = record.CHECK_TIME;
report.STATUS = PFStandardStatus.Draft;
report.STATUS = PFStandardStatus.Draft;
report.NOTICE_CODE = record.NOTICE_CODE;
//if (record.Nav_CheckRecordFiles != null && record.Nav_CheckRecordFiles.Any())
//{
// foreach (var item in record.Nav_CheckRecordFiles)
@ -584,6 +586,7 @@ namespace APT.SK.WebApi.Controllers.Api
report.DEPARTMENT_TYPE = record.DEPARTMENT_TYPE;
report.CHECK_TIME = record.CHECK_TIME;
report.STATUS = PFStandardStatus.Draft;
report.NOTICE_CODE = record.NOTICE_CODE;
T_SK_HIDDEN_DANGER_REPORT_DETAIL detail = new T_SK_HIDDEN_DANGER_REPORT_DETAIL();
detail.ORG_ID = item.ORG_ID;
detail.HIDDEN_DANGER_REPORT_ID = report.ID;