From 90b432a2f8e79c8b2bee84f6add5a0baf0bfcc12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Fri, 25 Aug 2023 00:55:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
index 1f0294c94..10d8c077e 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
@@ -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.setDisabled(isDisabled);
+                manageApplyEO.setDisabled(isDisabled || OtaStatusEnum.LOCKED.getKey().equals(manageApplyEO.getMatchStatus()));
                 if (StringUtils.isBlank(manageApplyEO.getRemark())) {
                     manageApplyEO.setRemark("--");
                 }
@@ -1127,7 +1127,6 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 if (oma.getId().length() < 20) {
                     continue;
                 }
-                saveList.add(oma);
                 boolean flag = false;
                 for (OtaManageApplyEO omaOld : omaOldList) {
                     if (omaOld.getId().equals(oma.getId())) {
@@ -1142,10 +1141,12 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                             conSb.append(user.getUsername()).append(" : ");
                             conSbEn.append(user.getUsername()).append(" : ");
                             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("‘.");
                                 conSbEn.append("‘Project Version‘ change from ‘").append(omaOld.getProjectVersionText()).append("‘ to ‘").append(oma.getProjectVersionText()).append("‘.");
                             }
                             if (!paramsEquals(oma.getAttestationSchedule(), omaOld.getAttestationSchedule())) {
+                                oma.setMatchStatus(OtaStatusEnum.TO_BE_MATCHED.getKey());
                                 conSb.append("’认证进度’ 由 ’").append(CertificationProgressEnum.getByValue(omaOld.getAttestationSchedule()).getName())
                                         .append("’ 改为 ’").append(CertificationProgressEnum.getByValue(oma.getAttestationSchedule()).getName()).append("‘.");
                                 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);
                     }
                 }
+                saveList.add(oma);
             }
             if (saveList.size() > 0) {
                 List<String> delList = saveList.stream()