From d5a3a967e01125fdd4aefbe0933e672104736f93 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=AB=98=E5=B5=A9?= <gaosong@syxysoft.com>
Date: Thu, 24 Aug 2023 10:36:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9OTA=E7=89=88=E6=9C=AC?=
 =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ota/mapper/xml/OtaManageApplyEOMapper.xml |  2 +-
 .../impl/OtaManageApplyEOServiceImpl.java     | 29 ++++++++++---------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
index cd0b032e9..ee351c024 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
@@ -81,7 +81,7 @@
                     and omr.impact_eu_homo LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.impactHomo}),'%'))
             </if>
             <if test="otaManageApplyEO.appliedVehicleProject != null and otaManageApplyEO.appliedVehicleProject != ''">
-                and omr.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%'
+                and omr.applied_vehicle_project LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.appliedVehicleProject}),'%')
             </if>
         </where>
         order by omr.id desc
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 2c7f8c45c..e42a67ec9 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
@@ -765,9 +765,9 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
     public List<String> getCarList(String cut) {
         List<OtaManageApplyEO> otaManageApplyEOS = this.getBaseMapper().getOtaCarList();
         List<String> result = new LinkedList<>();
-        if(CutEnum.CN.getValue().equals(cut)){
+        if (CutEnum.CN.getValue().equals(cut)) {
             result.add("全部");
-        }else{
+        } else {
             result.add("All");
         }
         if (!otaManageApplyEOS.isEmpty()) {
@@ -777,13 +777,13 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     .filter(e -> StringUtils.isNotBlank(e.getAppliedVehicleProject()))
                     .map(OtaManageApplyEO::getAppliedVehicleProject).distinct().collect(Collectors.toList());
             //过滤掉特殊的适用车型
-			List<String> otaNameList = OtaCarEnum.getOtaNameList();
+            List<String> otaNameList = OtaCarEnum.getOtaNameList();
 
             for (String appliedVehicleProject : appliedVehicleProjectList) {
                 for (String s : appliedVehicleProject.split(",")) {
                     String[] split = s.split(" ");
                     if (split.length == 2) {
-                        if(!otaNameList.contains(s)){
+                        if (!otaNameList.contains(s)) {
                             result.add(s);
                         }
                     } else if (split.length == 3) {
@@ -1105,14 +1105,15 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                 } else {
                     msgList.add("VDR:" + oma.getVdr() + " Must first select the Project Version！");
                 }
-            } else if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())
+            } else if (StringUtils.isNotEmpty(oma.getMatchStatus())
+                    && (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())
                     || oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())
-                    || oma.getMatchStatus().equals(OtaStatusEnum.NA.getKey())) {
+                    || oma.getMatchStatus().equals(OtaStatusEnum.NA.getKey()))) {
                 //状态不对
                 if (CutEnum.CN.getValue().equals(cut)) {
-                    msgList.add("VDR:" + oma.getVdr() + " 状态必须为" + OtaStatusEnum.TO_BE_APPROVED.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_APPROVED.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());
@@ -1140,7 +1141,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             conOtaCn.append(user.getUsername() + " 批量编辑了 VDR: ").append(oma.getVdr());
             conOtaEn.append(user.getUsername() + " edited VDR: ").append(oma.getVdr());
             boolean isChanged = false;
-            if (isStudio() && oma.getStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey())) {
+            if (isStudio() && (StringUtils.isEmpty(oma.getMatchStatus()) || oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_MATCHED.getKey()))) {
                 if (StringUtils.isNotEmpty(projectVersion)) {
                     isChanged = true;
                     oma.setProjectVersion(projectVersion);
@@ -1185,7 +1186,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             List<String> idList = Arrays.asList(ids.split(","));
             List<OtaManageApplyEO> omaList = this.getListByIds(idList);
             for (OtaManageApplyEO oma : omaList) {
-                if (oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) {
+                if (StringUtils.isNotEmpty(oma.getMatchStatus()) && oma.getMatchStatus().equals(OtaStatusEnum.LOCKED.getKey())) {
                     oma.setMatchStatus(OtaStatusEnum.TO_BE_APPROVED.getKey());
                     oma.setProjectVersion(projectVersion);
 
@@ -1218,7 +1219,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             List<String> idList = Arrays.asList(ids.split(","));
             List<OtaManageApplyEO> omaList = this.getListByIds(idList);
             for (OtaManageApplyEO oma : omaList) {
-                if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) {
+                if (StringUtils.isNotEmpty(oma.getMatchStatus()) && oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) {
                     oma.setMatchStatus(OtaStatusEnum.LOCKED.getKey());
                     OtaManageHistory his = new OtaManageHistory();
                     his.setApplyId(oma.getId());
@@ -1249,13 +1250,13 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
             List<String> idList = Arrays.asList(ids.split(","));
             List<OtaManageApplyEO> omaList = this.getListByIds(idList);
             for (OtaManageApplyEO oma : omaList) {
-                if (oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) {
+                if (StringUtils.isNotEmpty(oma.getMatchStatus()) && oma.getMatchStatus().equals(OtaStatusEnum.TO_BE_APPROVED.getKey())) {
                     oma.setMatchStatus(OtaStatusEnum.REJECTED.getKey());
 
                     OtaManageHistory his = new OtaManageHistory();
                     his.setApplyId(oma.getId());
-                    his.setContentCn(user.getUsername() + " 退回了 VDR:" + oma.getVdr()+" 退回原因:" + rejectReason);
-                    his.setContentEn(user.getUsername() + " returned VDR:"+ oma.getVdr()+ " Reason for return:" + rejectReason);
+                    his.setContentCn(user.getUsername() + " 退回了 VDR:" + oma.getVdr() + " 退回原因:" + rejectReason);
+                    his.setContentEn(user.getUsername() + " returned VDR:" + oma.getVdr() + " Reason for return:" + rejectReason);
                     hisList.add(his);
                 } else {
                     //状态不对