修改VDR报错信息
This commit is contained in:
+17
-8
@@ -1590,16 +1590,25 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|
||||
boolean isChanged = false;
|
||||
if (StringUtils.isNotEmpty(projectVersion)) {
|
||||
if (isStudio) {
|
||||
if (StringUtils.isEmpty(oma.getMatchStatus())
|
||||
|| oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey())
|
||||
|| oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) {
|
||||
isChanged = true;
|
||||
oma.setProjectVersion(projectVersion);
|
||||
} else {
|
||||
if(OtaHomoImpactEnum.YES.getValue().equals(oma.getHomologationImpact())
|
||||
||OtaHomoImpactEnum.INTER_VALID.getValue().equals(oma.getHomologationImpact())){
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或 " + OtaStatusEnum.REJECTED.getNameCN() + "!");
|
||||
msgList.add("VDR:" + oma.getVdr() + " 认证影响为 Internal Validation 或 Yes 的数据无需处理。");
|
||||
} else {
|
||||
msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "!");
|
||||
msgList.add("VDR:" + oma.getVdr() + " with Homologation impact of Internal Validation or Yes don't have to process.");
|
||||
}
|
||||
}else{
|
||||
if (StringUtils.isEmpty(oma.getMatchStatus())
|
||||
|| oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey())
|
||||
|| oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) {
|
||||
isChanged = true;
|
||||
oma.setProjectVersion(projectVersion);
|
||||
} else {
|
||||
if (CutEnum.CN.getValue().equals(cut)) {
|
||||
msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + " 或 " + OtaStatusEnum.REJECTED.getNameCN() + "!");
|
||||
} else {
|
||||
msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "!");
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
|
||||
Reference in New Issue
Block a user