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 @@ and omr.homologation LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.homologation}),'%') - and omr.is_del is null + and omr.is_del is null and omr.status !='Discard' 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 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 wrapper = new LambdaQueryWrapper<>(); wrapper.isNull(OtaManageReceive::getIsDel); + wrapper.ne(OtaManageReceive::getStatus,OtaHomoImpactEnum.STATUS.getValue()); List otaManageReceiveList = otaManageReceiveService.list(wrapper); List plannedBpLaunchBatchList = new ArrayList<>(); List otaManageApplyEOList = new ArrayList<>();