驾驶舱数据 修改接口

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/enums/CockpitAppcationTypeEnum.java

@@ -13,7 +13,7 @@ public enum CockpitAppcationTypeEnum {
     /**
      * 驾驶舱 应用类型
      */
-    OPTIMAL(1,"最优应用"),
+    OPTIMAL(1,"最佳应用"),
     MAJOR(2,"重大应用");
 
     private Integer code;

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java

@@ -1,6 +1,7 @@
 package com.ningdatech.pmapi.dashboard.manage;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.bean.copier.CopyOptions;
 import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ningdatech.pmapi.common.constant.BizConst;
@@ -67,10 +68,10 @@ public class CockpitStatsManage {
     public void save(CockpitStatsSaveDTO save) {
         List<CockpitStats> cockpitStatsList = cockpitStatsService.list(Wrappers.lambdaUpdate(CockpitStats.class)
                 .eq(Objects.nonNull(save.getRegionCode()), CockpitStats::getRegionCode, save.getRegionCode())
-                .eq(Objects.isNull(save.getYear()), CockpitStats::getYear, save.getYear()));
+                .eq(Objects.nonNull(save.getYear()), CockpitStats::getYear, save.getYear()));
         if(CollUtil.isNotEmpty(cockpitStatsList)){
             for(CockpitStats cockpitStats  : cockpitStatsList){
-                cockpitStats = BeanUtil.copyProperties(save,CockpitStats.class);
+                BeanUtil.copyProperties(save,cockpitStats, CopyOptions.create().ignoreNullValue());
                 cockpitStatsService.updateById(cockpitStats);
             }
         }

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/dto/CockpitStatsSaveDTO.java

@@ -36,7 +36,7 @@ public class CockpitStatsSaveDTO implements Serializable {
     private Integer monitorLaggingProjectsNum;
 
     @ApiModelProperty("项目监控-环节滞后项目-增长比例")
-    private String monitorLaggingProjectsRise = "0";
+    private String monitorLaggingProjectsRise;
 
     @ApiModelProperty("项目监控-预审驳回项目数")
     private Integer monitorRejectedPreReviewProjectsNum;
@@ -116,13 +116,13 @@ public class CockpitStatsSaveDTO implements Serializable {
     private Integer expertPromotionInfoTechnologyNum;
 
     @ApiModelProperty("专家-财务专家")
-    private Integer expertFinancialNum = 0;
+    private Integer expertFinancialNum;
 
     @ApiModelProperty("顶部-计划项目数")
-    private Integer topPlanProjectsNum = 0;
+    private Integer topPlanProjectsNum;
 
     @ApiModelProperty("顶部-批复项目数")
-    private Integer topApprovalProjectsNum = 0;
+    private Integer topApprovalProjectsNum ;
 
     @ApiModelProperty("顶部-批复金额")
     private BigDecimal topApprovalProjectsAmount;

pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java

@@ -176,7 +176,7 @@ public class CockpitStats implements Serializable {
     @ApiModelProperty("优秀项目-跨域共享数")
     private Integer excellentCrossDomainSharingNum;
 
-    @ApiModelProperty("优秀项目-跨域共享数")
+    @ApiModelProperty("优秀项目-提级共享数")
     private Integer excellentCrossLevelSharingNum;
 
     @ApiModelProperty("核减资金")