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

修改OTA批量编辑

Browse Source
This commit is contained in:
高嵩
2023-08-25 00:55:45 +08:00
parent 6d843a1532
commit 90b432a2f8
1 changed files with 4 additions and 2 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
+4 -2
View File
@@ -730,7 +730,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket()); manageApplyEO.setProjectVersionText(collect.get(0).getCar() + "-" + collect.get(0).getYearName() + "-" + collect.get(0).getMarket());
} }
} }
manageApplyEO.setDisabled(isDisabled); manageApplyEO.setDisabled(isDisabled || OtaStatusEnum.LOCKED.getKey().equals(manageApplyEO.getMatchStatus()));
if (StringUtils.isBlank(manageApplyEO.getRemark())) { if (StringUtils.isBlank(manageApplyEO.getRemark())) {
manageApplyEO.setRemark("--"); manageApplyEO.setRemark("--");
} }
@@ -1127,7 +1127,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
if (oma.getId().length() < 20) { if (oma.getId().length() < 20) {
continue; continue;
} }
saveList.add(oma);
boolean flag = false; boolean flag = false;
for (OtaManageApplyEO omaOld : omaOldList) { for (OtaManageApplyEO omaOld : omaOldList) {
if (omaOld.getId().equals(oma.getId())) { if (omaOld.getId().equals(oma.getId())) {
@@ -1142,10 +1141,12 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
conSb.append(user.getUsername()).append(" : "); conSb.append(user.getUsername()).append(" : ");
conSbEn.append(user.getUsername()).append(" : "); conSbEn.append(user.getUsername()).append(" : ");
if (!paramsEquals(oma.getProjectVersion(), omaOld.getProjectVersion())) { if (!paramsEquals(oma.getProjectVersion(), omaOld.getProjectVersion())) {
oma.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey());
conSb.append("‘项目版本’ 由 ‘").append(proNameMap.get(omaOld.getProjectVersion())).append("’ 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘."); conSb.append("‘项目版本’ 由 ‘").append(proNameMap.get(omaOld.getProjectVersion())).append("’ 改为 ‘").append(proNameMap.get(oma.getProjectVersion())).append("‘.");
conSbEn.append("‘Project Version‘ change from ‘").append(omaOld.getProjectVersionText()).append("‘ to ‘").append(oma.getProjectVersionText()).append("‘."); conSbEn.append("‘Project Version‘ change from ‘").append(omaOld.getProjectVersionText()).append("‘ to ‘").append(oma.getProjectVersionText()).append("‘.");
} }
if (!paramsEquals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule())) { if (!paramsEquals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule())) {
oma.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey());
conSb.append("’认证进度’ 由 ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getName()) conSb.append("’认证进度’ 由 ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getName())
.append("’ 改为 ’").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘."); .append("’ 改为 ’").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘.");
conSbEn.append("’Homologation Progress’ change from ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getValue()) conSbEn.append("’Homologation Progress’ change from ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getValue())
@@ -1189,6 +1190,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
hisList.add(his); hisList.add(his);
} }
} }
saveList.add(oma);
} }
if (saveList.size() > 0) { if (saveList.size() > 0) {
List<String> delList = saveList.stream() List<String> delList = saveList.stream()