From a1178dfd517474bf241bdd300f60a93cdd75ec73 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Wed, 19 Aug 2020 12:40:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9screen=5Fuser=5Fjoin=E8=A1=A8?=
=?UTF-8?q?=EF=BC=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ScreenVoluntaryActivityDataDao.java | 31 --------------
.../screen/ScreenVoluntaryActivityDataDao.xml | 8 ----
.../screen/ScreenPartyBranchDataEntity.java | 2 +-
.../entity/screen/ScreenUserJoinEntity.java | 40 +++++++++----------
4 files changed, 19 insertions(+), 62 deletions(-)
delete mode 100644 epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
delete mode 100644 epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
diff --git a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java b/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
deleted file mode 100644
index b4433d9b1d..0000000000
--- a/epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/dao/screen/ScreenVoluntaryActivityDataDao.java
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package com.epmet.datareport.dao.screen;
-
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 党建引领-志愿活动服务数据
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-08-18
- */
-@Mapper
-public interface ScreenVoluntaryActivityDataDao{
-
-}
\ No newline at end of file
diff --git a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml b/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
deleted file mode 100644
index f65cb61870..0000000000
--- a/epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenVoluntaryActivityDataDao.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
index cdd5c6ef0e..8717291a31 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenPartyBranchDataEntity.java
@@ -54,7 +54,7 @@ public class ScreenPartyBranchDataEntity extends BaseEpmetEntity {
private String monthId;
/**
- * 数据类别 party:支部建设;union:联合建设
+ * 数据类别 party:支部建设;union:联合建设党员志愿服务：voluntaryservice
*/
private String type;
diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
index 4da0ff5d4b..d7ff0d4860 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/screen/ScreenUserJoinEntity.java
@@ -44,6 +44,16 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
*/
private String customerId;
+ /**
+ * 年Id
+ */
+ private String yearId;
+
+ /**
+ * 月份Id
+ */
+ private String monthId;
+
/**
* 组织类别 agency：组织；部门：department；网格：grid
*/
@@ -65,33 +75,19 @@ public class ScreenUserJoinEntity extends BaseEpmetEntity {
private String orgName;
/**
- * 总的参与次数
- */
- private Integer joinTotal;
-
- /**
- * 总的参与次数较上月增长率
- */
- private BigDecimal joinTotalUpRate;
-
- /**
- * 人均议题
+ * 组织次数
*/
- private Integer avgIssue;
+ private Integer organizeTotal;
- /**
- * 人均议题较上月增长率
- */
- private BigDecimal avgIssueUpRate;
+ /**
+ * 参与次数
+ */
+ private Integer joinTotal;
/**
- * 平均参与度
+ * 平均参与人数
*/
- private Integer avgJoin;
+ private Integer avgJoinUser;
- /**
- * 平均参与度较上月增长率
- */
- private BigDecimal agvgJoinUpRate;
}