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

Ota状态统计

Browse Source
This commit is contained in:
zhn
2024-01-19 11:37:23 +08:00
parent 43a7e28fee
commit 8ada4a6777
1 changed files with 39 additions and 9 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/service/impl/OtaManageApplyEOServiceImpl.java
+39 -9
View File
@@ -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<>();