diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java index 6d8e44c..0b6530b 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java @@ -55,67 +55,67 @@ public class CockpitStats implements Serializable { private BigDecimal monitorDeclaredAmount; @ApiModelProperty("项目监控-等保1级数量") - private Integer monitorSecrecyGrade1Num; + private Integer monitorSecrecyGrade1Num = 0; @ApiModelProperty("项目监控-等保2级数量") - private Integer monitorSecrecyGrade2Num; + private Integer monitorSecrecyGrade2Num = 0; @ApiModelProperty("项目监控-等保3级数量") - private Integer monitorSecrecyGrade3Num; + private Integer monitorSecrecyGrade3Num = 0; @ApiModelProperty("项目监控-等保4级数量") - private Integer monitorSecrecyGrade4Num; + private Integer monitorSecrecyGrade4Num = 0; @ApiModelProperty("项目监控-等保5级数量") - private Integer monitorSecrecyGrade5Num; + private Integer monitorSecrecyGrade5Num = 0; @ApiModelProperty("项目监控-密评1级数量") - private Integer monitorPasswordGrade1Num; + private Integer monitorPasswordGrade1Num = 0; @ApiModelProperty("项目监控-密评2级数量") - private Integer monitorPasswordGrade2Num; + private Integer monitorPasswordGrade2Num = 0; @ApiModelProperty("项目监控-密评3级数量") - private Integer monitorPasswordGrade3Num; + private Integer monitorPasswordGrade3Num = 0; @ApiModelProperty("项目监控-密评4级数量") - private Integer monitorPasswordGrade4Num; + private Integer monitorPasswordGrade4Num = 0; @ApiModelProperty("项目监控-密评5级数量") - private Integer monitorPasswordGrade5Num; + private Integer monitorPasswordGrade5Num = 0; @ApiModelProperty("专家-总人数") - private Integer expertTotalNum; + private Integer expertTotalNum = 0; @ApiModelProperty("专家-方案合理性") - private Integer expertPlanRationalityNum; + private Integer expertPlanRationalityNum = 0; @ApiModelProperty("专家-计数可行性评估") - private Integer expertTechnicalFeasibilityAssessmentNum; + private Integer expertTechnicalFeasibilityAssessmentNum = 0; @ApiModelProperty("专家-信创") - private Integer expertXinchuangNum; + private Integer expertXinchuangNum = 0; @ApiModelProperty("专家-软硬件核价") - private Integer expertSoftHardPricingNum; + private Integer expertSoftHardPricingNum = 0; @ApiModelProperty("专家-党政信息") - private Integer expertPartyGovInfoNum; + private Integer expertPartyGovInfoNum = 0; @ApiModelProperty("专家-网络安全") - private Integer expertNetworkSecurityNum; + private Integer expertNetworkSecurityNum = 0; @ApiModelProperty("专家-信息化专家") - private Integer expertPromotionInfoTechnologyNum; + private Integer expertPromotionInfoTechnologyNum = 0; @ApiModelProperty("专家-财务专家") - private Integer expertFinancialNum; + private Integer expertFinancialNum = 0; @ApiModelProperty("顶部-计划项目数") - private Integer topPlanProjectsNum; + private Integer topPlanProjectsNum = 0; @ApiModelProperty("顶部-批复项目数") - private Integer topApprovalProjectsNum; + private Integer topApprovalProjectsNum = 0; @ApiModelProperty("顶部-批复金额") private BigDecimal topApprovalProjectsAmount; @@ -193,49 +193,49 @@ public class CockpitStats implements Serializable { private BigDecimal differenceContract; @ApiModelProperty("产出-应用数量") - private Integer produceAppNum; + private Integer produceAppNum = 0; @ApiModelProperty("产出-数据产品") - private Integer produceDataNum; + private Integer produceDataNum = 0; @ApiModelProperty("产出-组件数") - private Integer produceComponentNum; + private Integer produceComponentNum = 0; @ApiModelProperty("产出-大脑要素") - private Integer produceBrainElementsNum; + private Integer produceBrainElementsNum = 0; @ApiModelProperty("绩效-项目总数量") - private Integer performanceTotal; + private Integer performanceTotal = 0; @ApiModelProperty("绩效-未评价数量") - private Integer performanceTobeReviewTotal; + private Integer performanceTobeReviewTotal = 0; @ApiModelProperty("绩效-已评价数量") - private Integer performanceReviewedTotal; + private Integer performanceReviewedTotal = 0; @ApiModelProperty("绩效-top1分数") - private BigDecimal performanceTop1Score; + private BigDecimal performanceTop1Score = BigDecimal.ZERO; @ApiModelProperty("绩效-top1名称") private String performanceTop1Name; @ApiModelProperty("绩效-top2分数") - private BigDecimal performanceTop2Score; + private BigDecimal performanceTop2Score = BigDecimal.ZERO; @ApiModelProperty("绩效-top2名称") private String performanceTop2Name; @ApiModelProperty("绩效-top3分数") - private BigDecimal performanceTop3Score; + private BigDecimal performanceTop3Score = BigDecimal.ZERO; @ApiModelProperty("绩效-top3名称") private String performanceTop3Name; @ApiModelProperty("绩效-top4分数") - private BigDecimal performanceTop4Score; + private BigDecimal performanceTop4Score = BigDecimal.ZERO; @ApiModelProperty("绩效-top4名称") private String performanceTop4Name; @ApiModelProperty("绩效-top5分数") - private BigDecimal performanceTop5Score; + private BigDecimal performanceTop5Score = BigDecimal.ZERO; @ApiModelProperty("绩效-top5名称") private String performanceTop5Name; diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java index 51b6025..9e70aa2 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java @@ -201,16 +201,18 @@ public class CockpitStatsStatisticsTask { //1.8等保密评 SecrecyPasswordGradePO secrecyPasswordGradePo = cockpitStatsService.getSecrecyPasswordGrade(regionCode, year); - cockpitStats.setMonitorSecrecyGrade1Num(secrecyPasswordGradePo.getMonitorSecrecyGrade1Num()); - cockpitStats.setMonitorSecrecyGrade2Num(secrecyPasswordGradePo.getMonitorSecrecyGrade2Num()); - cockpitStats.setMonitorSecrecyGrade3Num(secrecyPasswordGradePo.getMonitorSecrecyGrade3Num()); - cockpitStats.setMonitorSecrecyGrade4Num(secrecyPasswordGradePo.getMonitorSecrecyGrade4Num()); - cockpitStats.setMonitorSecrecyGrade5Num(secrecyPasswordGradePo.getMonitorSecrecyGrade5Num()); - cockpitStats.setMonitorPasswordGrade1Num(secrecyPasswordGradePo.getMonitorPasswordGrade1Num()); - cockpitStats.setMonitorPasswordGrade2Num(secrecyPasswordGradePo.getMonitorPasswordGrade2Num()); - cockpitStats.setMonitorPasswordGrade3Num(secrecyPasswordGradePo.getMonitorPasswordGrade3Num()); - cockpitStats.setMonitorPasswordGrade4Num(secrecyPasswordGradePo.getMonitorPasswordGrade4Num()); - cockpitStats.setMonitorPasswordGrade5Num(secrecyPasswordGradePo.getMonitorPasswordGrade5Num()); + if(Objects.nonNull(secrecyPasswordGradePo)){ + cockpitStats.setMonitorSecrecyGrade1Num(secrecyPasswordGradePo.getMonitorSecrecyGrade1Num()); + cockpitStats.setMonitorSecrecyGrade2Num(secrecyPasswordGradePo.getMonitorSecrecyGrade2Num()); + cockpitStats.setMonitorSecrecyGrade3Num(secrecyPasswordGradePo.getMonitorSecrecyGrade3Num()); + cockpitStats.setMonitorSecrecyGrade4Num(secrecyPasswordGradePo.getMonitorSecrecyGrade4Num()); + cockpitStats.setMonitorSecrecyGrade5Num(secrecyPasswordGradePo.getMonitorSecrecyGrade5Num()); + cockpitStats.setMonitorPasswordGrade1Num(secrecyPasswordGradePo.getMonitorPasswordGrade1Num()); + cockpitStats.setMonitorPasswordGrade2Num(secrecyPasswordGradePo.getMonitorPasswordGrade2Num()); + cockpitStats.setMonitorPasswordGrade3Num(secrecyPasswordGradePo.getMonitorPasswordGrade3Num()); + cockpitStats.setMonitorPasswordGrade4Num(secrecyPasswordGradePo.getMonitorPasswordGrade4Num()); + cockpitStats.setMonitorPasswordGrade5Num(secrecyPasswordGradePo.getMonitorPasswordGrade5Num()); + } //2.专家统计 List experts = expertUserFullInfoService.list(Wrappers.lambdaQuery(ExpertUserFullInfo.class)