XCKJ
/
irc-netcore-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加适用的标准
continuous-integration/drone/push Build is failing Details

Test_IRC_Net8
he 2025-09-01 17:28:16 +08:00
parent 7880836f39
commit 5197e49c1f
8 changed files with 19131 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IRaCIS.Core.Application/IRaCIS.Core.Application.xml
View File

@ -2464,9 +2464,9 @@
</summary>
<typeparam name="T">泛型</typeparam>
</member>
<member name="T:IRaCIS.Core.Application.Service.Inspection.DTO.TrialDocumentConfirmDTO">
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.CriterionType">
<summary>
用户 签名某个文档 Dto
标准枚举
</summary>
</member>
<member name="P:IRaCIS.Core.Application.Service.Inspection.DTO.GetDataInspectionOutDto.ParentIdentification">
@ -15283,9 +15283,9 @@
<member name="T:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit">
<summary> FrontAuditConfigAddOrEdit 列表查询参数模型</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.IsDefaultChoice">
<member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.ApplyCriterionList">
<summary>
是否默认选择
适用的标准
</summary>
</member>
<member name="P:IRaCIS.Core.Application.ViewModel.FrontAuditConfigAddOrEdit.CodeEn">

6
IRaCIS.Core.Application/Service/Common/DTO/FrontAuditConfigViewModel.cs
View File

@ -159,6 +159,12 @@ namespace IRaCIS.Core.Application.ViewModel
public class FrontAuditConfigAddOrEdit
{
public Guid? Id { get; set; }
/// <summary>
/// 适用的标准
/// </summary>
public List<CriterionType> ApplyCriterionList { get; set; } = new List<CriterionType>() { };
public string Value { get; set; } = string.Empty;
public string ValueCN { get; set; } = string.Empty;
public string Description { get; set; } = string.Empty;

5
IRaCIS.Core.Application/Service/Inspection/DTO/InspectionModel.cs
View File

@ -372,7 +372,10 @@ namespace IRaCIS.Core.Application.Service.Inspection.DTO
public string ModuleTypeName { get; set; } = string.Empty;
public string ModuleTypeNameCN { get; set; } = string.Empty;
/// <summary>
/// 标准枚举
/// </summary>
public CriterionType? CriterionType { get; set; }
public string SignText { get; set; } = string.Empty;
public decimal? VisitNum { get; set; }

5
IRaCIS.Core.Application/Service/Inspection/InspectionService.cs
View File

@ -14,6 +14,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
public class InspectionService(IRepository<DataInspection> _dataInspectionRepository,
IRepository<Dictionary> _dictionaryRepository,
IRepository<TrialSign> _trialSignRepository,
IRepository<ReadingQuestionCriterionTrial> _readingQuestionCriterionTrialRepository,
IRepository<IdentityUser> _identityUserRepository,
IRepository<TrialAuditShow> _trialAuditShowRepository,
IRepository<UserRole> _userRoleRepository,
@ -102,6 +103,9 @@ namespace IRaCIS.Core.Application.Service.Inspection
join trial in _trialRepository.Where().IgnoreQueryFilters() on data.TrialId equals trial.Id into trialtemp
from leftrial in trialtemp.DefaultIfEmpty()
join readingQuestionCriterionTrial in _readingQuestionCriterionTrialRepository.Where().IgnoreQueryFilters() on data.TrialReadingCriterionId equals readingQuestionCriterionTrial.Id into readingQuestionCriterionTrialtemp
from leftreadingQuestionCriterionTrial in readingQuestionCriterionTrialtemp.DefaultIfEmpty()
join trialSite in _trialSiteRepository.Where().IgnoreQueryFilters() on data.TrialSiteId equals trialSite.Id into trialSitetemp
from lefttrialSite in trialSitetemp.DefaultIfEmpty()
@ -136,6 +140,7 @@ namespace IRaCIS.Core.Application.Service.Inspection
{
IsShow = lefttrialShow != null ? lefttrialShow.IsShow : leftfrontAuditConfig.IsDefaultChoice,
CreateTime = data.CreateTime,
CriterionType= leftreadingQuestionCriterionTrial==null? null: leftreadingQuestionCriterionTrial.CriterionType,
CreateUserId = data.CreateUserId,
ModuleTypeId = leftmoduleTypec.Id,
BlindName = data.VisitTask.TaskBlindName,

7
IRaCIS.Core.Domain/Common/FrontAuditConfig.cs
View File

@ -1,3 +1,5 @@
using IRaCIS.Core.Domain.Share;
namespace IRaCIS.Core.Domain.Models;
[Comment("稽查 - 配置表 （需要同步）")]
@ -120,6 +122,11 @@ public class FrontAuditConfig : BaseFullAuditEntity
public string ValueCN { get; set; } = null!;
/// <summary>
/// 适用的标准
/// </summary>
public List<CriterionType> ApplyCriterionList { get; set; } = new List<CriterionType>() { };
/// <summary>
/// 是否默认选择
/// </summary>

19072
IRaCIS.Core.Infra.EFCore/Migrations/20250901092654_CriterionType.Designer.cs generated Normal file
View File

File diff suppressed because it is too large Load Diff

29
IRaCIS.Core.Infra.EFCore/Migrations/20250901092654_CriterionType.cs Normal file
View File

@ -0,0 +1,29 @@
using Microsoft.EntityFrameworkCore.Migrations;
#nullable disable
namespace IRaCIS.Core.Infra.EFCore.Migrations
{
/// <inheritdoc />
public partial class CriterionType : Migration
{
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.AddColumn<string>(
name: "ApplyCriterionList",
table: "FrontAuditConfig",
type: "nvarchar(max)",
nullable: false,
defaultValue: "[]");
}
/// <inheritdoc />
protected override void Down(MigrationBuilder migrationBuilder)
{
migrationBuilder.DropColumn(
name: "ApplyCriterionList",
table: "FrontAuditConfig");
}
}
}

4
IRaCIS.Core.Infra.EFCore/Migrations/IRaCISDBContextModelSnapshot.cs
View File

@ -2719,6 +2719,10 @@ namespace IRaCIS.Core.Infra.EFCore.Migrations
b.Property<Guid>("Id")
.HasColumnType("uniqueidentifier");
b.Property<string>("ApplyCriterionList")
.IsRequired()
.HasColumnType("nvarchar(max)");
b.Property<string>("ChildDataEnLabel")
.IsRequired()
.HasMaxLength(400)