From c3fcdb8282b4d1aaeef97a7bd9a4efb9d5a8a099 Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Tue, 14 Nov 2023 15:57:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A9=BE=E9=A9=B6=E8=88=B1=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=20=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pmapi/dashboard/enums/CockpitAppcationTypeEnum.java           | 2 +-
 .../com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java | 5 +++--
 .../ningdatech/pmapi/dashboard/model/dto/CockpitStatsSaveDTO.java | 8 ++++----
 .../com/ningdatech/pmapi/dashboard/model/entity/CockpitStats.java | 2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/enums/CockpitAppcationTypeEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/enums/CockpitAppcationTypeEnum.java
index 9665314..a06f080 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/enums/CockpitAppcationTypeEnum.java
+++ b/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;
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java
index 0f90335..76a180d 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/manage/CockpitStatsManage.java
+++ b/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);
             }
         }
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/dto/CockpitStatsSaveDTO.java b/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/dto/CockpitStatsSaveDTO.java
index 9f40b0e..9bf5fbd 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/dashboard/model/dto/CockpitStatsSaveDTO.java
+++ b/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;
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 f387ca8..2b8f96e 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
@@ -176,7 +176,7 @@ public class CockpitStats implements Serializable {
     @ApiModelProperty("优秀项目-跨域共享数")
     private Integer excellentCrossDomainSharingNum;
 
-    @ApiModelProperty("优秀项目-跨域共享数")
+    @ApiModelProperty("优秀项目-提级共享数")
     private Integer excellentCrossLevelSharingNum;
 
     @ApiModelProperty("核减资金")