From 43a7e28feee097d74dc626d6af545de552bc4655 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 19 Jan 2024 10:17:39 +0800
Subject: [PATCH] =?UTF-8?q?Ota=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E5=B8=A6=E5=8C=B9=E9=85=8D--=E5=8E=BB=E6=8E=89VDR=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E4=B8=BADiscard=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/jero/modules/ota/enums/OtaHomoImpactEnum.java  | 6 ++----
 .../jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml  | 2 +-
 .../ota/service/impl/OtaManageApplyEOServiceImpl.java       | 3 ++-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaHomoImpactEnum.java b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaHomoImpactEnum.java
index 5062ae15f..7bfabd978 100644
--- a/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaHomoImpactEnum.java
+++ b/jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/enums/OtaHomoImpactEnum.java
@@ -1,14 +1,12 @@
 package com.jero.modules.ota.enums;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public enum OtaHomoImpactEnum {
 
     YES("Yes", "Yes"),
     INTER_VALID("Internal Validation", "Internal Validation"),
     HOMOEX_RETEST("Homo Extension - Retest", "Homo Extension - Retest"),
-    HOMOEX_PAPERWORK("Homo Extension - Paperwork", "Homo Extension - Paperwork");
+    HOMOEX_PAPERWORK("Homo Extension - Paperwork", "Homo Extension - Paperwork"),
+    STATUS("Discard", "Discard");
 
     String name;
     String value;
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 22598e9ab..f3a4e8824 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
@@ -132,7 +132,7 @@
             <if test="otaManageApplyEO.homologation != null and otaManageApplyEO.homologation != ''">
                 and omr.homologation LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.homologation}),'%')
             </if>
-            and omr.is_del is null
+            and omr.is_del is null and omr.status !='Discard'
         </where>
         order by omr.id desc
     </select>
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 040434b6e..0c42935e7 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
@@ -905,7 +905,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
                     manageApplyEO.setDisabled(true);
                 }
                 if ((StringUtils.isNotBlank(manageApplyEO.getIsDel()) && manageApplyEO.getIsDel().equals("1"))
-                        || (StringUtils.isNotBlank(manageApplyEO.getStatus()) && manageApplyEO.getStatus().equals("Discard"))) {
+                        || (StringUtils.isNotBlank(manageApplyEO.getStatus()) && manageApplyEO.getStatus().equals(OtaHomoImpactEnum.STATUS.getValue()))) {
                     manageApplyEO.setDiscard(true);
                     manageApplyEO.setDisabled(true);
                 }
@@ -2188,6 +2188,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
         }
         LambdaQueryWrapper<OtaManageReceive> wrapper = new LambdaQueryWrapper<>();
         wrapper.isNull(OtaManageReceive::getIsDel);
+        wrapper.ne(OtaManageReceive::getStatus,OtaHomoImpactEnum.STATUS.getValue());
         List<OtaManageReceive> otaManageReceiveList = otaManageReceiveService.list(wrapper);
         List<String> plannedBpLaunchBatchList = new ArrayList<>();
         List<OtaManageApplyEO> otaManageApplyEOList = new ArrayList<>();