统计

src/main/java/com/huiju/estateagents/controller/StatisticalController.java

@@ -184,4 +184,15 @@ public class StatisticalController extends BaseController {
                                          HttpServletRequest request) {
         return iStatisticalService.selectPersonFromGroupByDay(getOrgId(request), startDate,endDate);
     }
+
+    /**
+     * 项目排行统计图
+     * @return
+     */
+    @GetMapping(value = "/admin/stats/barList")
+    public ResponseBean selectBuildingBar(@RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDate startDate,
+                                           @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)  LocalDate endDate,
+                                           HttpServletRequest request) {
+        return iStatisticalService.getStatsBarList(getOrgId(request), startDate, endDate, getTaPersonBuildingListByUserId(request));
+    }
 }

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -2,9 +2,9 @@ package com.huiju.estateagents.controller;
 
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.JWTUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaOrg;
@@ -14,24 +14,19 @@ import com.huiju.estateagents.mapper.TaOrgMapper;
 import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaPersonService;
 import com.huiju.estateagents.service.ITaSaveService;
-import com.huiju.estateagents.service.ITdCityService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.ibatis.annotations.Param;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.format.annotation.DateTimeFormat;
 import org.springframework.web.bind.annotation.*;
 
-import com.huiju.estateagents.base.BaseController;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 /**
  * <p>

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -8,6 +8,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
@@ -93,4 +94,14 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
     int countNumByHeavy(@Param("heavy") Integer heavy, @Param("dynamicId") String dynamicId);
 
     List<TaBuilding> selectMainBuildings(@Param("cityId") String cityId, @Param("orgId") Integer orgId);
+
+    /**
+     * 获取公客折线图数据
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    List<Map<String, Object>> getGkBarData(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

src/main/java/com/huiju/estateagents/service/IStatisticalService.java

@@ -4,7 +4,6 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDate;
-import java.util.Date;
 import java.util.List;
 
 /**
@@ -126,4 +125,14 @@ public interface IStatisticalService {
      * @return
      */
     ResponseBean selectPersonFromGroupByDay(Integer orgId, LocalDate startDate, LocalDate endDate);
+
+    /**
+     * 获取楼盘的折线图统计
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -1,8 +1,8 @@
 package com.huiju.estateagents.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.entity.TaPerson;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 

src/main/java/com/huiju/estateagents/service/impl/StatisticalServiceImpl.java

@@ -8,7 +8,6 @@ import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaPersonVisitRecord;
 import com.huiju.estateagents.entity.TdWxDict;
-import com.huiju.estateagents.exception.EstaException;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.PersonPO;
 import com.huiju.estateagents.service.IStatisticalService;
@@ -19,10 +18,12 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -402,4 +403,38 @@ public class StatisticalServiceImpl implements IStatisticalService {
         });
         return dataList;
     }
+
+    /**
+     * 获取楼盘的折线图统计
+     *
+     * @param orgId
+     * @param startDate
+     * @param endDate
+     * @param personBuildingList
+     * @return
+     */
+    @Override
+    public ResponseBean getStatsBarList(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        //项目公客排行折线图获取
+        Map<String,Object> gkBarMap = getGkBarData(orgId,startDate,endDate,personBuildingList);
+        map.put("gkBarMap",gkBarMap);
+        //项目私客排行折线图获取
+        //项目访问人数排行折线图获取
+        //项目访问次数排行折线图获取
+        return ResponseBean.success(map);
+    }
+
+    private Map<String, Object> getGkBarData(Integer orgId, LocalDate startDate, LocalDate endDate, List<TaPersonBuilding> personBuildingList) {
+        Map<String,Object> map = new HashMap<>();
+        List<Map<String, Object>> gkBarData = taBuildingMapper.getGkBarData(orgId, startDate, endDate, personBuildingList);
+        if (gkBarData.size() > 0){
+            map.put("data",gkBarData);
+            List<Object> buildingNameList = gkBarData.stream().map(x -> x.get("buildingName")).collect(Collectors.toList());
+            map.put("buildingNameList",buildingNameList);
+            List<Object> gkNumList = gkBarData.stream().map(x -> x.get("gkNum")).collect(Collectors.toList());
+            map.put("numList",gkNumList);
+        }
+        return map;
+    }
 }

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -6,18 +6,15 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.google.common.collect.Lists;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.service.*;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import javafx.scene.control.Tab;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/resources/mapper/TaBuildingMapper.xml

@@ -257,4 +257,45 @@
         ORDER BY t.order_no desc
     </select>
 
+    <select id="getGkBarData" resultType="java.util.Map">
+        SELECT
+            count( * ) AS gk_num,
+            bb.building_id,
+            bb.create_date,
+            bb.building_name
+        FROM
+        (
+            SELECT
+                b.*,
+                d.building_name
+            FROM
+                ta_person b
+            LEFT JOIN ta_building d ON b.building_id = d.building_id
+            WHERE
+                b.STATUS > 0
+                AND b.org_id = #{orgId}
+                AND IFNULL( b.person_type, '' ) IN ( 'estate agent', 'customer' )
+                AND b.person_id NOT IN ( SELECT c.person_id FROM ta_recommend_customer c WHERE c.org_id = #{orgId} AND person_id IS NOT NULL AND person_id != '' )
+                <if test="personBuildingList != null and personBuildingList.size > 0">
+                    AND b.building_id in
+                    <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                        #{personBuilding.buildingId}
+                    </foreach>
+                </if>
+                <if test="startDate != null">
+                    and  TO_DAYS(b.create_date) >= TO_DAYS(#{startDate})
+                </if>
+                <if test="endDate != null">
+                    and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{endDate})
+                </if>
+                and b.building_id is not null
+            GROUP BY
+            b.person_id
+        ) bb
+        GROUP BY
+            bb.building_id
+        order by gk_num desc
+        limit 6
+    </select>
+
 </mapper>