From 8ada4a67776b9f21ceaed79c38013aa97b7b4822 Mon Sep 17 00:00:00 2001
From: zhn <947514737@qq.com>
Date: Fri, 19 Jan 2024 11:37:23 +0800
Subject: [PATCH] =?UTF-8?q?Ota=E7=8A=B6=E6=80=81=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/OtaManageApplyEOServiceImpl.java     | 48 +++++++++++++++----
 1 file changed, 39 insertions(+), 9 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 0c42935e7..afa289171 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
@@ -2307,23 +2307,53 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
 //                    else {
 //                        toBeMatched++;
 //                    }
-                    if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) {
+//                    if (StringUtils.isBlank(oma.getAttestationSchedule()) || oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())) {
+                    if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.NOT_START.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         notStart++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.IN_PROGRESS.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                               || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         inProgress++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_PASSED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         testPassed++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.TEST_FAILED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         testFailed++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_NOT_SUBMITTED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                               || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         notSubmitted++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_SUBMITTED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         submitted++;
-                    } else if (oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())) {
+                    } else if (StringUtils.isNotBlank(oma.getAttestationSchedule())
+                            && oma.getAttestationSchedule().equals(CertificationProgressEnum.COMPONENT_REPORT_HAS_BEEN_STORED.getValue())
+                            && !OtaHomoImpactEnum.STATUS.getValue().equals(oma.getStatus())
+                            && (OtaHomoImpactEnum.HOMOEX_RETEST.getValue().equals(oma.getHomologationImpact())
+                                || OtaHomoImpactEnum.HOMOEX_PAPERWORK.getValue().equals(oma.getHomologationImpact()))) {
                         stored++;
-                    } else {
-                        notStart++;
                     }
+//                    else {
+//                        notStart++;
+//                    }
                 }
 
                 Map<String, Object> statisticalMap = new HashMap<>();