1111

src/main/java/com/yunzhi/marketing/xlk/dto/PcStatisticsDTO.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.dto;
 import lombok.Data;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 public class PcStatisticsDTO {
@@ -22,7 +23,7 @@ public class PcStatisticsDTO {
     /**
      * 组织机构code
      */
-    private String institutionCode;
+    private List<String> institutionIds;
 
     /**
      * 开始时间

src/main/java/com/yunzhi/marketing/xlk/service/impl/IPcStatisticsServiceimpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.center.taUser.entity.TaTagUser;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
+import com.yunzhi.marketing.center.taUser.mapper.TaUserMapper;
 import com.yunzhi.marketing.common.CommConstant;
 import com.yunzhi.marketing.dto.StatisticsDTO;
 import com.yunzhi.marketing.entity.TaRecommendCustomer;
@@ -21,10 +22,12 @@ import com.yunzhi.marketing.xlk.vo.PcStatisticsVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 @Service
 public class IPcStatisticsServiceimpl implements IPcStatisticsService {
@@ -35,6 +38,9 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Autowired
     private InstitutionMapper institutionMapper;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
     /**
      * 获取首页六个卡片的数值
      *
@@ -44,12 +50,10 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Override
     public ResponseBean getUserStatistics(TaUser taUser) {
         // 获取当前人员的渠道code
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-
         PcStatisticsDTO statisticsDTO = new PcStatisticsDTO();
         statisticsDTO.setOrgId(taUser.getOrgId());
         statisticsDTO.setTodayTime(LocalDateTime.now());
-        statisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        statisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 总用户
         int allPersonNum = pcStatisticsMapper.selectAllPerson(statisticsDTO);
         // 总注册用户
@@ -112,11 +116,10 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
     @Override
     public ResponseBean getUserAuthorStatistics(TaUser taUser) {
         // 获取当前人员的渠道code
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
         PcStatisticsDTO statisticsDTO = new PcStatisticsDTO();
         statisticsDTO.setOrgId(taUser.getOrgId());
         statisticsDTO.setTodayTime(LocalDateTime.now());
-        statisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        statisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 总用户
         int allPersonNum = pcStatisticsMapper.selectAllPerson(statisticsDTO);
         // 总注册用户
@@ -136,8 +139,7 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
      */
     @Override
     public ResponseBean getStatsBarList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO) {
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-        pcStatisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        pcStatisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
         // 获取公客排行榜
         List<PcStatisticsLeaderboardVO> gkList = pcStatisticsMapper.getGkLeaderboard(pcStatisticsDTO);
         // 获取私客排行榜
@@ -164,11 +166,21 @@ public class IPcStatisticsServiceimpl implements IPcStatisticsService {
      */
     @Override
     public ResponseBean selectActivityList(TaUser taUser, PcStatisticsDTO pcStatisticsDTO) {
-        Institution institution = institutionMapper.selectById(taUser.getInstitutionId());
-        pcStatisticsDTO.setInstitutionCode(institution.getInstitutionCode());
+        pcStatisticsDTO.setInstitutionIds(getInstitutionIds(taUser.getUserId()));
 
         IPage<PcStatisticsActivityVO> page = new Page<>(pcStatisticsDTO.getPageNum(),pcStatisticsDTO.getPageSize());
         IPage<PcStatisticsActivityVO> result = pcStatisticsMapper.selectActivityList(page,pcStatisticsDTO);
         return ResponseBean.success(result);
     }
+
+    /**
+     * 获取组织机构id
+     *
+     * @param userId
+     * @return
+     */
+    public List<String> getInstitutionIds(Integer userId) {
+        List<Institution> list = institutionMapper.getAllByUser(userId);
+        return list.stream().map(Institution::getInstitutionId).collect(Collectors.toList());
+    }
 }

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -30,10 +30,14 @@
             COUNT(1)
         FROM
             ta_channel t
-            LEFT JOIN xlk_institution i ON t.institution_id = i.institution_id
         WHERE
             t.org_id = #{params.orgId}
-<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
     </select>
     <select id="selectEstateAgentNum" resultType="java.lang.Integer">
         SELECT
@@ -66,7 +70,6 @@
         FROM
             ta_recommend_customer b
             LEFT JOIN ta_building d ON b.building_id = d.building_id
-            LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
             AND b.org_id = #{params.orgId}
@@ -82,7 +85,12 @@
             <if test="params.endTime != null">
                 and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
             </if>
-<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+            <if test="params.institutionIds != null and params.institutionIds.size > 0">
+                AND b.institution_id in
+                <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                    #{item}
+                </foreach>
+            </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -95,7 +103,6 @@
         FROM
             ta_recommend_customer b
         LEFT JOIN ta_building d ON b.building_id = d.building_id
-        LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
         WHERE
             b.STATUS > 0
         AND b.org_id = #{params.orgId}
@@ -112,7 +119,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND b.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -125,7 +137,6 @@
         FROM
             ta_uv a
             LEFT JOIN ta_building d ON a.be_uv = d.building_id
-            LEFT JOIN xlk_institution i ON d.institution_id = i.institution_id
         WHERE
             a.tagert_type = 'project'
             AND d.org_id = #{params.orgId}
@@ -139,7 +150,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND d.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY
             a.be_uv
         ORDER BY
@@ -169,7 +185,12 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND b.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -223,7 +244,12 @@
         <if test="params.buildingId != null and params.buildingId != ''">
             and  t.building_id = #{params.buildingId}
         </if>
-<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
+        <if test="params.institutionIds != null and params.institutionIds.size > 0">
+            AND t.institution_id in
+            <foreach collection="params.institutionIds" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
         order by t.create_date desc
     </select>
 </mapper>