系统文档修改

IRaCIS.Core.Application/Service/Document/DTO/SystemDocumentViewModel.cs

@@ -185,6 +185,8 @@ namespace IRaCIS.Core.Application.Contracts
 
         public int SignViewMinimumMinutes { get; set; }
 
+        public DocUserSignType DocUserSignType { get; set; }
+
     }
 
     public class AddOrEditSystemDocument : SystemDocumentAddOrEdit

IRaCIS.Core.Application/Service/Document/SystemDocumentService.cs

@@ -149,7 +149,7 @@ namespace IRaCIS.Core.Application.Services
             var query = from sysDoc in _systemDocumentRepository.Where(t => t.NeedConfirmedUserTypeList.Any(t => t.NeedConfirmUserTypeId == _userInfo.UserTypeId))
                     .WhereIf(!string.IsNullOrEmpty(inQuery.Name), t => t.Name.Contains(inQuery.Name))
                     //外部人员 只签署 文档类型枚举值有值的
-                    .WhereIf(isInternal == false, t => t.FileType.Code.Length == 0)
+                    .WhereIf(isInternal == false, t => t.DocUserSignType == DocUserSignType.InnerAndOuter)
                     .WhereIf(inQuery.FileTypeId != null, t => t.FileTypeId == inQuery.FileTypeId)
                         join confirm in _systemDocConfirmedUserRepository.Where() on new { ConfirmUserId = _userInfo.Id, SystemDocumentId = sysDoc.Id } equals new { confirm.ConfirmUserId, confirm.SystemDocumentId } into cc
                         from confirm in cc.DefaultIfEmpty()

IRaCIS.Core.Domain/Document/SystemDocument.cs

@@ -20,9 +20,17 @@ public class SystemDocument : BaseFullDeleteAuditEntity
 
     [StringLength(1000)]
     public string Path { get; set; } = string.Empty;
+
+    public DocUserSignType DocUserSignType { get; set; }
 }
 
-public enum UserSignType
+public enum DocUserSignType
 {
+    //默认 内部 外部都需要签署
+    InnerAndOuter=0,
+
+    //仅仅内部需要签署
+    OnlyInner=1,
+
 
 }

IRaCIS.Core.Infra.EFCore/Migrations/20241025070905_AddSysDocSignType.cs

@@ -0,0 +1,95 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace IRaCIS.Core.Infra.EFCore.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddSysDocSignType : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeVisitTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "在访视或者全局任务上记录  裁判任务的Id",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "裁判任务的Id");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeResultTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "在裁判任务上记录 裁判结果的任务ID（访视或者全局）",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "裁判结果的任务ID（访视或者全局）");
+
+            migrationBuilder.AddColumn<int>(
+                name: "DocUserSignType",
+                table: "SystemDocument",
+                type: "int",
+                nullable: false,
+                defaultValue: 0);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_ReadingTableQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem",
+                column: "ReadingQuestionId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_ReadingTableQuestionSystem_ReadingQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem",
+                column: "ReadingQuestionId",
+                principalTable: "ReadingQuestionSystem",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Cascade);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_ReadingTableQuestionSystem_ReadingQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropIndex(
+                name: "IX_ReadingTableQuestionSystem_ReadingQuestionId",
+                table: "ReadingTableQuestionSystem");
+
+            migrationBuilder.DropColumn(
+                name: "DocUserSignType",
+                table: "SystemDocument");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeVisitTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "裁判任务的Id",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "在访视或者全局任务上记录  裁判任务的Id");
+
+            migrationBuilder.AlterColumn<Guid>(
+                name: "JudgeResultTaskId",
+                table: "VisitTask",
+                type: "uniqueidentifier",
+                nullable: true,
+                comment: "裁判结果的任务ID（访视或者全局）",
+                oldClrType: typeof(Guid),
+                oldType: "uniqueidentifier",
+                oldNullable: true,
+                oldComment: "在裁判任务上记录 裁判结果的任务ID（访视或者全局）");
+        }
+    }
+}

IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs

@@ -6498,6 +6498,8 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.HasIndex("DependParentId");
 
+                    b.HasIndex("ReadingQuestionId");
+
                     b.ToTable("ReadingTableQuestionSystem", t =>
                         {
                             t.HasComment("系统表格问题");
@@ -9089,6 +9091,9 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Property<DateTime?>("DeletedTime")
                         .HasColumnType("datetime2");
 
+                    b.Property<int>("DocUserSignType")
+                        .HasColumnType("int");
+
                     b.Property<Guid>("FileTypeId")
                         .HasColumnType("uniqueidentifier");
 
@@ -13330,11 +13335,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Property<Guid?>("JudgeResultTaskId")
                         .HasColumnType("uniqueidentifier")
-                        .HasComment("裁判结果的任务ID（访视或者全局）");
+                        .HasComment("在裁判任务上记录 裁判结果的任务ID（访视或者全局）");
 
                     b.Property<Guid?>("JudgeVisitTaskId")
                         .HasColumnType("uniqueidentifier")
-                        .HasComment("裁判任务的Id");
+                        .HasComment("在访视或者全局任务上记录  裁判任务的Id");
 
                     b.Property<string>("PastResultTaskIds")
                         .IsRequired()
@@ -15283,7 +15288,7 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .IsRequired();
 
                     b.HasOne("IRaCIS.Core.Domain.Models.VisitTask", "VisitTask")
-                        .WithMany("LesionAnswerList")
+                        .WithMany()
                         .HasForeignKey("VisitTaskId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
@@ -15311,9 +15316,17 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                         .WithMany()
                         .HasForeignKey("DependParentId");
 
+                    b.HasOne("IRaCIS.Core.Domain.Models.ReadingQuestionSystem", "ReadingQuestionSystem")
+                        .WithMany("ReadingTableQuestionTrialList")
+                        .HasForeignKey("ReadingQuestionId")
+                        .OnDelete(DeleteBehavior.Cascade)
+                        .IsRequired();
+
                     b.Navigation("CreateUser");
 
                     b.Navigation("DependParentQuestion");
+
+                    b.Navigation("ReadingQuestionSystem");
                 });
 
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingTableQuestionTrial", b =>
@@ -17692,6 +17705,11 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
                     b.Navigation("VisitTaskList");
                 });
 
+            modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionSystem", b =>
+                {
+                    b.Navigation("ReadingTableQuestionTrialList");
+                });
+
             modelBuilder.Entity("IRaCIS.Core.Domain.Models.ReadingQuestionTrial", b =>
                 {
                     b.Navigation("ReadingTableQuestionTrialList");
@@ -17949,8 +17967,6 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
 
                     b.Navigation("JudgeVisitList");
 
-                    b.Navigation("LesionAnswerList");
-
                     b.Navigation("LesionList");
 
                     b.Navigation("ReadingTaskQuestionAnswerList");