话题原始数据抽取添加pids

epmet-module/data-statistical/data-statistical-client/src/main/java/com/epmet/dto/org/GridInfoDTO.java

@@ -32,4 +32,9 @@ public class GridInfoDTO implements Serializable {
      * 客户id
      */
     private String customerId;
+
+    /**
+     * 所有上级组织ID,英文:隔开
+     */
+    private String pids;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicLogDailyEntity.java

@@ -112,5 +112,8 @@ public class FactOriginTopicLogDailyEntity extends BaseEpmetEntity {
      * 原始业务发生时间
      */
 	private Date originalBusinessTime;
-
+	/**
+	 * 所有上级组织ID,英文:隔开
+	 */
+	private String pids;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/entity/evaluationindex/extract/FactOriginTopicMainDailyEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.entity.evaluationindex.extract;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 话题主表_日统计
  *
@@ -102,5 +99,8 @@ public class FactOriginTopicMainDailyEntity extends BaseEpmetEntity {
      * 话题发布人是否是党员：1是党员0不是。 默认0
      */
 	private Boolean createTopicUserIsParty;
-
+	/**
+	 * 所有上级组织ID,英文:隔开
+	 */
+	private String pids;
 }

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/service/evaluationindex/extract/todata/impl/FactOriginTopicMainDailyServiceImpl.java

@@ -173,7 +173,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
                 mainDailyEntity.setAgencyId(gridInfoDTO.getAgencyId());
                 //网格的上上级组织id=街道id
                 mainDailyEntity.setPid(gridInfoDTO.getPid());
-                //TODO
+                mainDailyEntity.setPids(gridInfoDTO.getPids());
+                //判断用户是否是党员，调用相成写的方法
                 //话题发布人是否是党员：1是党员0不是。 默认0
                 if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
                     mainDailyEntity.setCreateTopicUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
@@ -190,7 +191,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
             logDailyEntity.setQuarterId(quarterId);
             logDailyEntity.setAgencyId(gridInfoDTO.getAgencyId());
             logDailyEntity.setPid(gridInfoDTO.getPid());
-            //TODO
+            logDailyEntity.setPids(gridInfoDTO.getPids());
+            //判断用户是否是党员，调用相成写的方法
             if (null != userIsPartyMap && null != userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId())) {
                 logDailyEntity.setOperateUserIsParty(userIsPartyMap.get(topicOriginInfoDTO.getOperateUserId()) == NumConstant.ONE ? true : false);
             } else {

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicLogDailyDao.xml

@@ -36,7 +36,8 @@
         CREATED_BY,
         CREATED_TIME,
         UPDATED_BY,
-        UPDATED_TIME
+        UPDATED_TIME,
+        PIDS
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -61,7 +62,8 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.pids}
             )
         </foreach>
     </insert>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/evaluationindex/extract/FactOriginTopicMainDailyDao.xml

@@ -35,7 +35,8 @@
         CREATED_BY,
         CREATED_TIME,
         UPDATED_BY,
-        UPDATED_TIME
+        UPDATED_TIME,
+        PIDS
         ) values
         <foreach collection="list" item="item" index="index" separator=",">
             (
@@ -58,7 +59,8 @@
             'APP_USER',
             now(),
             'APP_USER',
-            now()
+            now(),
+            #{item.pids}
             )
         </foreach>
     </insert>

epmet-module/data-statistical/data-statistical-server/src/main/resources/mapper/org/CustomerGridDao.xml

@@ -74,7 +74,8 @@
             cg.ID as GRID_ID,
             cg.PID as AGENCY_ID,
             ca.PID AS PID,
-            CG.CUSTOMER_ID
+            CG.CUSTOMER_ID,
+            cg.PIDS
         FROM
             customer_grid cg
             LEFT JOIN customer_agency ca ON ( cg.PID = CA.ID )