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:
何美荣 2026-06-09 16:38:14 +08:00
parent 8614961dbe
commit d3308727ef
13 changed files with 139855 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11640,6 +11640,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11721,6 +11722,7 @@ namespace APT.BaseData.Services.DomainServices
record.CHECK_TIME = entity.CHECK_TIME != null ? entity.CHECK_TIME : DateTime.Now;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -11822,7 +11824,8 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_PLACE = detail.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = detail.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = detail.RECITIFY_USER_ID;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetail.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
noticeDetail.REMARK = detail.REMARK;
noticeDetails.Add(noticeDetail);
if (detail.Nav_ReportDetailFiles != null && detail.Nav_ReportDetailFiles.Any())
{
@ -12084,7 +12087,8 @@ namespace APT.BaseData.Services.DomainServices
record.IMPLEMENT_USER_ID = entity.RECITIFY_USER_ID;
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.REMARK = entity.REMARK;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12150,6 +12154,7 @@ namespace APT.BaseData.Services.DomainServices
record.ACCEPT_USER_ID = acceptUser?.ID;
record.RECTIFICATION_MEASURES = hidDescrip?.DEMAND;
record.NOTICE_CODE = entity.NOTICE_CODE;
record.REMARK = entity.REMARK;
if (photos != null && photos.Any())
{
foreach (var item in photos)
@ -12241,6 +12246,7 @@ namespace APT.BaseData.Services.DomainServices
noticeDetail.HIDDEN_PLACE = entity.HIDDEN_PLACE;
noticeDetail.RECITIFY_TIME = entity.RECITIFY_TIME;
noticeDetail.RECITIFY_USER_ID = entity.RECITIFY_USER_ID;
noticeDetail.REMARK = entity.REMARK;
noticeDetails.Add(noticeDetail);
if (photos != null && photos.Any())
{

139715
APT.Data.Migrations/Migrations/20260609083642_hmr2026060901.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

68
APT.Data.Migrations/Migrations/20260609083642_hmr2026060901.cs Normal file
View File

@ -0,0 +1,68 @@
using Microsoft.EntityFrameworkCore.Migrations;
namespace APT.Data.Migrations.Migrations
{
public partial class hmr2026060901 : Migration
{
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
migrationBuilder.AddColumn<string>(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_CONFIRM",
type: "nvarchar(200)",
maxLength: 200,
nullable: true);
}
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_SECURITY_INSPECTION_RECORD_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_REPORT_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL");
migrationBuilder.DropColumn(
name: "REMARK",
table: "T_SK_HIDDEN_DANGER_CONFIRM");
}
}
}

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

@ -81617,6 +81617,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -82369,6 +82373,10 @@ namespace APT.Data.Migrations.Migrations
.HasMaxLength(500)
.HasColumnType("nvarchar(500)");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -83311,6 +83319,10 @@ namespace APT.Data.Migrations.Migrations
b.Property<Guid?>("RECITIFY_USER_ID")
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -89077,6 +89089,10 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");
@ -89581,6 +89597,10 @@ namespace APT.Data.Migrations.Migrations
.IsRequired()
.HasColumnType("uniqueidentifier");
b.Property<string>("REMARK")
.HasMaxLength(200)
.HasColumnType("nvarchar(200)");
b.Property<Guid?>("RISK_AREA_ID")
.HasColumnType("uniqueidentifier");

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

@ -13941,6 +13941,7 @@ 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);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -14086,6 +14087,7 @@ builder.HasOne(t => t.Nav_ImplementUser).WithMany().HasForeignKey(t => t.IMPLEME
builder.HasOne(t => t.Nav_AcceptUser).WithMany().HasForeignKey(t => t.ACCEPT_USER_ID).OnDelete(DeleteBehavior.Restrict);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -14266,6 +14268,7 @@ builder.HasOne(t => t.Nav_RecitifyUser).WithMany().HasForeignKey(t => t.RECITIFY
builder.Ignore(t => t.STATUS);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -15373,6 +15376,7 @@ builder.Property(t => t.HIDDEN_DESCRIPTION).HasMaxLength(500);
builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion
@ -15467,6 +15471,7 @@ builder.Property(t => t.HIDDEN_PLACE).HasMaxLength(500);
builder.Ignore(t => t.Nav_DetailContents);
builder.Property(t => t.HIDDEN_REASON).HasMaxLength(200);
builder.Ignore(t => t.STATUS);
builder.Property(t => t.REMARK).HasMaxLength(200);
}
}
#endregion

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

@ -237,6 +237,10 @@ namespace APT.MS.Domain.Entities.SK
[Description("检查通知编号")]
[DataFieldLength(50)]
public string NOTICE_CODE { get; set; }
public string NOTICE_CODE { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -178,6 +178,10 @@ namespace APT.MS.Domain.Entities.SK
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Nav_RectifyDetailReasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_RECTIFY_NOTICE_DETAIL_REASON> Nav_RectifyDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -172,6 +172,10 @@ namespace APT.MS.Domain.Entities.SK
[DataFieldLength(200)]
public string HIDDEN_REASON { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Nav_ReportDetailReasons { get; set; }
public virtual ICollection<T_SK_HIDDEN_DANGER_REPORT_DETAIL_REASON> Nav_ReportDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -157,6 +157,10 @@ namespace APT.MS.Domain.Entities.SK
/// 导航属性：隐患原因
/// </summary>
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -151,6 +151,9 @@ namespace APT.MS.Domain.Entities.SK
public PFStandardStatus? STATUS { get; set; }
[Description("导航：隐患原因")]
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
public virtual ICollection<T_SK_SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_REASON> Nav_CheckRecordDetailReasons { get; set; }
[Description("备注")]
[DataFieldLength(200)]
public string REMARK { get; set; }
}
}

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

@ -380,6 +380,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.CHECK_TYPE_ID = entity.CHECK_TYPE_ID;
record.CHECK_TIME = entity.CHECK_TIME;
record.CHECK_PERSON = detail.CHECK_PERSON;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{
@ -632,6 +633,7 @@ namespace APT.SK.WebApi.Controllers.Api
record.CHECK_TIME = notice.CHECK_TIME;
record.NOTICE_CODE = notice.NOTICE_CODE;
record.CHECK_PERSON = detail.CHECK_PERSON;
record.REMARK = detail.REMARK;
records.Add(record);
if (detail.Nav_RectifyDetailFiles != null && detail.Nav_RectifyDetailFiles.Any())
{

15
APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionRecordController.cs
View File

@ -751,7 +751,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.REMARK = itemDetail.REMARK;
tempDetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -824,7 +825,8 @@ namespace APT.SK.WebApi.Controllers.Api
summaryDetail.HIDDEN_LEVEL = itemDetail.HIDDEN_LEVEL;
summaryDetail.HIDDEN_PLACE = itemDetail.HIDDEN_PLACE;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.NUM = itemDetail.NUM;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
var groupUsers = tempDetailUsers.Where(t => ids.Contains(t.SECURITY_INSPECTION_RECORD_SUMMARY_DETAIL_ID)).Select(m => m.USER_ID).Distinct().ToList();
if (groupUsers.Any())
@ -913,7 +915,8 @@ namespace APT.SK.WebApi.Controllers.Api
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;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -999,7 +1002,8 @@ namespace APT.SK.WebApi.Controllers.Api
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;
summaryDetail.MARK = itemDetail.MARK;
summaryDetail.REMARK = itemDetail.REMARK;
sumdetails.Add(summaryDetail);
if (itemDetail.Nav_CheckRecordDetailUsers != null && itemDetail.Nav_CheckRecordDetailUsers.Any())
{
@ -1117,7 +1121,8 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_DESCRIPTION = string.IsNullOrEmpty(item.HIDDEN_DESCRIPTION) ? item.Nav_Question?.DESCREPTION : item.HIDDEN_DESCRIPTION;
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();

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

@ -310,6 +310,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
@ -504,6 +505,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();
@ -654,6 +656,7 @@ namespace APT.SK.WebApi.Controllers.Api
detail.HIDDEN_LEVEL = item.HIDDEN_LEVEL;
detail.HIDDEN_PLACE = item.HIDDEN_PLACE;
detail.MARK = item.MARK;
detail.REMARK = item.REMARK;
if (item.Nav_CheckRecordDetailUsers != null && item.Nav_CheckRecordDetailUsers.Any())
{
var itemUserList = item.Nav_CheckRecordDetailUsers.Select(t => t.Nav_User?.NAME).ToList();