修改screen_user_join表，

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

@@ -1,31 +0,0 @@
-/**
- * Copyright 2018 人人开源 https://www.renren.io
- * <p>
- * 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.
- * <p>
- * 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.
- * <p>
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-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{
-	
-}

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

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-
-<mapper namespace="com.epmet.datareport.dao.screen.ScreenVoluntaryActivityDataDao">
-
-
-
-</mapper>

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;
 

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;
 
 }