From e32dba25e5dba0436f857616b866c81bbc881cc5 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 27 Jul 2021 15:22:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E8=A1=97=E5=8F=A3=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E7=B1=BB=E5=9E=8B=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../screen/result/PioneerdataResultDTO.java   | 21 ++++++++++---------
 .../screen/dao/ScreenBaseReportDataDao.java   | 12 +++++------
 .../mapper/screen/ScreenBaseReportDataDao.xml |  2 --
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
index 0c125659..1d19c1c0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-client/src/main/java/com/elink/esua/epdc/dto/screen/result/PioneerdataResultDTO.java
@@ -3,6 +3,7 @@ package com.elink.esua.epdc.dto.screen.result;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @program: esua-epdc
@@ -68,27 +69,27 @@ public class PioneerdataResultDTO implements Serializable {
     /**
      * 议事占比(党员/用户)
      */
-    private String issueRatio;
+    private BigDecimal issueRatio;
 
     /**
      * 话题占比(党员/用户)
      */
-    private String topicRatio;
+    private BigDecimal topicRatio;
 
     /**
      * 议题转项目占比(党员/用户)
      */
-    private String shiftProjectRatio;
+    private BigDecimal shiftProjectRatio;
 
     /**
      * 解决项目占比(党员/用户)
      */
-    private String resolvedProjectRatio;
+    private BigDecimal resolvedProjectRatio;
 
     /**
      * 党员发布议题占比(党员/用户)
      */
-    private String publishIssueRatio;
+    private BigDecimal publishIssueRatio;
 
     /**
      *数据更新至: yyyy|yyyyMM|yyyyMMdd
@@ -101,22 +102,22 @@ public class PioneerdataResultDTO implements Serializable {
     /**
      * V2升级新增字段, 详见说明文档
      */
-    private String issueRatioFm;
+    private Integer issueRatioFm;
     /**
      * V2升级新增字段, 详见说明文档
      */
-    private String topicRatioFm;
+    private Integer topicRatioFm;
     /**
      * V2升级新增字段, 详见说明文档
      */
-    private String shiftProjectRatioFm;
+    private Integer shiftProjectRatioFm;
     /**
      * V2升级新增字段, 详见说明文档
      */
-    private String resolvedProjectRatioFm;
+    private Integer resolvedProjectRatioFm;
     /**
      * V2升级新增字段, 详见说明文档
      */
-    private String publishIssueRatioFm;
+    private Integer publishIssueRatioFm;
 
 }
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java
index b5d3091c..9ec1c963 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/java/com/elink/esua/epdc/modules/screen/dao/ScreenBaseReportDataDao.java
@@ -151,9 +151,9 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
     /**
      * 05、网格注册用户数据
      * 居民总数 = 注册用户数 = 非党员用户 + 党员用户
-     * 热心居民总数 = 注册用户数 - 党员总数 = 非党员用户（榆山统计方式）
-     * 本日注册居民/本日热心居民日增量 = 用户首次绑定网格的时间（榆山统计方式）
-     * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间（榆山统计方式）
+     * 热心居民总数 = 注册用户数 - 党员总数 = 非党员用户
+     * 本日注册居民/本日热心居民日增量 = 用户首次绑定网格的时间
+     * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间
      *
      * @param
      * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenGridRegUserResultDTO>
@@ -167,9 +167,9 @@ public interface ScreenBaseReportDataDao extends BaseDao<ScreenBaseReportDataFor
     /**
      * 06、组织注册用户数据
      * 居民总数=注册用户数=非党员用户+党员用户
-     * 热心居民总数=注册用户数-党员总数=非党员用户（榆山统计方式）
-     * 本日注册居民/本日热心居民日增量 = 用户首次绑定网格的时间（榆山统计方式）
-     * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间（榆山统计方式）
+     * 热心居民总数=注册用户数-党员总数=非党员用户
+     * 本日注册居民/本日热心居民日增量 = 用户首次绑定网格的时间
+     * 本日党员认证日增量 = 认证历史中认证类型为党员并且认证成功的时间
      *
      * @param
      * @return java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.ScreenAgencyRegUserResultDTO>
diff --git a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
index 0ae055e6..0b0a16a0 100644
--- a/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
+++ b/esua-epdc/epdc-module/epdc-analysis/epdc-analysis-server/src/main/resources/mapper/screen/ScreenBaseReportDataDao.xml
@@ -751,7 +751,6 @@ and grid.id not in
 
     <select id="gridRegUserIncr" resultType="com.elink.esua.epdc.dto.screen.result.ScreenGridRegUserResultDTO">
     SELECT
-    '${customId}' as customerId,
         DATE_FORMAT(
             date_add(now(), INTERVAL - 1 DAY),
             '%Y%m%d'
@@ -964,7 +963,6 @@ and grid.id not in
 
     <select id="agencyRegUserIncr" resultType="com.elink.esua.epdc.dto.screen.result.ScreenAgencyRegUserResultDTO">
     SELECT
-    '${customId}' as customerId,
         DATE_FORMAT(
             date_add(now(), INTERVAL - 1 DAY),
             '%Y%m%d'