Merge remote-tracking branch 'remotes/origin/dev'

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

@@ -78,4 +78,13 @@ public class FineExampleResultDTO implements Serializable {
      * 党员发布议题数占比
      */
     private String publishIssueRatio = "0.00%";
+
+    /**
+     * 01.12新增：PLAT_ISSUE_TOTAL 平台参与议事总数
+     */
+    private Integer platIssueTotal;
+    /**
+     * PLAT_JOIN PARTY_RATIO 平台参与议事的党员占比
+     */
+    private String platJoinPartyRatio = "0.00%";
 }

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

@@ -67,6 +67,7 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
         fineExampleResultDTO.setResolvedProjectRatio(this.getRatio(fineExampleResultDTO.getResolvedProjectRatioA()));
         fineExampleResultDTO.setTopicRatio(this.getRatio(fineExampleResultDTO.getTopicRatioA()));
         fineExampleResultDTO.setShiftProjectRatio(this.getRatio(fineExampleResultDTO.getShiftProjectRatioA()));
+        fineExampleResultDTO.setPlatJoinPartyRatio(this.getRatio(Double.valueOf(fineExampleResultDTO.getPlatJoinPartyRatio())));
         return fineExampleResultDTO;
     }
 

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenPioneerDataDao.xml

@@ -15,7 +15,9 @@
             resolved_project_total AS resolvedProjectTotal,
             resolved_project_ratio AS resolvedProjectRatioA,
             publish_issue_total AS publishIssueTotal,
-            publish_issue_ratio AS publishIssueRatioA
+            publish_issue_ratio AS publishIssueRatioA,
+            PLAT_ISSUE_TOTAL AS platIssueTotal,
+            PLAT_JOIN_PARTY_RATIO AS platJoinPartyRatio
         FROM
             screen_pioneer_data
         WHERE