统计库 话题主表添加新字段

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/dao/evaluationindex/extract/FactOriginTopicMainDailyDao.java

@@ -106,6 +106,14 @@ public interface FactOriginTopicMainDailyDao extends BaseDao<FactOriginTopicMain
      **/
     void updateFactOriginTopicMain(@Param("topicId")String topicId,@Param("topicStatus")String topicStatus,@Param("closedStatus")String closedStatus);
 
+    /**
+     * @Description  修改话题主标的 SHIFT_ISSUE 字段 = 1
+     * @Param topicIds
+     * @author zxc
+     * @date 2021/5/25 3:20 下午
+     */
+    void updateTopicMainStatus(@Param("topicIds") List<String> topicIds);
+
     /**
      * @return java.lang.Integer
      * @param customerId

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

@@ -40,6 +40,7 @@ import com.epmet.service.evaluationindex.extract.todata.FactOriginTopicMainDaily
 import com.epmet.service.org.CustomerGridService;
 import com.epmet.service.topic.TopicService;
 import com.epmet.service.user.UserService;
+import com.epmet.util.ModuleConstant;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -91,6 +92,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         Map<String, Object> map = this.constructFactOriginData(topicOriginInfoList, gridMap);
         List<FactOriginTopicMainDailyEntity> mainDailyEntityList = (List<FactOriginTopicMainDailyEntity>) map.get("main");
         List<FactOriginTopicLogDailyEntity> logDailyEntityList = (List<FactOriginTopicLogDailyEntity>) map.get("log");
+        List<String> topicIds = (List<String>) map.get(ModuleConstant.NEED_UPDATE_STATUS_TOPIC);
         //删除之前统计的数据
         deleteFactOriginData(customerId,dateId);
         //批量保存主表
@@ -99,6 +101,8 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         saveFactOriginTopicLogDailyEntity(logDailyEntityList);
         //更新主表的状态状态、关闭状态
         updateFactOriginTopicMain(topicService.queryUpdateTopicOriginInfoList(customerId, dateId));
+        // 更新主表的转议题状态
+        updateTopicMainStatus(topicIds);
         return true;
     }
 
@@ -117,6 +121,18 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
         });
     }
 
+    /**
+     * @Description  修改话题主标的 SHIFT_ISSUE 字段 = 1
+     * @Param topicIds
+     * @author zxc
+     * @date 2021/5/25 3:18 下午
+     */
+    private void updateTopicMainStatus(List<String> topicIds){
+        if (!CollectionUtils.isEmpty(topicIds)){
+            baseDao.updateTopicMainStatus(topicIds);
+        }
+    }
+
 
     private Map<String, GridInfoDTO> getGridInfoMap(String customerId) {
         Map<String ,GridInfoDTO> map=new HashMap<>();
@@ -172,6 +188,7 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
 
         List<String> userIds = topicOriginInfoList.stream().map(topic -> topic.getOperateUserId()).distinct().collect(Collectors.toList());
         Map<String,Integer> userIsPartyMap = userService.selectUserIsParty(userIds);
+        List<String> topicIds = new ArrayList<>();
         for(TopicOriginInfoDTO topicOriginInfoDTO:topicOriginInfoList){
             GridInfoDTO gridInfoDTO=gridMap.get(topicOriginInfoDTO.getGridId());
             if(null==gridInfoDTO){
@@ -219,9 +236,13 @@ public class FactOriginTopicMainDailyServiceImpl extends BaseServiceImpl<FactOri
                 logDailyEntity.setOperateUserIsParty(false);
             }
             logDailyEntityList.add(logDailyEntity);
+            if (topicOriginInfoDTO.getActionCode().equals(ModuleConstant.TOPIC_STATUS_SHIFT_ISSUE)){
+                topicIds.add(topicOriginInfoDTO.getTopicId());
+            }
         }
         map.put("main",mainDailyEntityList);
         map.put("log",logDailyEntityList);
+        map.put(ModuleConstant.NEED_UPDATE_STATUS_TOPIC,topicIds);
         return map;
     }
 

epmet-module/data-statistical/data-statistical-server/src/main/java/com/epmet/util/ModuleConstant.java

@@ -39,4 +39,8 @@ public interface ModuleConstant {
     String EXCEPTION_DING_INTERCEPTOR_PREFIX_TOPIC_STATISTICAL = "topicStats";
 
     String LOG_WARN_NO_AGENCY_MESSAGE = "没有相应的机关集合";
+
+    String TOPIC_STATUS_SHIFT_ISSUE = "shift_issue";
+
+    String NEED_UPDATE_STATUS_TOPIC = "needUpdateStatusTopic";
 }

epmet-module/data-statistical/data-statistical-server/src/main/resources/db/migration/V0.0.16__add_shiftIssue.sql

@@ -0,0 +1 @@
+ALTER TABLE `fact_origin_topic_main_daily` ADD `SHIFT_ISSUE` tinyint(1) NOT NULL COMMENT '是否转为议题，0:false，1:true';

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

@@ -139,6 +139,19 @@
             where id = #{topicId}
     </update>
 
+    <!-- 修改话题主标的 SHIFT_ISSUE 字段 = 1 -->
+    <update id="updateTopicMainStatus">
+        UPDATE fact_origin_topic_main_daily
+        SET SHIFT_ISSUE = 1,
+            UPDATED_TIME = NOW()
+        WHERE 1=1
+            AND (
+                <foreach collection="topicIds" item="topicId" separator=" OR ">
+                    ID = #{topicId}
+                </foreach>
+            )
+    </update>
+
     <!--   在当前组织下，发布的话题总数，也可以单独筛选党员 -->
     <select id="getAgencyPartyTopicTotal" parameterType="map" resultType="java.lang.Integer">
         SELECT