国际化修改
continuous-integration/drone/push Build is passing
Details
continuous-integration/drone/push Build is passing
Details
parent
4fd77ce70d
commit
b879b3f2c7
|
@ -96,6 +96,8 @@ namespace IRaCIS.Core.Application.ViewModel
|
||||||
|
|
||||||
public int State { get; set; }
|
public int State { get; set; }
|
||||||
|
|
||||||
|
public Guid? PublishLogId { get; set; }
|
||||||
|
|
||||||
public List<BatchAddInternationalizationDto> AddList { get; set; }
|
public List<BatchAddInternationalizationDto> AddList { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -143,6 +143,7 @@ namespace IRaCIS.Core.Application.Service
|
||||||
|
|
||||||
mapItem.InternationalizationType = batchAdd.InternationalizationType;
|
mapItem.InternationalizationType = batchAdd.InternationalizationType;
|
||||||
mapItem.State = batchAdd.State;
|
mapItem.State = batchAdd.State;
|
||||||
|
mapItem.PublishLogId = batchAdd.PublishLogId;
|
||||||
|
|
||||||
var verifyExp1 = new EntityVerifyExp<Internationalization>()
|
var verifyExp1 = new EntityVerifyExp<Internationalization>()
|
||||||
{
|
{
|
||||||
|
|
|
@ -288,19 +288,24 @@ namespace IRaCIS.Core.Application.Image.QA
|
||||||
|
|
||||||
if (sv.ImageBackState != ImageBackStateEnum.CRCRequestBack && sv.ImageBackState != ImageBackStateEnum.IQCRequestBack)
|
if (sv.ImageBackState != ImageBackStateEnum.CRCRequestBack && sv.ImageBackState != ImageBackStateEnum.IQCRequestBack)
|
||||||
{
|
{
|
||||||
//当前访视状态不在影像回退状态,不允许审核通过
|
//当前访视状态不在影像申请回退状态,不允许审核通过
|
||||||
throw new BusinessValidationFailedException(_localizer["QCOperation_NotInRequestImageBackState"]);
|
throw new BusinessValidationFailedException(_localizer["QCOperation_NotInRequestImageBackState"]);
|
||||||
}
|
}
|
||||||
if (isAgree)
|
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"]);
|
throw new BusinessValidationFailedException(_localizer["QCOperation_ShouldBeforeCheckPassed"]);
|
||||||
}
|
}
|
||||||
|
|
||||||
sv.ImageBackState = ImageBackStateEnum.PMAgreeBack;
|
|
||||||
|
|
||||||
#region 回退处理
|
#region 回退处理
|
||||||
//需要重新产生任务
|
//需要重新产生任务
|
||||||
|
|
Loading…
Reference in New Issue