/data/stats/screencoll/pioneerdata先锋模范采集接口保存分母

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;
 }

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);

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>