1、先锋模范

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

@@ -1,5 +1,6 @@
 package com.epmet.screen.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 
 import java.io.Serializable;
@@ -14,42 +15,67 @@ public class FineExampleResultDTO implements Serializable {
     private static final long serialVersionUID = -2754696449087950719L;
 
     /**
-     * 党员参与议题数
+     * 党员参与议事
      */
-    private Integer issueTotal;
+    private Integer issueTotal = 0;
+
+    @JsonIgnore
+    private Double issueRatioA;
 
     /**
-     * 党员参与议题书占平台议题数的占比
+     * 党员参与议事占比
      */
-    private String issueRatio;
+    private String issueRatio = "0.00%";
 
     /**
      * 党员发布话题总数
      */
-    private Integer topicTotal;
+    private Integer topicTotal = 0;
+
+    @JsonIgnore
+    private Double topicRatioA;
 
     /**
-     * 占平台总话题百分比
+     * 党员发布话题占比
      */
-    private String topicRatio;
+    private String topicRatio = "0.00%";
 
     /**
      * 议题转项目
      */
-    private Integer shiftProjectTotal;
+    private Integer shiftProjectTotal = 0;
+
+    @JsonIgnore
+    private Double shiftProjectRatioA;
 
     /**
-     * 议题转项目占平台总项目数的比率
+     * 议题转项目占比
      */
-    private String shiftProjectRatio;
+    private String shiftProjectRatio = "0.00%";
 
     /**
      * 解决项目
      */
-    private Integer resolvedProjectTotal;
+    private Integer resolvedProjectTotal = 0;
+
+    @JsonIgnore
+    private Double resolvedProjectRatioA;
+
+    /**
+     * 解决项目占比
+     */
+    private String resolvedProjectRatio = "0.00%";
+
+    /**
+     * 党员发布议题数
+     */
+    private Integer publishIssueTotal = 0;
+
+    @JsonIgnore
+    private Double publishIssueRatioA;
 
     /**
-     * 占总解决项目的百分比
+     * 党员发布议题数占比
      */
-    private String resolvedProjectRatio;
+    private String publishIssueRatio = "0.00%";
 }

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenPioneerDataDao.java

@@ -17,7 +17,9 @@
 
 package com.epmet.datareport.dao.screen;
 
+import com.epmet.screen.dto.result.FineExampleResultDTO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 党建引领-先锋模范数据
@@ -27,5 +29,13 @@ import org.apache.ibatis.annotations.Mapper;
  */
 @Mapper
 public interface ScreenPioneerDataDao{
-	
+
+    /**
+     * @Description  查询先锋模范
+     * @param agencyId
+     * @author zxc
+     * @date 2020/8/20 5:22 下午
+     */
+    FineExampleResultDTO selectFineExample(@Param("agencyId")String agencyId);
+
 }

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

@@ -3,6 +3,7 @@ package com.epmet.datareport.service.screen.impl;
 import com.epmet.commons.tools.constant.NumConstant;
 import com.epmet.datareport.dao.screen.ScreenPartyBranchDataDao;
 import com.epmet.datareport.dao.screen.ScreenPartyLinkMassesDataDao;
+import com.epmet.datareport.dao.screen.ScreenPioneerDataDao;
 import com.epmet.datareport.service.screen.PartyMemberLeadService;
 import com.epmet.screen.dto.form.ContactMassLineChartFormDTO;
 import com.epmet.screen.dto.form.FineExampleFormDTO;
@@ -11,6 +12,7 @@ import com.epmet.screen.dto.result.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
@@ -32,6 +34,8 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
     private GrassrootsPartyDevServiceImpl grassrootsPartyDevServiceImpl;
     @Autowired
     private ScreenPartyBranchDataDao screenPartyBranchDataDao;
+    @Autowired
+    private ScreenPioneerDataDao screenPioneerDataDao;
 
     /**
      * @Description  1、先锋模范
@@ -41,8 +45,27 @@ public class PartyMemberLeadServiceImpl implements PartyMemberLeadService {
      */
     @Override
     public FineExampleResultDTO fineExample(FineExampleFormDTO fineExampleFormDTO) {
+        FineExampleResultDTO fineExampleResultDTO = screenPioneerDataDao.selectFineExample(fineExampleFormDTO.getAgencyId());
+        if (null == fineExampleResultDTO){
+            return new FineExampleResultDTO();
+        }
+        fineExampleResultDTO.setIssueRatio(this.getRatio(fineExampleResultDTO.getIssueRatioA()).concat("%"));
+        fineExampleResultDTO.setPublishIssueRatio(this.getRatio(fineExampleResultDTO.getPublishIssueRatioA()).concat("%"));
+        fineExampleResultDTO.setResolvedProjectRatio(this.getRatio(fineExampleResultDTO.getResolvedProjectRatioA()).concat("%"));
+        fineExampleResultDTO.setTopicRatio(this.getRatio(fineExampleResultDTO.getTopicRatioA()).concat("%"));
+        fineExampleResultDTO.setShiftProjectRatio(this.getRatio(fineExampleResultDTO.getShiftProjectRatioA()).concat("%"));
+        return fineExampleResultDTO;
+    }
 
-        return null;
+    /**
+     * @Description
+     * @param d
+     * @author zxc
+     * @date 2020/8/20 6:06 下午
+     */
+    public String getRatio(Double d){
+        BigDecimal bigDecimal = new BigDecimal(d * NumConstant.ONE_HUNDRED);
+        return bigDecimal.setScale(NumConstant.TWO, BigDecimal.ROUND_HALF_UP).toPlainString();
     }
 
     /**

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

@@ -3,5 +3,23 @@
 
 <mapper namespace="com.epmet.datareport.dao.screen.ScreenPioneerDataDao">
 
-
+    <!-- 查询先锋模范 -->
+    <select id="selectFineExample" resultType="com.epmet.screen.dto.result.FineExampleResultDTO">
+        SELECT
+            issue_total AS issueTotal,
+            issue_ratio AS issueRatioA,
+            topic_total AS topicTotal,
+            topic_ratio AS topicRatioA,
+            shift_project_total AS shiftProjectTotal,
+            shift_project_Ratio AS shiftProjectRatioA,
+            resolved_project_total AS resolvedProjectTotal,
+            resolved_project_ratio AS resolvedProjectRatioA,
+            publish_issue_total AS publishIssueTotal,
+            publish_issue_ratio AS publishIssueRatioA
+        FROM
+            screen_pioneer_data
+        WHERE
+            del_flag = '0'
+            AND org_id = #{agencyId}
+    </select>
 </mapper>