领导带班下井记录，交接班人改到主表

APT.Data.Migrations/Migrations/20251118024154_hmr2025111801.cs

@@ -0,0 +1,147 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025111801 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "PLACE",
+                table: "T_FO_LEADER_WELL_RECORD",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true);
+
+            migrationBuilder.CreateTable(
+                name: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
+                columns: table => new
+                {
+                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LEADER_WELL_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    AFTER_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    AFTER_USER_DEAL_STATUS = table.Column<int>(type: "int", nullable: true),
+                    IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
+                    ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
+                    FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_T_FO_LEADER_WELL_RECORD_AFTERUSER", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FM_ORGANIZATION_ORG_ID",
+                        column: x => x.ORG_ID,
+                        principalTable: "T_FM_ORGANIZATION",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FM_USER_AFTER_USER_ID",
+                        column: x => x.AFTER_USER_ID,
+                        principalTable: "T_FM_USER",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_AFTERUSER_T_FO_LEADER_WELL_RECORD_LEADER_WELL_RECORD_ID",
+                        column: x => x.LEADER_WELL_RECORD_ID,
+                        principalTable: "T_FO_LEADER_WELL_RECORD",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateTable(
+                name: "T_FO_LEADER_WELL_RECORD_PREUSER",
+                columns: table => new
+                {
+                    ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    LEADER_WELL_RECORD_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    PRE_USER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    PRE_USER_DEAL_STATUS = table.Column<int>(type: "int", nullable: true),
+                    IS_DELETED = table.Column<bool>(type: "bit", nullable: false),
+                    ORG_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
+                    ENTITY_ORG_TPYE = table.Column<int>(type: "int", nullable: false),
+                    FORM_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    FLOW_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_SEND_STATUS = table.Column<int>(type: "int", nullable: false),
+                    FLOW_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    CREATE_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    MODIFY_TIME = table.Column<DateTime>(type: "datetime2", nullable: true),
+                    CREATER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
+                    MODIFIER_ID = table.Column<Guid>(type: "uniqueidentifier", nullable: true)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_T_FO_LEADER_WELL_RECORD_PREUSER", x => x.ID);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FM_ORGANIZATION_ORG_ID",
+                        column: x => x.ORG_ID,
+                        principalTable: "T_FM_ORGANIZATION",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FM_USER_PRE_USER_ID",
+                        column: x => x.PRE_USER_ID,
+                        principalTable: "T_FM_USER",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                    table.ForeignKey(
+                        name: "FK_T_FO_LEADER_WELL_RECORD_PREUSER_T_FO_LEADER_WELL_RECORD_LEADER_WELL_RECORD_ID",
+                        column: x => x.LEADER_WELL_RECORD_ID,
+                        principalTable: "T_FO_LEADER_WELL_RECORD",
+                        principalColumn: "ID",
+                        onDelete: ReferentialAction.Restrict);
+                });
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_AFTER_USER_ID",
+                table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
+                column: "AFTER_USER_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_LEADER_WELL_RECORD_ID",
+                table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
+                column: "LEADER_WELL_RECORD_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_AFTERUSER_ORG_ID",
+                table: "T_FO_LEADER_WELL_RECORD_AFTERUSER",
+                column: "ORG_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_LEADER_WELL_RECORD_ID",
+                table: "T_FO_LEADER_WELL_RECORD_PREUSER",
+                column: "LEADER_WELL_RECORD_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_ORG_ID",
+                table: "T_FO_LEADER_WELL_RECORD_PREUSER",
+                column: "ORG_ID");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_LEADER_WELL_RECORD_PREUSER_PRE_USER_ID",
+                table: "T_FO_LEADER_WELL_RECORD_PREUSER",
+                column: "PRE_USER_ID");
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropTable(
+                name: "T_FO_LEADER_WELL_RECORD_AFTERUSER");
+
+            migrationBuilder.DropTable(
+                name: "T_FO_LEADER_WELL_RECORD_PREUSER");
+
+            migrationBuilder.DropColumn(
+                name: "PLACE",
+                table: "T_FO_LEADER_WELL_RECORD");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -35598,6 +35598,10 @@ namespace APT.Data.Migrations.Migrations
                         .IsRequired()
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("PLACE")
+                        .HasMaxLength(50)
+                        .HasColumnType("nvarchar(50)");
+
                     b.Property<Guid?>("PRODUCTION_UNIT_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -35621,6 +35625,66 @@ namespace APT.Data.Migrations.Migrations
                     b.ToTable("T_FO_LEADER_WELL_RECORD");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_AFTERUSER", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int?>("AFTER_USER_DEAL_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("AFTER_USER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("CREATER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("CREATE_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("ENTITY_ORG_TPYE")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FLOW_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("FLOW_SEND_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FLOW_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FORM_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("IS_DELETED")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid>("LEADER_WELL_RECORD_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("MODIFIER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("MODIFY_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("ORG_ID")
+                        .IsRequired()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("AFTER_USER_ID");
+
+                    b.HasIndex("LEADER_WELL_RECORD_ID");
+
+                    b.HasIndex("ORG_ID");
+
+                    b.ToTable("T_FO_LEADER_WELL_RECORD_AFTERUSER");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
                 {
                     b.Property<Guid>("ID")
@@ -35998,6 +36062,66 @@ namespace APT.Data.Migrations.Migrations
                     b.ToTable("T_FO_LEADER_WELL_RECORD_FILE");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_PREUSER", b =>
+                {
+                    b.Property<Guid>("ID")
+                        .ValueGeneratedOnAdd()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("CREATER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("CREATE_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<int>("ENTITY_ORG_TPYE")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FLOW_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int>("FLOW_SEND_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<int>("FLOW_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("FORM_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<bool>("IS_DELETED")
+                        .HasColumnType("bit");
+
+                    b.Property<Guid>("LEADER_WELL_RECORD_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<Guid?>("MODIFIER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<DateTime?>("MODIFY_TIME")
+                        .HasColumnType("datetime2");
+
+                    b.Property<Guid?>("ORG_ID")
+                        .IsRequired()
+                        .HasColumnType("uniqueidentifier");
+
+                    b.Property<int?>("PRE_USER_DEAL_STATUS")
+                        .HasColumnType("int");
+
+                    b.Property<Guid?>("PRE_USER_ID")
+                        .HasColumnType("uniqueidentifier");
+
+                    b.HasKey("ID");
+
+                    b.HasIndex("LEADER_WELL_RECORD_ID");
+
+                    b.HasIndex("ORG_ID");
+
+                    b.HasIndex("PRE_USER_ID");
+
+                    b.ToTable("T_FO_LEADER_WELL_RECORD_PREUSER");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_USER", b =>
                 {
                     b.Property<Guid>("ID")
@@ -108887,6 +109011,32 @@ namespace APT.Data.Migrations.Migrations
                     b.Navigation("Nav_ProductionUnit");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_AFTERUSER", b =>
+                {
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_AfterUser")
+                        .WithMany()
+                        .HasForeignKey("AFTER_USER_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
+                        .WithMany("Nav_AfterUsers")
+                        .HasForeignKey("LEADER_WELL_RECORD_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
+                        .WithMany()
+                        .HasForeignKey("ORG_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.Navigation("Nav_AfterUser");
+
+                    b.Navigation("Nav_Org");
+
+                    b.Navigation("Nav_Record");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_DETAIL", b =>
                 {
                     b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
@@ -109044,6 +109194,32 @@ namespace APT.Data.Migrations.Migrations
                     b.Navigation("Nav_Record");
                 });
 
+            modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_PREUSER", b =>
+                {
+                    b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
+                        .WithMany("Nav_PreUsers")
+                        .HasForeignKey("LEADER_WELL_RECORD_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("APT.Infrastructure.Core.T_FM_ORGANIZATION", "Nav_Org")
+                        .WithMany()
+                        .HasForeignKey("ORG_ID")
+                        .OnDelete(DeleteBehavior.Restrict)
+                        .IsRequired();
+
+                    b.HasOne("APT.BaseData.Domain.Entities.FM.T_FM_USER", "Nav_PreUser")
+                        .WithMany()
+                        .HasForeignKey("PRE_USER_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
+                    b.Navigation("Nav_Org");
+
+                    b.Navigation("Nav_PreUser");
+
+                    b.Navigation("Nav_Record");
+                });
+
             modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD_USER", b =>
                 {
                     b.HasOne("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", "Nav_Record")
@@ -133569,10 +133745,14 @@ namespace APT.Data.Migrations.Migrations
 
             modelBuilder.Entity("APT.MS.Domain.Entities.FO.T_FO_LEADER_WELL_RECORD", b =>
                 {
+                    b.Navigation("Nav_AfterUsers");
+
                     b.Navigation("Nav_Details");
 
                     b.Navigation("Nav_Files");
 
+                    b.Navigation("Nav_PreUsers");
+
                     b.Navigation("Nav_Users");
                 });
 

APT.MS.Data/Mapping/T4/T4Map.cs

@@ -1720,6 +1720,18 @@ builder.HasOne(t => t.Nav_Company).WithMany().HasForeignKey(t => t.COMPANY_ID).O
 builder.HasOne(t => t.Nav_ProductionUnit).WithMany().HasForeignKey(t => t.PRODUCTION_UNIT_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_Class).WithMany().HasForeignKey(t => t.CLASS_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Ignore(t => t.PUBLISH);
+builder.Property(t => t.PLACE).HasMaxLength(50);
+		} 
+     }
+	 #endregion
+					#region  LeaderWellRecordAfteruser
+     public partial class FOLeaderWellRecordAfteruserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_AFTERUSER>
+     {   
+        public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_AFTERUSER> builder)
+		{
+			base.Configure(builder);
+			builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_AfterUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_AfterUser).WithMany().HasForeignKey(t => t.AFTER_USER_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
      }
 	 #endregion
@@ -1792,6 +1804,17 @@ builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).
 			builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_Files).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_ImgFile).WithMany().HasForeignKey(t => t.IMG_FILE_ID).OnDelete(DeleteBehavior.Restrict);
 		} 
+     }
+	 #endregion
+					#region  LeaderWellRecordPreuser
+     public partial class FOLeaderWellRecordPreuserMap :APTEntityBaseMap<T_FO_LEADER_WELL_RECORD_PREUSER>
+     {   
+        public override void Configure(EntityTypeBuilder<T_FO_LEADER_WELL_RECORD_PREUSER> builder)
+		{
+			base.Configure(builder);
+			builder.HasOne(t => t.Nav_Record).WithMany(t=>t.Nav_PreUsers).HasForeignKey(t => t.LEADER_WELL_RECORD_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_PreUser).WithMany().HasForeignKey(t => t.PRE_USER_ID).OnDelete(DeleteBehavior.Restrict);
+		} 
      }
 	 #endregion
 					#region  LeaderWellRecordUser
@@ -13346,6 +13369,7 @@ builder.Property(t => t.CHECK_CONTENT).HasMaxLength(500);
 builder.Property(t => t.CHECK_BASIC).HasMaxLength(500);
 builder.Property(t => t.CHECK_STANDARD).HasMaxLength(500);
 builder.Ignore(t => t.MineType);
+builder.Ignore(t => t.PRODUCTION_UNIT_ID);
 builder.Ignore(t => t.AREA_ID);
 builder.Ignore(t => t.AREA_NAME);
 builder.Ignore(t => t.Nav_Area);

APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD.cs

@@ -86,5 +86,18 @@ namespace APT.MS.Domain.Entities.FO
         [Description("提交并通知")]
         [DataFieldIngore]
         public string PUBLISH { get; set; }
+
+        [Description("交接地点")]
+        [FormFieldEdit]
+        [DataFieldLength(50)]
+        public string PLACE { get; set; }
+
+        [Description("导航属性：交班人")]
+        [FormFieldEdit]
+        public ICollection<T_FO_LEADER_WELL_RECORD_PREUSER> Nav_PreUsers { get; set; }
+
+        [Description("导航属性：接班人")]
+        [FormFieldEdit]
+        public ICollection<T_FO_LEADER_WELL_RECORD_AFTERUSER> Nav_AfterUsers { get; set; }
     }
 }

APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD_AFTERUSER.cs

@@ -0,0 +1,33 @@
+using APT.BaseData.Domain.Entities.FM;
+using APT.Infrastructure.Core;
+using APT.MS.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace APT.MS.Domain.Entities.FO
+{
+    [Description("接班人")]
+    public class T_FO_LEADER_WELL_RECORD_AFTERUSER : MesEntityBase
+    {
+        [Description("主表ID")]
+        [DataFieldForeignKey("Nav_Record", "Nav_AfterUsers")]
+        public Guid LEADER_WELL_RECORD_ID { get; set; }
+
+        [Description("导航属性：主表")]
+        public virtual T_FO_LEADER_WELL_RECORD Nav_Record { get; set; }
+
+        [Description("接班人")]
+        [DataFieldForeignKey("Nav_AfterUser")]
+        [FormFieldEdit]
+        public Guid? AFTER_USER_ID { get; set; }
+
+
+        [Description("导航属性：接班人")]
+        public T_FM_USER Nav_AfterUser { get; set; }
+
+        [EnumName("FOUserShiftStatusEnum")]     //为枚举（0待处理 1已处理）
+        public FOUserShiftStatusEnum? AFTER_USER_DEAL_STATUS { get; set; }
+    }
+}

APT.MS.Domain/Entities/FO/T_FO_LEADER_WELL_RECORD_PREUSER.cs

@@ -0,0 +1,33 @@
+using APT.BaseData.Domain.Entities.FM;
+using APT.Infrastructure.Core;
+using APT.MS.Domain.Enums;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Text;
+
+namespace APT.MS.Domain.Entities.FO
+{
+    [Description("交班人")]
+    public class T_FO_LEADER_WELL_RECORD_PREUSER : MesEntityBase
+    {
+        [Description("主表ID")]
+        [DataFieldForeignKey("Nav_Record", "Nav_PreUsers")]
+        public Guid LEADER_WELL_RECORD_ID { get; set; }
+
+        [Description("导航属性：主表")]
+        public virtual T_FO_LEADER_WELL_RECORD Nav_Record { get; set; }
+        [Description("交班人")]
+        [DataFieldForeignKey("Nav_PreUser")]
+        [FormFieldEdit]
+        public Guid? PRE_USER_ID { get; set; }
+
+
+        [Description("导航属性：交班人")]
+        public T_FM_USER Nav_PreUser { get; set; }
+
+        [Description("处理状态")]
+        [EnumName("FOUserShiftStatusEnum")]     //为枚举（0待处理 1已处理）
+        public FOUserShiftStatusEnum? PRE_USER_DEAL_STATUS { get; set; }
+    }
+}

APT.MicroApi/APT.FO.WebApi/Controllers/LeaderWellRecordController.cs

@@ -38,7 +38,7 @@ namespace APT.FO.WebApi.Controllers
                     "Nav_Files.Nav_ImgFile.Nav_File");
                 if (entity != null)
                 {
-                    var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User", "Nav_PreUser", "Nav_AfterUser", "Nav_DetailAreas.Nav_Area").ToList();
+                    var details = this.GetEntities<T_FO_LEADER_WELL_RECORD_DETAIL>(t => t.LEADER_WELL_RECORD_ID == entity.ID, new BaseFilter(entity.ORG_ID), "Nav_DetailFiles.Nav_ImgFile.Nav_File", "Nav_User", "Nav_PreUsers.Nav_PreUser", "Nav_AfterUsers.Nav_AfterUser", "Nav_DetailAreas.Nav_Area").ToList();
                     entity.Nav_Details = details.OrderByDescending(t => t.START_DATE).ToList();
                 }
                 return entity;

APT.MicroApi/APT.FO.WebApi/Controllers/T4/T4Control.cs

@@ -6791,6 +6791,117 @@ namespace APT.FO.WebApi.Controllers.Api
        }
        
 
+    }
+	#endregion
+
+	#region  LeaderWellRecordAfteruser-接班人
+	/// <summary>
+    ///  接班人
+    /// </summary>
+	[Route("api/FO/LeaderWellRecordAfteruser")]
+    public partial class LeaderWellRecordAfteruserController : AuthorizeApiController<T_FO_LEADER_WELL_RECORD_AFTERUSER>
+    {   
+       /// <summary>
+       /// 查询所有数据
+       /// </summary>
+       /// <param name="filter">过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("Entities")]
+       public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_AFTERUSER>> Entities([FromBody]KeywordFilter filter)
+       {
+           return WitEntities(null, filter);
+       }
+
+        /// <summary>
+       /// 排序查询所有数据
+       /// </summary>
+       /// <param name="filter">过滤实体</param>
+       /// <returns></returns>
+
+       [HttpPost, Route("OrderEntities")]
+       public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_AFTERUSER>> OrderEntities([FromBody]KeywordFilter filter)
+       {
+           return WitOrderEntities(null, filter);
+       }
+
+       /// <summary>
+       /// 分页查询数据
+       /// </summary>
+       /// <param name="pageFilter">分页过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("Paged")]
+       public PagedActionResult<T_FO_LEADER_WELL_RECORD_AFTERUSER> Paged([FromBody]KeywordPageFilter pageFilter)
+       {
+           return WitPaged(null, pageFilter);
+       }
+
+       /// <summary>
+       /// 排序分页查询数据
+       /// </summary>
+       /// <param name="pageFilter">分页过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("OrderPaged")]
+       public PagedActionResult<T_FO_LEADER_WELL_RECORD_AFTERUSER> 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_FO_LEADER_WELL_RECORD_AFTERUSER entity)
+       {
+           return WitUpdate(entity);
+       }
+
+       /// <summary>
+       /// 批量更新
+       /// </summary>
+       /// <param name="entity">对象实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("BatchUpdate")]
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_FO_LEADER_WELL_RECORD_AFTERUSER> 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_FO_LEADER_WELL_RECORD_AFTERUSER> Get([FromBody] KeywordFilter filter)
+       {
+           return WitEntity(null, filter);
+       }
+       
+
     }
 	#endregion
 
@@ -7457,6 +7568,117 @@ namespace APT.FO.WebApi.Controllers.Api
        }
        
 
+    }
+	#endregion
+
+	#region  LeaderWellRecordPreuser-交班人
+	/// <summary>
+    ///  交班人
+    /// </summary>
+	[Route("api/FO/LeaderWellRecordPreuser")]
+    public partial class LeaderWellRecordPreuserController : AuthorizeApiController<T_FO_LEADER_WELL_RECORD_PREUSER>
+    {   
+       /// <summary>
+       /// 查询所有数据
+       /// </summary>
+       /// <param name="filter">过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("Entities")]
+       public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_PREUSER>> Entities([FromBody]KeywordFilter filter)
+       {
+           return WitEntities(null, filter);
+       }
+
+        /// <summary>
+       /// 排序查询所有数据
+       /// </summary>
+       /// <param name="filter">过滤实体</param>
+       /// <returns></returns>
+
+       [HttpPost, Route("OrderEntities")]
+       public JsonActionResult<IEnumerable<T_FO_LEADER_WELL_RECORD_PREUSER>> OrderEntities([FromBody]KeywordFilter filter)
+       {
+           return WitOrderEntities(null, filter);
+       }
+
+       /// <summary>
+       /// 分页查询数据
+       /// </summary>
+       /// <param name="pageFilter">分页过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("Paged")]
+       public PagedActionResult<T_FO_LEADER_WELL_RECORD_PREUSER> Paged([FromBody]KeywordPageFilter pageFilter)
+       {
+           return WitPaged(null, pageFilter);
+       }
+
+       /// <summary>
+       /// 排序分页查询数据
+       /// </summary>
+       /// <param name="pageFilter">分页过滤实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("OrderPaged")]
+       public PagedActionResult<T_FO_LEADER_WELL_RECORD_PREUSER> 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_FO_LEADER_WELL_RECORD_PREUSER entity)
+       {
+           return WitUpdate(entity);
+       }
+
+       /// <summary>
+       /// 批量更新
+       /// </summary>
+       /// <param name="entity">对象实体</param>
+       /// <returns></returns>
+       [HttpPost, Route("BatchUpdate")]
+       public JsonActionResult<bool> BatchUpdate([FromBody] BatchUpdateModel<T_FO_LEADER_WELL_RECORD_PREUSER> 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_FO_LEADER_WELL_RECORD_PREUSER> Get([FromBody] KeywordFilter filter)
+       {
+           return WitEntity(null, filter);
+       }
+       
+
     }
 	#endregion
 

APT.MicroApi/APT.SK.WebApi/Controllers/Api/SecurityInspectionNoticeController.cs

@@ -1752,7 +1752,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                 start.NAME = "安全检查通知";
                                 start.DEAL_DATE = check.MODIFY_TIME;
                                 start.CREATE_TIME = check.CREATE_TIME;
-                                start.STATUS = check.STATUS ==  PFStandardStatus.Archived ? 10 : 0;
+                                start.STATUS = 10;
                                 noticeLog.logList.Add(start);
                             }
                                 //审批
@@ -1966,11 +1966,11 @@ namespace APT.SK.WebApi.Controllers.Api
                                 start.NAME = "隐患上报";
                                 start.DEAL_DATE = dangerReport.MODIFY_TIME;
                                 start.CREATE_TIME = dangerReport.CREATE_TIME;
-                                start.STATUS = dangerReport.STATUS ==  PFStandardStatus.Archived ? 10 : 0;
+                                start.STATUS =  10;
                                 hiddenReportLog.logList.Add(start);
                             }
                                 //审批
-                                var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
+                            var approveTemp = approves.FirstOrDefault(t => t.DATA_ID == dangerReportId);
                             if (approveTemp == null)
                             {
                                 //判断发起人层级，取审批模板
@@ -1991,7 +1991,7 @@ namespace APT.SK.WebApi.Controllers.Api
                                         start1.DEAL_DATE = null;
                                         start1.CREATE_TIME = null;
                                         start1.STATUS = 0;
-                                        noticeLog.logList.Add(start);
+                                        noticeLog.logList.Add(start1);
                                     }
                                 }
                                 else