From ce3ebbbd9a4f1993dd76b71f89b765d46d123c9d Mon Sep 17 00:00:00 2001
From: PoffyZhang <99775271@qq.com>
Date: Mon, 13 Nov 2023 11:20:56 +0800
Subject: [PATCH] =?UTF-8?q?PDF=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ningdatech/pmapi/dashboard/model/entity/CockpitStats.java |  5 +++++
 .../pmapi/gov/manage/GovProjectCollectionManage.java          | 11 ++++++-----
 .../pmapi/scheduler/task/CockpitStatsStatisticsTask.java      |  3 ++-
 3 files changed, 13 insertions(+), 6 deletions(-)

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 8cad88a..0fe20bc 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
@@ -214,6 +214,8 @@ public class CockpitStats implements Serializable {
     private Integer produceComponentNum = 0;
     @ApiModelProperty("产出-大脑要素")
     private Integer produceBrainElementsNum = 0;
+    @ApiModelProperty("产出-大脑要素 模型数")
+    private Integer produceBrainModelNum = 0;
 
     @ApiModelProperty("绩效-项目总数量")
     private Integer performanceTotal = 0;
@@ -254,4 +256,7 @@ public class CockpitStats implements Serializable {
     @ApiModelProperty("绩效-top5名称")
     private String performanceTop5Name;
 
+    @ApiModelProperty("数据质量")
+    private BigDecimal dataQuality;
+
 }
\ No newline at end of file
diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
index 3dbfa73..3ead517 100644
--- a/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
+++ b/pmapi/src/main/java/com/ningdatech/pmapi/gov/manage/GovProjectCollectionManage.java
@@ -1707,15 +1707,16 @@ public class GovProjectCollectionManage {
             log.error("转换PDF文件出错" + e);
         }
 
-        if(Objects.isNull(oldFiled)){
-            return Boolean.FALSE;
+        if(StringUtils.isBlank(oldFiled)){
+            return Boolean.TRUE;
         }
 
-        if(!oldFiled.equals(field)){
-            return Boolean.TRUE;
+        //如果一模一样 就不用上传了
+        if(oldFiled.equals(field)){
+            return Boolean.FALSE;
         }
 
-        return Boolean.FALSE;
+        return Boolean.TRUE;
     }
 
     /**
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 9697ea0..2fde720 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
@@ -649,7 +649,8 @@ public class CockpitStatsStatisticsTask {
             return transactionAmount.doubleValue();
         }).sum();
         Double approvalAmountContractGov = procures.stream().mapToDouble(p -> {
-            BigDecimal purchaseAmount = Objects.nonNull(p.getBaseProjPurchaseAmount()) ? p.getBaseProjPurchaseAmount() : BigDecimal.ZERO;
+            BigDecimal purchaseAmount = Objects.nonNull(p.getBaseProjPurchaseAmount()) ?
+                    p.getBaseProjPurchaseAmount() : BigDecimal.ZERO;
             return purchaseAmount.doubleValue();
         }).sum();
         BigDecimal approvalAmountContractTotal = BigDecimal.valueOf(approvalAmountContract).add(BigDecimal.valueOf(approvalAmountContractGov));