From 1c3660df910c69323d8bcd981c81f9726f7f82f3 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Thu, 8 Jul 2021 16:52:56 +0800
Subject: [PATCH] =?UTF-8?q?/data/stats/screencoll/pioneerdata=E5=85=88?=
 =?UTF-8?q?=E9=94=8B=E6=A8=A1=E8=8C=83=E9=87=87=E9=9B=86=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=86=E6=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screencoll/form/PioneerDataFormDTO.java   | 25 +++++++++++++++++++
 .../impl/ShiBeiScreenCollServiceImpl.java     |  2 +-
 .../screen/ScreenPioneerDataDao.xml           | 14 +++++++++--
 3 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
index 7e79fce0b8..2bb7b50684 100644
--- a/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
+++ b/epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/screencoll/form/PioneerDataFormDTO.java
@@ -90,4 +90,29 @@ public class PioneerDataFormDTO implements Serializable {
      * 数据更新至: yyyy|yyyyMM|yyyyMMdd(08-21新增)
      */
     private String dataEndTime;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platIssueTotal
+     */
+    private Integer issueRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platTopicTotal
+     */
+    private Integer topicRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platShiftProjectTotal
+     */
+    private Integer shiftProjectRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platClosedProjectTotal
+     */
+    private Integer resolvedProjectRatioFm;
+
+    /**
+     * V2升级新增字段, 详见说明文档,对应 platPublishIssueTotal
+     */
+    private Integer publishIssueRatioFm;
 }
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
index 28532046fb..5bb05989fe 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/screen/impl/ShiBeiScreenCollServiceImpl.java
@@ -547,7 +547,7 @@ public class ShiBeiScreenCollServiceImpl implements ShiBeiScreenCollService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void insertPioneerData(PioneerDataListFormDTO formDTO, String customerId) {
-        if (formDTO.getIsFirst()) {
+        if (formDTO.getIsFirst() && !CollectionUtils.isEmpty(formDTO.getDataList())) {
             int deleteNum;
             do {
                 deleteNum = screenPioneerDataDao.deletePioneerDataByCustomerId(customerId, IndexCalConstant.DELETE_SIZE);
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml
index 8f5191fa0e..f232941996 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenPioneerDataDao.xml
@@ -51,7 +51,12 @@
         CREATED_TIME,
         UPDATED_BY,
         UPDATED_TIME,
-        DATA_END_TIME
+        DATA_END_TIME,
+        PLAT_ISSUE_TOTAL,
+        PLAT_TOPIC_TOTAL,
+        PLAT_SHIFT_PROJECT_TOTAL,
+        PLAT_CLOSED_PROJECT_TOTAL,
+        PLAT_PUBLISH_ISSUE_TOTAL
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -78,7 +83,12 @@
             now(),
             'APP_USER',
             now(),
-            #{item.dataEndTime}
+            #{item.dataEndTime},
+            #{item.issueRatioFm},
+            #{item.topicRatioFm},
+            #{item.shiftProjectRatioFm},
+            #{item.resolvedProjectRatioFm},
+            #{item.publishIssueRatioFm}
             )
         </foreach>
     </insert>