Merge remote-tracking branch 'origin/dev_screen_data' into dev_screen_data

epmet-module/data-report/data-report-client/src/main/java/com/epmet/screen/dto/result/ContactMassLineChartResultDTO.java

@@ -1,5 +1,6 @@
 package com.epmet.screen.dto.result;
 
+import com.epmet.commons.tools.constant.NumConstant;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -28,4 +29,14 @@ public class ContactMassLineChartResultDTO implements Serializable {
      * 群成员数
      */
     private List<Integer> groupMemberData;
+
+    /**
+     * 党员建群数
+     **/
+    private Integer groupTotal = NumConstant.ZERO;
+
+    /**
+     * 党成员数
+     * */
+    private Integer groupMemberTotal = NumConstant.ZERO;
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/screen/impl/PartyMemberLeadServiceImpl.java

@@ -110,6 +110,8 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         result.setXAxis(xAxis);
         result.setGroupData(groupData);
         result.setGroupMemberData(groupMemberData);
+        result.setGroupTotal(groupData.stream().mapToInt(Integer :: intValue).sum());
+        result.setGroupMemberTotal(groupMemberData.stream().mapToInt(Integer :: intValue).sum());
         return result;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/indexcal/impl/CpcIndexCalculateServiceImpl.java

@@ -240,7 +240,7 @@ public class CpcIndexCalculateServiceImpl implements CpcIndexCalculateService {
                     ScoreConstants.MAX_SCORE,
                     Correlation.getCorrelation(index.getCorrelation())
             );
-            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(),new ArrayList<SampleValue<BigDecimal>>(),index.getWeight(),index.getThreshold(),scoreCalculator);
+            IndexInputVO indexInputVO = new IndexInputVO(index.getIndexCode(),new ArrayList<>(),index.getThreshold(),index.getWeight(),scoreCalculator);
             map.put(index.getIndexCode(), indexInputVO);
         }
         return map;