WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改VDR报错信息

Browse Source
This commit is contained in:
高嵩
2023-09-06 15:50:30 +08:00
parent 45016a1736
commit a6518f5a8e
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+17 -8
View File
@@ -1590,16 +1590,25 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
boolean isChanged = false; boolean isChanged = false;
if (StringUtils.isNotEmpty(projectVersion)) { if (StringUtils.isNotEmpty(projectVersion)) {
if (isStudio) { if (isStudio) {
if (StringUtils.isEmpty(oma.getMatchStatus()) if(OtaHomoImpactEnum.YES.getValue().equals(oma.getHomologationImpact())
|| oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey()) ||OtaHomoImpactEnum.INTER_VALID.getValue().equals(oma.getHomologationImpact())){
|| oma.getMatchStatus().equals(OtaStatusEnum.REJECTED.getKey())) {
isChanged = true;
oma.setProjectVersion(projectVersion);
} else {
if (CutEnum.CN.getValue().equals(cut)) { 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 { } 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 { } else {