From 77790a1cb2233f130647f59bee43cf440bb85b5a Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 2 Dec 2025 17:30:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialViewModel.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index 97723c2ba..aa576ffa7 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -254,6 +254,8 @@ namespace IRaCIS.Application.Contracts #region 中心调研 + public bool IsOpenEquipmentSurvey { get; set; } + public List NotShowFieldList { get; set; } = new List(); public List ModifyFiledList { get; set; } = new List(); From 80447f5c7a44c3d9be547c44e333ad57651ecd5c Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 2 Dec 2025 17:42:06 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/TrialSiteUser/DTO/TrialViewModel.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs index aa576ffa7..466bdfb8d 100644 --- a/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs +++ b/IRaCIS.Core.Application/Service/TrialSiteUser/DTO/TrialViewModel.cs @@ -254,7 +254,7 @@ namespace IRaCIS.Application.Contracts #region 中心调研 - public bool IsOpenEquipmentSurvey { get; set; } + public bool IsCloseEquipmentSurvey { get; set; } public List NotShowFieldList { get; set; } = new List(); From 6f05850fbcfce933dd34e9675523aae076cd2685 Mon Sep 17 00:00:00 2001 From: hang <872297557@qq.com> Date: Tue, 2 Dec 2025 18:04:38 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=85=A8=E9=87=8F=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E6=80=A7=E6=A0=B8=E6=9F=A5=E5=A2=9E=E5=8A=A0=E5=88=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MassTransit/Command/ConsistenCheckCommand.cs | 4 ++++ .../MassTransit/Consumer/ConsistencyCheckConsumer.cs | 2 ++ 2 files changed, 6 insertions(+) diff --git a/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs b/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs index 5f085ff13..899ce5d77 100644 --- a/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs +++ b/IRaCIS.Core.Application/MassTransit/Command/ConsistenCheckCommand.cs @@ -43,6 +43,10 @@ namespace IRaCIS.Core.Application.MassTransit.Command public DateTime CheckTime { get; set; } public string CheckResult { get; set; } + + + [DictionaryTranslateAttribute("CheckState")] + public CheckStateEnum CheckState { get; set; } } diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs index f27466de2..d3e7c50e6 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/ConsistencyCheckConsumer.cs @@ -403,6 +403,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer { SubjectStatus = dbCurrentVisitFirst.SubjectStatus, CheckTime = DateTime.Now, + CheckState=CheckStateEnum.CVPassed, SiteCode = dbCurrentVisitFirst.SiteCode, SubjectCode = dbCurrentVisitFirst.SubjectCode, VisitName = dbCurrentVisitFirst.VisitName, @@ -420,6 +421,7 @@ namespace IRaCIS.Core.Application.MassTransit.Consumer fullCheckResultList.Add(new FullCheckResult() { SubjectStatus = dbCurrentVisitFirst.SubjectStatus, + CheckState = CheckStateEnum.None, CheckTime = DateTime.Now, SiteCode = dbCurrentVisitFirst.SiteCode, SubjectCode = dbCurrentVisitFirst.SubjectCode,