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 @@ -167,9 +167,9 @@ public interface ScreenBaseReportDataDao extends BaseDao 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 - '${customId}' as customerId, DATE_FORMAT( date_add(now(), INTERVAL - 1 DAY), '%Y%m%d'