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

Ota状态统计带匹配--去掉VDR状态为Discard的

Browse Source
This commit is contained in:
zhn
2024-01-19 10:17:39 +08:00
parent 8771d3d0e7
commit 43a7e28fee
3 changed files with 5 additions and 6 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/enums/OtaHomoImpactEnum.java
+2 -4
View File
@@ -1,14 +1,12 @@
package com.jero.modules.ota.enums; package com.jero.modules.ota.enums;
import java.util.ArrayList;
import java.util.List;
public enum OtaHomoImpactEnum { public enum OtaHomoImpactEnum {
YES("Yes", "Yes"), YES("Yes", "Yes"),
INTER_VALID("Internal Validation", "Internal Validation"), INTER_VALID("Internal Validation", "Internal Validation"),
HOMOEX_RETEST("Homo Extension - Retest", "Homo Extension - Retest"), 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 name;
String value; String value;
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/mapper/xml/OtaManageApplyEOMapper.xml
+1 -1
View File
@@ -132,7 +132,7 @@
<if test="otaManageApplyEO.homologation != null and otaManageApplyEO.homologation != ''"> <if test="otaManageApplyEO.homologation != null and otaManageApplyEO.homologation != ''">
and omr.homologation LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.homologation}),'%') and omr.homologation LIKE CONCAT(CONCAT('%',#{otaManageApplyEO.homologation}),'%')
</if> </if>
and omr.is_del is null and omr.is_del is null and omr.status !='Discard'
</where> </where>
order by omr.id desc order by omr.id desc
</select> </select>
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/ota/service/impl/OtaManageApplyEOServiceImpl.java
+2 -1
View File
@@ -905,7 +905,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
manageApplyEO.setDisabled(true); manageApplyEO.setDisabled(true);
} }
if ((StringUtils.isNotBlank(manageApplyEO.getIsDel()) && manageApplyEO.getIsDel().equals("1")) 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.setDiscard(true);
manageApplyEO.setDisabled(true); manageApplyEO.setDisabled(true);
} }
@@ -2188,6 +2188,7 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
} }
LambdaQueryWrapper<OtaManageReceive> wrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<OtaManageReceive> wrapper = new LambdaQueryWrapper<>();
wrapper.isNull(OtaManageReceive::getIsDel); wrapper.isNull(OtaManageReceive::getIsDel);
wrapper.ne(OtaManageReceive::getStatus,OtaHomoImpactEnum.STATUS.getValue());
List<OtaManageReceive> otaManageReceiveList = otaManageReceiveService.list(wrapper); List<OtaManageReceive> otaManageReceiveList = otaManageReceiveService.list(wrapper);
List<String> plannedBpLaunchBatchList = new ArrayList<>(); List<String> plannedBpLaunchBatchList = new ArrayList<>();
List<OtaManageApplyEO> otaManageApplyEOList = new ArrayList<>(); List<OtaManageApplyEO> otaManageApplyEOList = new ArrayList<>();