加字段

APT.BaseData.Services/Services/PF/PFApproveCallBackService.cs

@@ -12906,7 +12906,8 @@ namespace APT.BaseData.Services.DomainServices
                             ideDetail.RISK_NAME_ID = temp?.RISK_NAME_ID;
                             ideDetail.DEPARTMENT_TYPE = temp?.DEPARTMENT_TYPE;
                             ideDetail.IDENTIFY_DEPARTMENT = temp?.IDENTIFY_DEPARTMENT;
-                            ideDetail.IDENTIFY_POST = temp?.IDENTIFY_POST;
+                            ideDetail.IDENTIFY_POST = temp?.IDENTIFY_POST;
+                            ideDetail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
                             summaryDetails.Add(ideDetail);
                         }
                     }
@@ -13119,6 +13120,7 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EVALUATE_SCORE = departTemp == null ? 0 : departTemp.EVALUATE_SCORE;
                                     detail.EVALUATE_LEVEL = departTemp == null ? SKEvaluateLevelEnum.低风险 : departTemp.EVALUATE_LEVEL;
                                     detail.EMERGENCY = departTemp == null ? "" : departTemp.EMERGENCY;
+                                    detail.MARK = departTemp == null ? SKMarkEnum.Add :  SKMarkEnum.Auto;
                                     if (departTemp != null)
                                     {
                                         var libraryDetailTemps = libraryDetails.Where(t => t.ENTERPRISE_LIBRARY_ID == departTemp.ID).ToList();
@@ -13394,7 +13396,8 @@ namespace APT.BaseData.Services.DomainServices
                             detail.SCOREL_ID = temp?.SCOREL_ID;
                             detail.EVALUATE_SCORE = temp.EVALUATE_SCORE;
                             detail.EMERGENCY = temp.EMERGENCY;
-                            detail.EVALUATE_LEVEL = temp.EVALUATE_LEVEL;
+                            detail.EVALUATE_LEVEL = temp.EVALUATE_LEVEL;
+                            detail.MARK = temp == null ? SKMarkEnum.Add : temp.MARK;
                             resultDetails.Add(detail);
                             if (temp.Nav_DetailMeasures != null && temp.Nav_DetailMeasures.Any())
                             {
@@ -13504,6 +13507,7 @@ namespace APT.BaseData.Services.DomainServices
                                     detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
                                     detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                                     detail.EMERGENCY = item.EMERGENCY;
+                                    detail.MARK = item.MARK;
                                     douDetails.Add(detail);
                                     var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
                                     if (libraryFirst != null)
@@ -13771,6 +13775,7 @@ namespace APT.BaseData.Services.DomainServices
                         detail.EVALUATE_SCORE = item.EVALUATE_SCORE;
                         detail.EVALUATE_LEVEL = item.EVALUATE_LEVEL;
                         detail.EMERGENCY = item.EMERGENCY;
+                        detail.MARK = item.MARK;
                         details.Add(detail);
                         var libraryFirst = librarys.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION && t.TYPE_ID == item.TYPE_ID);
                         if (libraryFirst != null)

APT.Data.Migrations/Migrations/20251009075846_hmr2025100901.cs

@@ -0,0 +1,46 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace APT.Data.Migrations.Migrations
+{
+    public partial class hmr2025100901 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "MARK",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "MARK",
+                table: "T_SK_RISK_EVALUATION_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.AddColumn<int>(
+                name: "MARK",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "MARK",
+                table: "T_SK_RISK_EVALUATION_SUMMARY_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MARK",
+                table: "T_SK_RISK_EVALUATION_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MARK",
+                table: "T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL");
+        }
+    }
+}

APT.Data.Migrations/Migrations/MigrationContextModelSnapshot.cs

@@ -73571,6 +73571,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
+                    b.Property<int>("MARK")
+                        .HasColumnType("int");
+
                     b.Property<Guid?>("MODIFIER_ID")
                         .HasColumnType("uniqueidentifier");
 
@@ -79002,6 +79005,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
+                    b.Property<int>("MARK")
+                        .HasColumnType("int");
+
                     b.Property<string>("MEASURE")
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");
@@ -79471,6 +79477,9 @@ namespace APT.Data.Migrations.Migrations
                     b.Property<bool>("IS_DELETED")
                         .HasColumnType("bit");
 
+                    b.Property<int>("MARK")
+                        .HasColumnType("int");
+
                     b.Property<string>("MEASURE")
                         .HasMaxLength(500)
                         .HasColumnType("nvarchar(500)");

APT.MS.Domain/Entities/SK/T_SK_DOUBLE_PREVENT_MECHANISM_DETAIL.cs

@@ -144,6 +144,12 @@ namespace APT.MS.Domain.Entities.SK
         public Guid? SCOREC_ID { get; set; }
 
         [Description("导航属性：分值C")]
-        public T_SK_SCOREC Nav_SCOREC { get; set; }
+        public T_SK_SCOREC Nav_SCOREC { get; set; }
+
+        /// <summary>
+        /// 标识
+        /// </summary>
+        [Description("标识")]
+        public SKMarkEnum MARK { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_DETAIL.cs

@@ -149,6 +149,12 @@ namespace APT.MS.Domain.Entities.SK
         public Guid? SCOREC_ID { get; set; }
 
         [Description("导航属性：分值C")]
-        public T_SK_SCOREC Nav_SCOREC { get; set; }
+        public T_SK_SCOREC Nav_SCOREC { get; set; }
+
+        /// <summary>
+        /// 标识
+        /// </summary>
+        [Description("标识")]
+        public SKMarkEnum MARK { get; set; }
     }
 }

APT.MS.Domain/Entities/SK/T_SK_RISK_EVALUATION_SUMMARY_DETAIL.cs

@@ -150,6 +150,12 @@ namespace APT.MS.Domain.Entities.SK
         public Guid? SCOREC_ID { get; set; }
 
         [Description("导航属性：分值C")]
-        public T_SK_SCOREC Nav_SCOREC { get; set; }
+        public T_SK_SCOREC Nav_SCOREC { get; set; }
+
+        /// <summary>
+        /// 标识
+        /// </summary>
+        [Description("标识")]
+        public SKMarkEnum MARK { get; set; }
     }
 }

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

@@ -67,7 +67,23 @@ namespace APT.SK.WebApi.Controllers.Api
                     deleteDetailIds = record.Nav_Details.Select(t => t.ID).ToList();
                     deleteMeasureIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_MEASURE>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
                     deleteDepartIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_DEPART>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
-                    deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
+                    deletePostIds = this.GetEntities<T_SK_RISK_EVALUATION_DETAIL_POST>(t => deleteDetailIds.Contains(t.RISK_EVALUATION_DETAIL_ID), new BaseFilter(entity.ORG_ID)).Select(t => t.ID).ToList();
+                    foreach (var item in details)
+                    {
+                        var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
+                        if (temp == null)
+                        {
+                            item.MARK = SKMarkEnum.Add;
+                        }
+                        else
+                        {
+                            if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
+                                 || temp.EMERGENCY != item.EMERGENCY))
+                            {
+                                item.MARK = SKMarkEnum.Update;
+                            }
+                        }
+                    }
                     //record.Nav_Details.ForEach(t =>
                     //{
                     //    if (t.Nav_DetailMeasures != null && t.Nav_DetailMeasures.Any())

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

@@ -74,14 +74,14 @@ namespace APT.SK.WebApi.Controllers.Api
                     //});
                     foreach (var item in details)
                     {
-                        var temp = record.Nav_Details.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
+                        var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
                         if (temp == null)
                         {
                             item.MARK = SKMarkEnum.Add;
                         }
                         else
                         {
-                            if (temp.MineType == item.MineType && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
+                            if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
                                  || temp.EMERGENCY != item.EMERGENCY))
                             {
                                 item.MARK = SKMarkEnum.Update;

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

@@ -89,14 +89,14 @@ namespace APT.SK.WebApi.Controllers.Api
                     //});
                     foreach (var item in details)
                     {
-                        var temp = record.Nav_Details.FirstOrDefault(t => t.MineType == item.MineType && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
+                        var temp = record.Nav_Details.FirstOrDefault(t => t.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && t.AREA_ID == item.AREA_ID && t.TYPE_ID == item.TYPE_ID && t.RISK_NAME == item.RISK_NAME && t.RISK_DESCRIPTION == item.RISK_DESCRIPTION);
                         if (temp == null)
                         {
                             item.MARK = SKMarkEnum.Add;
                         }
                         else
                         {
-                            if (temp.MineType == item.MineType && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
+                            if (temp.PRODUCTION_UNIT_ID == item.PRODUCTION_UNIT_ID && temp.AREA_ID == item.AREA_ID && temp.TYPE_ID == item.TYPE_ID && temp.RISK_NAME != item.RISK_NAME && temp.RISK_DESCRIPTION != item.RISK_DESCRIPTION && (temp.MEASURE != item.MEASURE
                                  || temp.EMERGENCY != item.EMERGENCY || temp.DEPARTMENT_TYPE != item.DEPARTMENT_TYPE || temp.IDENTIFY_DEPARTMENT != item.IDENTIFY_DEPARTMENT || temp.IDENTIFY_POST != item.IDENTIFY_POST))
                             {
                                 item.MARK = SKMarkEnum.Update;