修改字段

APT.Data.Migrations/Migrations/20251122103915_hmr2025112202.cs

@@ -0,0 +1,100 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025112202 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<string>(
+                name: "SAFE_USER_PHONE",
+                table: "T_OG_RELATED",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldMaxLength: 11,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "USER_PHONE",
+                table: "T_FO_FIRE_JOB_WB",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldMaxLength: 11,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<string>(
+                name: "SAFE_USER_PHONE",
+                table: "T_FO_FIRE_JOB_WB",
+                type: "nvarchar(50)",
+                maxLength: 50,
+                nullable: true,
+                oldClrType: typeof(int),
+                oldType: "int",
+                oldMaxLength: 11,
+                oldNullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_T_FO_FIRE_JOB_WB_RELATED_ID",
+                table: "T_FO_FIRE_JOB_WB",
+                column: "RELATED_ID");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_T_FO_FIRE_JOB_WB_T_OG_RELATED_RELATED_ID",
+                table: "T_FO_FIRE_JOB_WB",
+                column: "RELATED_ID",
+                principalTable: "T_OG_RELATED",
+                principalColumn: "ID",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_T_FO_FIRE_JOB_WB_T_OG_RELATED_RELATED_ID",
+                table: "T_FO_FIRE_JOB_WB");
+
+            migrationBuilder.DropIndex(
+                name: "IX_T_FO_FIRE_JOB_WB_RELATED_ID",
+                table: "T_FO_FIRE_JOB_WB");
+
+            migrationBuilder.AlterColumn<int>(
+                name: "SAFE_USER_PHONE",
+                table: "T_OG_RELATED",
+                type: "int",
+                maxLength: 11,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "USER_PHONE",
+                table: "T_FO_FIRE_JOB_WB",
+                type: "int",
+                maxLength: 11,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+
+            migrationBuilder.AlterColumn<int>(
+                name: "SAFE_USER_PHONE",
+                table: "T_FO_FIRE_JOB_WB",
+                type: "int",
+                maxLength: 11,
+                nullable: true,
+                oldClrType: typeof(string),
+                oldType: "nvarchar(50)",
+                oldMaxLength: 50,
+                oldNullable: true);
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -33723,9 +33723,9 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
-                    b.Property<int?>("SAFE_USER_PHONE")
+                    b.Property<string>("SAFE_USER_PHONE")
-                        .HasMaxLength(11)
+                        .HasMaxLength(50)
-                        .HasColumnType("int");
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<int>("STATUS")
                         .HasColumnType("int");
@@ -33743,9 +33743,9 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
-                    b.Property<int?>("USER_PHONE")
+                    b.Property<string>("USER_PHONE")
-                        .HasMaxLength(11)
+                        .HasMaxLength(50)
-                        .HasColumnType("int");
+                        .HasColumnType("nvarchar(50)");
 
                     b.HasKey("ID");
 
@@ -33765,6 +33765,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.HasIndex("PRODUCTION_UNIT_ID");
 
+                    b.HasIndex("RELATED_ID");
+
                     b.HasIndex("TYPE_ID");
 
                     b.ToTable("T_FO_FIRE_JOB_WB");
@@ -52581,9 +52583,9 @@ namespace APT.Data.Migrations.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
-                    b.Property<int?>("SAFE_USER_PHONE")
+                    b.Property<string>("SAFE_USER_PHONE")
-                        .HasMaxLength(11)
+                        .HasMaxLength(50)
-                        .HasColumnType("int");
+                        .HasColumnType("nvarchar(50)");
 
                     b.Property<Guid?>("USER_ID")
                         .HasColumnType("uniqueidentifier");
@@ -108717,6 +108719,11 @@ namespace APT.Data.Migrations.Migrations
                         .HasForeignKey("PRODUCTION_UNIT_ID")
                         .OnDelete(DeleteBehavior.Restrict);
 
+                    b.HasOne("APT.MS.Domain.Entities.OG.T_OG_RELATED", "Nav_Related")
+                        .WithMany()
+                        .HasForeignKey("RELATED_ID")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("APT.MS.Domain.Entities.FO.T_FO_FIRE_TYPE", "Nav_Type")
                         .WithMany()
                         .HasForeignKey("TYPE_ID")
@@ -108738,6 +108745,8 @@ namespace APT.Data.Migrations.Migrations
 
                     b.Navigation("Nav_ProductionUnit");
 
+                    b.Navigation("Nav_Related");
+
                     b.Navigation("Nav_Type");
                 });
 

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

@@ -1358,11 +1358,12 @@ 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.Property(t => t.CODE).HasMaxLength(100);
 builder.HasOne(t => t.Nav_OperationStep).WithMany().HasForeignKey(t => t.OPERATION_STEP_ID).OnDelete(DeleteBehavior.Restrict);
+builder.HasOne(t => t.Nav_Related).WithMany().HasForeignKey(t => t.RELATED_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Property(t => t.DPARTMENT_NAME).HasMaxLength(100);
 builder.Property(t => t.USER_NAME).HasMaxLength(50);
-builder.Property(t => t.USER_PHONE).HasMaxLength(11);
+builder.Property(t => t.USER_PHONE).HasMaxLength(50);
 builder.Property(t => t.SAFE_USER_NAME).HasMaxLength(50);
-builder.Property(t => t.SAFE_USER_PHONE).HasMaxLength(11);
+builder.Property(t => t.SAFE_USER_PHONE).HasMaxLength(50);
 builder.HasOne(t => t.Nav_Area).WithMany().HasForeignKey(t => t.AREA_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Property(t => t.JOB_LOCATION).HasMaxLength(100);
 builder.HasOne(t => t.Nav_Type).WithMany().HasForeignKey(t => t.TYPE_ID).OnDelete(DeleteBehavior.Restrict);
@@ -7131,7 +7132,7 @@ builder.Property(t => t.CONTACT).HasMaxLength(50);
 builder.Property(t => t.CONTACT_INFO).HasMaxLength(50);
 builder.Property(t => t.ADDRESS).HasMaxLength(50);
 builder.Property(t => t.SAFE_USER_NAME).HasMaxLength(50);
-builder.Property(t => t.SAFE_USER_PHONE).HasMaxLength(11);
+builder.Property(t => t.SAFE_USER_PHONE).HasMaxLength(50);
 builder.HasOne(t => t.Nav_Department).WithMany().HasForeignKey(t => t.DEPARTMENT_ID).OnDelete(DeleteBehavior.Restrict);
 builder.HasOne(t => t.Nav_User).WithMany().HasForeignKey(t => t.USER_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Property(t => t.CONTENT).HasMaxLength(50);

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

@@ -86,8 +86,12 @@ namespace APT.MS.Domain.Entities.FO
         public SKEvaluateLevelEnum EVALUATE_LEVEL { get; set; }
 
         [Description("相关方基本信息表")]
+        [DataFieldForeignKey("Nav_Related")]
         public Guid? RELATED_ID { get; set; }
 
+        [Description("相关方基本信息表")]
+        public T_OG_RELATED Nav_Related { get; set; }
+
         [Description("施工单位")]
         [FormFieldTable]
         [FormFieldEdit]
@@ -103,8 +107,8 @@ namespace APT.MS.Domain.Entities.FO
 
         [Description("负责人电话号码")]
         [FormFieldEdit]
-        [DataFieldLength(11)]
+        [DataFieldLength(50)]
-        public int? USER_PHONE { get; set; }
+        public string USER_PHONE { get; set; }
 
         [Description("负责人签名")]
         [FormFieldEdit]
@@ -115,8 +119,8 @@ namespace APT.MS.Domain.Entities.FO
         public string SAFE_USER_NAME { get; set; }
         [Description("安全员电话号码")]
         [FormFieldEdit]
-        [DataFieldLength(11)]
+        [DataFieldLength(50)]
-        public int? SAFE_USER_PHONE { get; set; }
+        public string SAFE_USER_PHONE { get; set; }
 
         [Description("负责人签名")]
         [FormFieldEdit]

APT.MS.Domain/Entities/SC/OG/121T_OG_RELATED.cs

@@ -63,9 +63,9 @@ namespace APT.MS.Domain.Entities.OG
         [DataFieldLength(50)]
         public string SAFE_USER_NAME { get; set; }
         [Description("安全员电话号码")]
-        [FormFieldEdit]
+        [FormFieldEdit]
-        [DataFieldLength(11)]
+        [DataFieldLength(50)]
-        public int? SAFE_USER_PHONE { get; set; }
+        public string SAFE_USER_PHONE { get; set; }
         [Description("安全员签名")]
         [FormFieldEdit]
         public ICollection<T_OG_RELATED_SAFE_USER> Nav_SafeUser { get; set; }