修改OTA版本号字段

This commit is contained in:
高嵩
2023-08-24 10:48:17 +08:00
parent 381525e808
commit f5c068f72e
2 changed files with 9 additions and 5 deletions
@@ -89,16 +89,20 @@ public class OtaManageApplyEO implements Serializable {
@ApiModelProperty(value = "备注")
private java.lang.String remark;
/**适用车型*/
@Excel(name = "适用车型", width = 15)
@ApiModelProperty(value = "适用车型")
private java.lang.String appliedVehicleProject;
private java.lang.String vehicleType;
//--------------------------------------------------------
@TableField(exist = false)
@ApiModelProperty(value = "软件版本")
private java.lang.String plannedBpLaunchBatch;
@TableField(exist = false)
@ApiModelProperty(value = "适用车型")
private java.lang.String appliedVehicleProject;
@TableField(exist = false)
@@ -1114,9 +1114,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
|| oma.getMatchStatus().equals(OtaStatusEnum.NA.getKey()))) {
//状态不对
if (CutEnum.CN.getValue().equals(cut)) {
msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_MATCHED.getNameCN() + "" + OtaStatusEnum.REJECTED.getNameCN() + "");
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() + "");
msgList.add("VDR:" + oma.getVdr() + " The state must be" + OtaStatusEnum.TO_BE_MATCHED.getNameEN() + " or " + OtaStatusEnum.REJECTED.getNameEN() + "");
}
} else {
oma.setMatchStatus(OtaStatusEnum.TO_BE_APPROVED.getKey());