Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev

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

@@ -170,4 +170,12 @@ public interface FactOriginIssueLogDailyDao extends BaseDao<FactOriginIssueLogDa
      * @return java.util.List<com.epmet.dto.extract.result.OrgStatisticsResultDTO>
      */
     List<OrgStatisticsResultDTO> getClosedIssueIncr(@Param("customerId") String customerId, @Param("dateId") String dateId);
+
+    /**
+     * 查询出本月内做过议题表决的用户id
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<String> queryVoteUserIds(@Param("customerId")String customerId, @Param("monthId")String monthId);
 }

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

@@ -103,4 +103,12 @@ public interface FactOriginTopicLogDailyDao extends BaseDao<FactOriginTopicLogDa
      * @date 2020/9/21 9:37 上午
      */
     List<PartyActiveResultDTO> selectPartyActiveTopic(@Param("customerId")String customerId,@Param("monthId") String monthId,@Param("isParty") Integer isParty);
+
+    /**
+     * 查询出本月内，评论过话题的用户id
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<String> queryCommentTopicUserIds(@Param("customerId") String customerId, @Param("monthId")String monthId);
 }

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

@@ -583,19 +583,29 @@ public class CalCpcIndexServiceImpl implements CalCpcIndexService {
                 map.put(partyMember.getUserId(), NumConstant.ZERO);
                 continue;
             }
-            //todo 可以先把本月内评论的用户+本月内表决过的用户 集合查询出来。避免循环查询
+            //可以先把本月内评论的用户+本月内表决过的用户 集合查询出来。避免循环查询
+            List<String> commentTopicUserIds=factOriginTopicLogDailyService.queryCommentTopicUserIds(customerId,monthId);
+            List<String> voteUserIds=issueExtractService.queryVoteUserIds(customerId,monthId);
             //3、判断每个成员是否 “活跃”
             for (String memberId : memberIdList) {
+                //注释2022.03.02
                 //1、判断成员在本月内是否评论过
-                Integer topicCommentCount = factOriginTopicLogDailyService.selectUserCommentCount(memberId, customerId, monthId);
+                /*Integer topicCommentCount = factOriginTopicLogDailyService.selectUserCommentCount(memberId, customerId, monthId);
                 if (topicCommentCount > 0) {
                     groupActiveUserCount++;
                     continue;
-                }
+                }*/
                 //2、判断成员在本月内是否表决过(支持or反对)议题
-                Integer voteCount = issueExtractService.selectCountUserVote(memberId, customerId, monthId);
+                /*Integer voteCount = issueExtractService.selectCountUserVote(memberId, customerId, monthId);
                 if (voteCount > 0) {
                     groupActiveUserCount++;
+                }*/
+                if (CollectionUtils.isNotEmpty(commentTopicUserIds) && commentTopicUserIds.contains(memberId)) {
+                    groupActiveUserCount++;
+                    continue;
+                }
+                if (CollectionUtils.isNotEmpty(voteUserIds) && voteUserIds.contains(memberId)) {
+                    groupActiveUserCount++;
                 }
             }
             //赋值每个党员的 -- 党员自建群活跃群众人数

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

@@ -79,4 +79,12 @@ public interface FactOriginTopicLogDailyService extends BaseService<FactOriginTo
      * @date 2020/9/21 9:37 上午
      */
     List<PartyActiveResultDTO> selectPartyActiveTopic(String customerId, String monthId,Integer isParty);
+
+    /**
+     * 查询出本月内，评论过话题的用户id
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<String> queryCommentTopicUserIds(String customerId, String monthId);
 }

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

@@ -107,4 +107,12 @@ public interface IssueExtractService {
      * @date 2020/9/21 9:37 上午
      */
     List<PartyActiveResultDTO> selectPartyActiveIssueVote(String customerId, String monthId, Integer isParty);
+
+    /**
+     * 查询出本月内做过议题表决的用户id
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    List<String> queryVoteUserIds(String customerId, String monthId);
 }

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

@@ -108,4 +108,16 @@ public class FactOriginTopicLogDailyServiceImpl extends BaseServiceImpl<FactOrig
     public List<PartyActiveResultDTO> selectPartyActiveTopic(String customerId, String monthId, Integer isParty) {
         return baseDao.selectPartyActiveTopic(customerId, monthId, isParty);
     }
+
+    /**
+     * 查询出本月内，评论过话题的用户id
+     *
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    @Override
+    public List<String> queryCommentTopicUserIds(String customerId, String monthId) {
+        return baseDao.queryCommentTopicUserIds(customerId,monthId);
+    }
 }

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

@@ -374,4 +374,17 @@ public class IssueExtractServiceImpl implements IssueExtractService {
     public List<PartyActiveResultDTO> selectPartyActiveIssueVote(String customerId, String monthId, Integer isParty) {
         return issueLogDailyDao.selectPartyActiveIssueVote(customerId, monthId, isParty);
     }
+
+    /**
+     * 查询出本月内做过议题表决的用户id
+     *
+     * @param customerId
+     * @param monthId
+     * @return
+     */
+    @Override
+    public List<String> queryVoteUserIds(String customerId, String monthId) {
+        return issueLogDailyDao.queryVoteUserIds(customerId,monthId);
+    }
+
 }

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

@@ -237,4 +237,26 @@
             GRID_ID,
             OPERATION_USER_ID
     </select>
+
+    <select id="queryVoteUserIds" parameterType="map" resultType="java.lang.String">
+            SELECT
+                *
+            FROM
+                (
+                SELECT
+                    T1.OPERATION_USER_ID AS userId,
+                    COUNT( 1 ) AS TOTAL
+                FROM
+                    fact_origin_issue_log_daily T1
+                WHERE
+                    T1.DEL_FLAG = '0'
+                    AND T1.CUSTOMER_ID = #{customerId}
+                    AND T1.MONTH_ID = #{monthId}
+                    AND ( T1.ACTION_CODE = 'vote_support' OR T1.ACTION_CODE = 'vote_opposition' )
+                GROUP BY
+                    T1.OPERATION_USER_ID
+                ) temp
+            WHERE
+                total >0
+    </select>
 </mapper>

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

@@ -143,4 +143,27 @@
           AND CUSTOMER_ID = #{customerId}
           AND MONTH_ID = #{monthId}
     </select>
+
+    <!--    查询出本月内，评论过话题的用户id -->
+    <select id="queryCommentTopicUserIds" parameterType="map" resultType="java.lang.String">
+        SELECT
+                userId
+            FROM
+                (
+                SELECT
+                    t1.OPERATE_USER_ID AS userId,
+                    COUNT( 1 ) AS total
+                FROM
+                    fact_origin_topic_log_daily T1
+                WHERE
+                    T1.DEL_FLAG = '0'
+                    AND T1.CUSTOMER_ID = #{customerId}
+                    AND T1.MONTH_ID = #{monthId}
+                    AND t1.ACTION_CODE = 'comment'
+                GROUP BY
+                    t1.OPERATE_USER_ID
+                ) temp
+            WHERE
+                total >0
+    </select>
 </mapper>