检查登记、上报记录、整改单 添加备注字段

APT.Data.Migrations/Migrations/20240624023406_wyw2024062401.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class wyw2024062401 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "REMARK",
+                table: "T_BS_SAFE_CHECK_DETAIL",
+                type: "nvarchar(100)",
+                maxLength: 100,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "REMARK",
+                table: "T_BS_RISK_SUBMIT_CONTENT_DEAL",
+                type: "nvarchar(100)",
+                maxLength: 100,
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "REMARK",
+                table: "T_BS_RISK_SUBMIT_CONTENT",
+                type: "nvarchar(100)",
+                maxLength: 100,
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "REMARK",
+                table: "T_BS_SAFE_CHECK_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "REMARK",
+                table: "T_BS_RISK_SUBMIT_CONTENT_DEAL");
+
+            migrationBuilder.DropColumn(
+                name: "REMARK",
+                table: "T_BS_RISK_SUBMIT_CONTENT");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -19695,6 +19695,10 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("QUESTION_LEVEL")
                         .HasColumnType("int");
 
+                    b.Property<string>("REMARK")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
                     b.Property<DateTime?>("REPORTDATE")
                         .HasColumnType("datetime2");
 
@@ -20035,6 +20039,10 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int>("QUESTION_LEVEL")
                         .HasColumnType("int");
 
+                    b.Property<string>("REMARK")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
                     b.Property<Guid?>("RISK_SUBMIT_CONTENT_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -21216,6 +21224,10 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<int?>("QUESTION_LEVEL")
                         .HasColumnType("int");
 
+                    b.Property<string>("REMARK")
+                        .HasMaxLength(100)
+                        .HasColumnType("nvarchar(100)");
+
                     b.Property<string>("REMARK_RESULT")
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");

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

@@ -399,6 +399,7 @@ builder.Ignore(t => t.CHECK_TYPE_LEVEL_ID);
 builder.Ignore(t => t.SUBMIT_STATUS);
 builder.Ignore(t => t.CHECKOBJECT);
 builder.Ignore(t => t.CREATE_NAME);
+builder.Property(t => t.REMARK).HasMaxLength(100);
 		} 
      }
 	 #endregion
@@ -455,6 +456,7 @@ builder.Ignore(t => t.OPERARTETYPE);
 builder.Ignore(t => t.Nav_ApplyDetail);
 builder.Ignore(t => t.IS_OVERTIME);
 builder.Ignore(t => t.DEPARTMENT_ID);
+builder.Property(t => t.REMARK).HasMaxLength(100);
 		} 
      }
 	 #endregion
@@ -681,6 +683,7 @@ builder.Ignore(t => t.ISAUTOLOAD);
 builder.HasOne(t => t.Nav_Contents).WithMany().HasForeignKey(t => t.CHECK_CONTENTS_ID).OnDelete(DeleteBehavior.Restrict);
 builder.Property(t => t.ADDRESS).HasMaxLength(100);
 builder.Ignore(t => t.Nav_Reject);
+builder.Property(t => t.REMARK).HasMaxLength(100);
 		} 
      }
 	 #endregion

APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_CONTENT.cs

@@ -567,5 +567,13 @@ namespace APT.MS.Domain.Entities.BS
         [Description("状态")]
         [DataFieldIngore]
         public string CREATE_NAME { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Description("备注")]
+        [FormFieldEdit]
+        [DataFieldLength(100)]
+        public string REMARK { get; set; }
     }
 }

APT.MS.Domain/Entities/BS/T_BS_RISK_SUBMIT_CONTENT_DEAL.cs

@@ -288,5 +288,13 @@ namespace APT.MS.Domain.Entities.BS
 
         [DataFieldIngore]
         public Guid? DEPARTMENT_ID { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Description("备注")]
+        [FormFieldEdit]
+        [DataFieldLength(100)]
+        public string REMARK { get; set; }
     }
 }

APT.MS.Domain/Entities/BS/T_BS_SAFE_CHECK_DETAIL.cs

@@ -297,5 +297,13 @@ namespace APT.MS.Domain.Entities.BS
         [Description("退回记录")]
         [DataFieldIngore]
         public virtual T_BS_SAFE_CHECK_DETAIL_REJECT Nav_Reject { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        [Description("备注")]
+        [FormFieldEdit]
+        [DataFieldLength(100)]
+        public string REMARK { get; set; }
     }
 }

APT.MicroApi/APT.BS.WebApi/Controllers/Api/BSRiskSubmitController.cs

@@ -286,6 +286,7 @@ namespace APT.BS.WebApi.Controllers.Api
                                 model.RISK_SUBMIT_ID = modelSub.ID;
                                 model.CHECK_MAIN_ID = item.CHECK_MAIN_ID;
                                 model.Nav_CheckMain = item.Nav_CheckMain;
+                                model.REMARK = item.REMARK;
 
                                 model.DEPARTMENT_ID = item.DEPARTMENT_ID;
                                 model.Nav_Department = depCheck;
@@ -769,6 +770,7 @@ namespace APT.BS.WebApi.Controllers.Api
                             model.RISK_SUBMIT_ID = RISK_SUBMIT_ID;
                             model.CHECK_MAIN_ID = item.CHECK_MAIN_ID;
                             model.Nav_CheckMain = item.Nav_CheckMain;
+                            model.REMARK = item.REMARK;
 
                             model.DEPARTMENT_ID = item.DEPARTMENT_ID;
                             model.Nav_Department = depCheck;
@@ -2257,6 +2259,7 @@ namespace APT.BS.WebApi.Controllers.Api
                             dealTemp.DEAL_USER_ID = item.DEAL_USER_ID;
                             dealTemp.ACTUAL_DEAL_USER_ID = item.ACTUAL_DEAL_USER_ID;
                             dealTemp.CHECK_USER_ID = item.CHECK_USER_ID;
+                            dealTemp.REMARK = item.REMARK;
 
                             listContentDeal.Add(dealTemp);
 
@@ -2653,6 +2656,7 @@ namespace APT.BS.WebApi.Controllers.Api
                             dealTemp.DEAL_USER_ID = item.DEAL_USER_ID;
                             dealTemp.ACTUAL_DEAL_USER_ID = item.ACTUAL_DEAL_USER_ID;
                             dealTemp.CHECK_USER_ID = item.CHECK_USER_ID;
+                            dealTemp.REMARK = item.REMARK;
 
                             listContentDeal.Add(dealTemp);
 
@@ -6719,7 +6723,7 @@ namespace APT.BS.WebApi.Controllers.Api
                     dealTemp.DEAL_USER_ID = item.DEAL_USER_ID;
                     dealTemp.ACTUAL_DEAL_USER_ID = item.ACTUAL_DEAL_USER_ID;
                     dealTemp.CHECK_USER_ID = item.CHECK_USER_ID;
-
+                    dealTemp.REMARK = item.REMARK;
                     listContentDeal.Add(dealTemp);
 
                     //附件