Ota状态统计

This commit is contained in:
zhn
2024-01-19 11:37:23 +08:00
parent 43a7e28fee
commit 8ada4a6777
@@ -2307,23 +2307,53 @@ public class OtaManageApplyEOServiceImpl extends ServiceImpl<OtaManageApplyEOMap
// else { // else {
// toBeMatched++; // 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++; 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++; 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++; 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++; 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++; 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++; 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++; stored++;
} else {
notStart++;
} }
// else {
// notStart++;
// }
} }
Map<String, Object> statisticalMap = new HashMap<>(); Map<String, Object> statisticalMap = new HashMap<>();