From 572538c381cb38f0026188d74bf9c45bb9c99509 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Sat, 12 Sep 2020 13:50:40 +0800
Subject: [PATCH] =?UTF-8?q?fact=5Findex=5FXXX=5Fscore=E7=9B=B8=E5=85=B3?=
 =?UTF-8?q?=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=9D=83=E9=87=8Dweight=20=20louti?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FactIndexCommunityScoreEntity.java}       | 54 +++++++++++++------
 1 file changed, 37 insertions(+), 17 deletions(-)
 rename epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/{screen/FactIndexCommunityFiveScoreEntity.java => indexcal/FactIndexCommunityScoreEntity.java} (57%)

diff --git a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityFiveScoreEntity.java b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunityScoreEntity.java
similarity index 57%
rename from epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityFiveScoreEntity.java
rename to epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunityScoreEntity.java
index 40a112d6d8..1a2dbe1dfd 100644
--- a/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityFiveScoreEntity.java
+++ b/epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunityScoreEntity.java
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package com.epmet.entity.evaluationindex.screen;
+package com.epmet.entity.evaluationindex.indexcal;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
@@ -25,51 +25,71 @@ import lombok.EqualsAndHashCode;
 import java.math.BigDecimal;
 
 /**
- * 社区相关-党建能力【五级权重】分数表 
+ * 社区相关分数表 
  *
  * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-08-27
+ * @since v1.0.0 2020-08-31
  */
 @Data
 @EqualsAndHashCode(callSuper=false)
-@TableName("fact_index_community_five_score")
-public class FactIndexCommunityFiveScoreEntity extends BaseEpmetEntity {
+@TableName("fact_index_community_score")
+public class FactIndexCommunityScoreEntity extends BaseEpmetEntity {
 
 	private static final long serialVersionUID = 1L;
 
     /**
-     * 机关ID
+     * 客户Id
+     */
+	private String customerId;
+
+    /**
+     * 组织id
      */
 	private String agencyId;
 
     /**
-     * 月度ID
+     * 社区上一级组织id
      */
-	private String monthId;
+	private String parentAgencyId;
+
+    /**
+     * 年度ID: yyyy
+     */
+	private String yearId;
 
     /**
-     * 季度ID
+     * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4
      */
 	private String quarterId;
 
     /**
-     * 年度ID
+     * 月维度Id: yyyyMM
      */
-	private String yearId;
+	private String monthId;
+
+    /**
+     * 1：总分；0不是；默认0
+     */
+	private String isTotal;
+
+    /**
+     * 分值
+     */
+    private BigDecimal score;
 
     /**
-     * 指标ID
+     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan
      */
-	private String indexId;
+    private String indexCode;
 
     /**
-     * 分数
+     * 所有指标code拼接的字符串 冒号隔开
      */
-	private BigDecimal score;
+    private String allParentIndexCode;
 
     /**
-     * 发文数量：publish_article
+     * 权重（同一组权重总和=1）
      */
-	private String type;
+    private BigDecimal weight;
 
 }