fact_index_XXX_score相关表增加权重weight

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/AgencyScoreDao.java

@@ -82,17 +82,6 @@ public interface AgencyScoreDao extends BaseDao<AgencyScoreEntity> {
      **/
     List<AgencyScoreDTO> selectListAgencyScore(@Param("customerId")String customerId, @Param("monthId")String monthId);
 
-    /**
-     * 批量插入区/街道相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertAgencyScoreData(@Param("list") List<AgencyScoreEntity> list, @Param("customerId")String customerId);
-
     /**
      * 根据入参查询  区/街道相关分数表id
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunityScoreDao.java

@@ -20,7 +20,7 @@ package com.epmet.dao.evaluationindex.indexcal;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
-import com.epmet.entity.evaluationindex.screen.FactIndexCommunityScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.FactIndexCommunityScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -79,17 +79,6 @@ public interface CommunityScoreDao extends BaseDao<FactIndexCommunityScoreEntity
      */
     List<SubCommunityAvgResultDTO> selectSubCommAvgScore(@Param("customerId")String customerId, @Param("monthId")String monthId, @Param("indexCode")String indexCode);
 
-    /**
-     * 批量插入 社区相关分数表
-     *
-     * @param list
-     * @param customerId
-     * @return void
-     * @Author zhangyong
-     * @Date 11:11 2020-09-04
-     **/
-    void batchInsertCommunityScoreData(@Param("list") List<FactIndexCommunityScoreEntity> list, @Param("customerId")String customerId);
-
     /**
      * 根据入参查询  查询社区id
      * @param customerId

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/indexcal/CommunitySubScoreDao.java

@@ -18,9 +18,8 @@
 package com.epmet.dao.evaluationindex.indexcal;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
-import com.epmet.dto.indexcal.SubCommunityAvgResultDTO;
 import com.epmet.dto.screen.FactIndexCommunityScoreDTO;
-import com.epmet.entity.evaluationindex.screen.FactIndexCommunityScoreEntity;
+import com.epmet.entity.evaluationindex.indexcal.FactIndexCommunitySubScoreEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -33,7 +32,7 @@ import java.util.List;
  * @since v1.0.0 2020-08-31
  */
 @Mapper
-public interface CommunitySubScoreDao extends BaseDao<FactIndexCommunityScoreEntity> {
+public interface CommunitySubScoreDao extends BaseDao<FactIndexCommunitySubScoreEntity> {
 
     /**
      * @param lists

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencyScoreEntity.java

@@ -87,4 +87,8 @@ public class AgencyScoreEntity extends BaseEpmetEntity {
 	 */
 	private String dataType;
 
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/AgencySubScoreEntity.java

@@ -87,4 +87,8 @@ public class AgencySubScoreEntity extends BaseEpmetEntity {
 	 */
 	private String dataType;
 
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcScoreEntity.java

@@ -87,4 +87,9 @@ public class CpcScoreEntity extends BaseEpmetEntity {
      * 是否是总分 1是0不是
      */
     private String isTotal;
+
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/CpcSubScoreEntity.java

@@ -87,4 +87,9 @@ public class CpcSubScoreEntity extends BaseEpmetEntity {
 	 * 是否是总分 1是0不是
 	 */
 	private String isTotal;
+
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptScoreEntity.java

@@ -87,4 +87,8 @@ public class DeptScoreEntity extends BaseEpmetEntity {
      */
     private String allParentIndexCode;
 
+    /**
+     * 权重（同一组权重总和=1）
+     */
+    private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/DeptSubScoreEntity.java

@@ -82,4 +82,8 @@ public class DeptSubScoreEntity extends BaseEpmetEntity {
      */
     private String allParentIndexCode;
 
+    /**
+     * 权重（同一组权重总和=1）
+     */
+    private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/FactIndexCommunitySubScoreEntity.java

@@ -0,0 +1,70 @@
+package com.epmet.entity.evaluationindex.indexcal;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.math.BigDecimal;
+
+/**
+ * 社区相关分数表-明细
+ *
+ * @author generator generator@elink-cn.com
+ * @since v1.0.0 2020-08-31
+ */
+@Data
+@EqualsAndHashCode(callSuper=false)
+@TableName("fact_index_community_sub_score")
+public class FactIndexCommunitySubScoreEntity extends BaseEpmetEntity {
+    private static final long serialVersionUID = -7046354032669198828L;
+    /**
+     * 客户Id
+     */
+    private String customerId;
+
+    /**
+     * 组织id
+     */
+    private String agencyId;
+
+    /**
+     * 社区上一级组织id
+     */
+    private String parentAgencyId;
+
+    /**
+     * 年度ID: yyyy
+     */
+    private String yearId;
+
+    /**
+     * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4
+     */
+    private String quarterId;
+
+    /**
+     * 月维度Id: yyyyMM
+     */
+    private String monthId;
+
+    /**
+     * 分值
+     */
+    private BigDecimal score;
+
+    /**
+     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan
+     */
+    private String indexCode;
+
+    /**
+     * 所有指标code拼接的字符串 冒号隔开
+     */
+    private String allParentIndexCode;
+
+    /**
+     * 权重（同一组权重总和=1）
+     */
+    private BigDecimal weight;
+}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridScoreEntity.java

@@ -92,4 +92,8 @@ public class GridScoreEntity extends BaseEpmetEntity {
      */
     private String allParentIndexCode;
 
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/indexcal/GridSubScoreEntity.java

@@ -92,4 +92,8 @@ public class GridSubScoreEntity extends BaseEpmetEntity {
 	 */
 	private String allParentIndexCode;
 
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/FactIndexCommunityScoreEntity.java

@@ -1,90 +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.entity.evaluationindex.screen;
-
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-import java.math.BigDecimal;
-
-/**
- * 社区相关分数表 
- *
- * @author generator generator@elink-cn.com
- * @since v1.0.0 2020-08-31
- */
-@Data
-@EqualsAndHashCode(callSuper=false)
-@TableName("fact_index_community_score")
-public class FactIndexCommunityScoreEntity extends BaseEpmetEntity {
-
-	private static final long serialVersionUID = 1L;
-
-    /**
-     * 客户Id
-     */
-	private String customerId;
-
-    /**
-     * 组织id
-     */
-	private String agencyId;
-
-    /**
-     * 社区上一级组织id
-     */
-	private String parentAgencyId;
-
-    /**
-     * 年度ID: yyyy
-     */
-	private String yearId;
-
-    /**
-     * 季度id: yyyyQ1、yyyyQ2、yyyyQ3、yyyyQ4
-     */
-	private String quarterId;
-
-    /**
-     * 月维度Id: yyyyMM
-     */
-	private String monthId;
-
-    /**
-     * 1：总分；0不是；默认0
-     */
-	private String isTotal;
-
-    /**
-     * 分值
-     */
-    private BigDecimal score;
-
-    /**
-     * 党建能力：dangjiannengli；治理能力：zhilinengli；服务能力：fuwunengli；社区相关：shequxiangguan
-     */
-    private String indexCode;
-
-    /**
-     * 所有指标code拼接的字符串 冒号隔开
-     */
-    private String allParentIndexCode;
-
-}

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/screen/ScreenIndexDataMonthlyEntity.java

@@ -92,4 +92,8 @@ public class ScreenIndexDataMonthlyEntity extends BaseEpmetEntity {
      */
 	private BigDecimal governAblity;
 
+	/**
+	 * 权重（同一组权重总和=1）
+	 */
+	private BigDecimal weight;
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencyScoreDao.xml

@@ -5,7 +5,8 @@
 
     <!-- 【街道】中间表插入 -->
     <insert id="insertStreetRecord">
-        INSERT INTO fact_index_agency_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, IS_TOTAL, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_agency_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, IS_TOTAL, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
         (
@@ -21,6 +22,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             #{item.delFlag},
             #{item.revision},
             #{item.createdBy},
@@ -107,52 +109,6 @@
         GROUP BY fics.parent_agency_id
     </select>
 
-    <insert id="batchInsertAgencyScoreData" parameterType="map">
-        insert into fact_index_agency_score
-        (
-        ID,
-        CUSTOMER_ID,
-
-        AGENCY_ID,
-        PARENT_AGENCY_ID,
-        YEAR_ID,
-        QUARTER_ID,
-        MONTH_ID,
-        DATA_TYPE,
-        IS_TOTAL,
-        SCORE,
-        INDEX_CODE,
-
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.agencyId},
-            #{item.parentAgencyId},
-
-            #{item.yearId},
-            #{item.quarterId},
-            #{item.monthId},
-            #{item.dataType},
-            #{item.isTotal},
-            #{item.score},
-            #{item.indexCode},
-            0,
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
 
     <select id="selectListAgencyId" resultType="String">
        SELECT

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/AgencySubScoreDao.xml

@@ -5,7 +5,8 @@
 
     <!-- 【街道】中间表插入 -->
     <insert id="insertStreetRecord">
-        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_agency_sub_score (ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, DATA_TYPE, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
         (
@@ -20,6 +21,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             #{item.delFlag},
             #{item.revision},
             #{item.createdBy},

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunityScoreDao.xml

@@ -5,7 +5,8 @@
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
-        INSERT INTO fact_index_community_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, IS_TOTAL, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_community_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, IS_TOTAL, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
             (
@@ -20,6 +21,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             #{item.delFlag},
             #{item.revision},
             #{item.createdBy},
@@ -106,48 +108,6 @@
 		  ORDER BY AGENCY_ID
     </select>
 
-    <insert id="batchInsertCommunityScoreData" parameterType="map">
-        insert into fact_index_community_score
-        (
-        ID,
-        CUSTOMER_ID,
-        AGENCY_ID,
-        PARENT_AGENCY_ID,
-        YEAR_ID,
-        QUARTER_ID,
-        MONTH_ID,
-        IS_TOTAL,
-        SCORE,
-        INDEX_CODE,
-        DEL_FLAG,
-        REVISION,
-        CREATED_BY,
-        CREATED_TIME,
-        UPDATED_BY,
-        UPDATED_TIME
-        ) values
-        <foreach collection="list" item="item" index="index" separator=",">
-            (
-            (SELECT REPLACE(UUID(), '-', '') AS id),
-            #{customerId},
-            #{item.agencyId},
-            #{item.parentAgencyId},
-            #{item.yearId},
-            #{item.quarterId},
-
-            #{item.monthId},
-            #{item.isTotal},
-            #{item.score},
-            #{item.indexCode},
-            0,
-            0,
-            'APP_USER',
-            now(),
-            'APP_USER',
-            now()
-            )
-        </foreach>
-    </insert>
 
     <select id="selectListCommunityId" resultType="String">
         SELECT

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CommunitySubScoreDao.xml

@@ -5,7 +5,8 @@
 
     <!-- 党建能力【社区】中间表插入 -->
     <insert id="insertCommunityPartyRecord">
-        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE, DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
+        INSERT INTO fact_index_community_sub_score ( ID, CUSTOMER_ID, AGENCY_ID, PARENT_AGENCY_ID, YEAR_ID, QUARTER_ID, MONTH_ID, SCORE, INDEX_CODE,ALL_PARENT_INDEX_CODE,
+        WEIGHT,DEL_FLAG, REVISION, CREATED_BY, CREATED_TIME, UPDATED_BY, UPDATED_TIME )
         VALUES
         <foreach collection="lists" item="item" separator=",">
             (
@@ -19,6 +20,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             #{item.delFlag},
             #{item.revision},
             #{item.createdBy},

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcScoreDao.xml

@@ -116,6 +116,7 @@
         `SCORE`,
         `INDEX_CODE`,
         `ALL_PARENT_INDEX_CODE`,
+        WEIGHT,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -137,6 +138,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
              0,
              0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/CpcSubScoreDao.xml

@@ -113,6 +113,7 @@
         `SCORE`,
         `INDEX_CODE`,
         `ALL_PARENT_INDEX_CODE`,
+        WEIGHT,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -133,6 +134,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
              0,
              0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptScoreDao.xml

@@ -83,6 +83,7 @@
         SCORE,
         INDEX_CODE,
         ALL_PARENT_INDEX_CODE,
+        WEIGHT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -103,6 +104,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             0,
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/DeptSubScoreDao.xml

@@ -16,6 +16,7 @@
         SCORE,
         INDEX_CODE,
         ALL_PARENT_INDEX_CODE,
+        WEIGHT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -35,6 +36,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             0,
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridScoreDao.xml

@@ -52,6 +52,7 @@
         `SCORE`,
         `INDEX_CODE`,
         ALL_PARENT_INDEX_CODE,
+        WEIGHT,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -74,6 +75,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             0,
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/indexcal/GridSubScoreDao.xml

@@ -17,6 +17,7 @@
         `SCORE`,
         `INDEX_CODE`,
          ALL_PARENT_INDEX_CODE,
+        WEIGHT,
         `DEL_FLAG`,
         `REVISION`,
         `CREATED_BY`,
@@ -38,6 +39,7 @@
             #{item.score},
             #{item.indexCode},
             #{item.allParentIndexCode},
+            #{item.weight},
             0,
             0,
             'APP_USER',

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/screen/ScreenIndexDataMonthlyDao.xml

@@ -24,6 +24,7 @@
         PARTY_DEV_ABLITY,
         SERVICE_ABLITY,
         GOVERN_ABLITY,
+        WEIGHT,
         DEL_FLAG,
         REVISION,
         CREATED_BY,
@@ -46,6 +47,7 @@
             #{item.partyDevAblity},
             #{item.serviceAblity},
             #{item.governAblity},
+            #{item.weight},
             0,
             0,
             'APP_USER',