From b879b3f2c77681560ee2f773d7b58a29a0d4438c Mon Sep 17 00:00:00 2001
From: hang <872297557@qq.com>
Date: Tue, 8 Apr 2025 15:20:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/DTO/InternationalizationViewModel.cs     |  2 ++
 .../Service/Common/InternationalizationService.cs   |  1 +
 .../Service/QC/QCOperationService.cs                | 13 +++++++++----
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
index bbf5a5f0c..12b4ea356 100644
--- a/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
+++ b/IRaCIS.Core.Application/Service/Common/DTO/InternationalizationViewModel.cs
@@ -96,6 +96,8 @@ namespace IRaCIS.Core.Application.ViewModel
 
         public int State { get; set; }
 
+        public Guid? PublishLogId { get; set; }
+
         public List<BatchAddInternationalizationDto> AddList { get; set; }
     }
 
diff --git a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
index 3508c9c51..47a1d9a5a 100644
--- a/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
+++ b/IRaCIS.Core.Application/Service/Common/InternationalizationService.cs
@@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service
 
                 mapItem.InternationalizationType = batchAdd.InternationalizationType;
                 mapItem.State = batchAdd.State;
+                mapItem.PublishLogId = batchAdd.PublishLogId;
 
                 var verifyExp1 = new EntityVerifyExp<Internationalization>()
                 {
diff --git a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
index dafbfa638..97381a15a 100644
--- a/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
+++ b/IRaCIS.Core.Application/Service/QC/QCOperationService.cs
@@ -288,19 +288,24 @@ namespace IRaCIS.Core.Application.Image.QA
 
             if (sv.ImageBackState != ImageBackStateEnum.CRCRequestBack && sv.ImageBackState != ImageBackStateEnum.IQCRequestBack)
             {
-                //当前访视状态不在影像回退状态，不允许审核通过
+                //当前访视状态不在影像申请回退状态，不允许审核通过
                 throw new BusinessValidationFailedException(_localizer["QCOperation_NotInRequestImageBackState"]);
             }
             if (isAgree)
             {
 
-                if (sv.CheckState < CheckStateEnum.CVPassed)
+                if (sv.SubmitState == SubmitStateEnum.Submitted && sv.CheckState < CheckStateEnum.CVPassed)
                 {
-                    //一致性核查通过前才允许进行回退
+                    sv.ImageBackState = ImageBackStateEnum.PMAgreeBack;
+
+                   
+                }
+                else
+                {
+                    //一致性核查通过前已提交的影像才允许进行回退
                     throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]);
                 }
 
-                sv.ImageBackState = ImageBackStateEnum.PMAgreeBack;
 
                 #region 回退处理
                 //需要重新产生任务