bug fix

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

@@ -258,7 +258,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
         }
 
         // 小程序公客
-        if (!hasOrgCust && !inserted) {
+        if (!hasOrgCust && !inserted && !personTypeFlag) {
             TaRecommendCustomer customer = copyFromPerosn(person, new TaRecommendCustomer());
             fillSomeFieldsOfCustomer(customer, recommender, now);
             taRecommendCustomerMapper.insert(customer);

src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java

@@ -291,7 +291,7 @@ public class ActivityStatisticController extends BaseController {
                                                    @RequestParam(value = "personId", required = false)String personId,
                                                    @RequestParam(value = "buildingId", required = false)String buildingId,
                                                    HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId);
+        return taActivityStaticService.selectActivityVisitNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, personId, buildingId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -339,7 +339,7 @@ public class ActivityStatisticController extends BaseController {
                                                @RequestParam(value = "activityType", required = false)String activityType,
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
                                                HttpServletRequest request) {
-        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+        return taActivityStaticService.selectActivityVisitPersonNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
     }
 
     /**
@@ -364,7 +364,7 @@ public class ActivityStatisticController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), VisitPersonNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
-        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId);
+        List<VisitPersonNum> data = taActivityStaticService.selectActivityVisitPersonNumExport(getOrgId(request), startDate, endDate, personFrom, province, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId,  personId, getTaPersonBuildingListByUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.statistic.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import org.apache.ibatis.annotations.Mapper;
@@ -240,7 +241,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExport(
@@ -267,7 +269,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExport(
@@ -280,7 +283,8 @@ public interface TaActicityStaticMapper {
             @Param("realtyConsultantPhone") String realtyConsultantPhone,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitPersonNum> selectActivityVisitPersonNumByPersonId(
@@ -291,7 +295,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitPersonNum> selectActivityVisitPersonNumExportByPersonId(
@@ -301,7 +306,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings
     );
 
     IPage<VisitNum> selectActivityVisitNumByPersonId(
@@ -312,7 +318,8 @@ public interface TaActicityStaticMapper {
             @Param("personId") String personId,
             @Param("activityId") String activityId,
             @Param("activityType") String activityType,
-            @Param("buildingId") String buildingId
+            @Param("buildingId") String buildingId,
+            @Param("taPersonBuildings")List<TaPersonBuilding> taPersonBuildings
     );
 
     List<VisitNum> selectActivityVisitNumExportByPersonId(

src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaBuilding;
 import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.excel.ActivityStatistics.*;
 import com.huiju.estateagents.statistic.mapper.TaActicityStaticMapper;
@@ -151,13 +152,13 @@ public class TaActivityStaticServiceImpl {
         return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
     }
 
-    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
+    public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId, List<TaPersonBuilding> taPersonBuildings){
         IPage<VisitNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taPersonBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taPersonBuildings);
         }
 
         return ResponseBean.success(data);
@@ -173,24 +174,48 @@ public class TaActivityStaticServiceImpl {
         return list;
     }
 
-    public ResponseBean selectActivityVisitPersonNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+    public ResponseBean selectActivityVisitPersonNum(Integer pageNum,
+                                                     Integer pageSize,
+                                                     Integer orgId,
+                                                     LocalDate startDate,
+                                                     LocalDate endDate,
+                                                     String personFrom,
+                                                     String provice,
+                                                     String realtyConsultant,
+                                                     String realtyConsultantPhone,
+                                                     String activityId,
+                                                     String activityType,
+                                                     String buildingId,
+                                                     String personId,
+                                                     List<TaPersonBuilding> taBuildings){
         IPage<VisitPersonNum> iPage = new Page<>(pageNum, pageSize);
         IPage<VisitPersonNum> data;
         if (StringUtils.isEmpty(personId)){
-            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            data = taActicityStaticMapper.selectActivityVisitPersonNumByPersonId(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
 
         return ResponseBean.success(data);
     }
 
-    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String buildingId, String personId){
+    public List<VisitPersonNum> selectActivityVisitPersonNumExport(Integer orgId,
+                                                                   LocalDate startDate,
+                                                                   LocalDate endDate,
+                                                                   String personFrom,
+                                                                   String provice,
+                                                                   String realtyConsultant,
+                                                                   String realtyConsultantPhone,
+                                                                   String activityId,
+                                                                   String activityType,
+                                                                   String buildingId,
+                                                                   String personId,
+                                                                   List<TaPersonBuilding> taBuildings){
         List<VisitPersonNum> list = new ArrayList<>();
         if (StringUtils.isEmpty(personId)){
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, provice, realtyConsultant, realtyConsultantPhone, activityId, activityType, buildingId, taBuildings);
         }else{
-            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId);
+            list = taActicityStaticMapper.selectActivityVisitPersonNumExportByPersonId(orgId, LocalDateTime.of(startDate, LocalTime.MIN), LocalDateTime.of(endDate, LocalTime.MAX), personId, activityId, activityType, buildingId, taBuildings);
         }
         return list;
     }

src/main/resources/mapper/statistic/TaActivityStaticMapper.xml

@@ -2081,6 +2081,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -2143,6 +2149,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         AND t.org_id = #{orgId}
         AND t.visit_time >= DATE_FORMAT(#{startDate}, '%Y-%m-%d')
         AND t.visit_time &lt;= DATE_FORMAT(#{endDate}, '%Y-%m-%d')
@@ -2211,6 +2223,12 @@
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and t.building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
         GROUP BY
         t.person_id ) as t
         left join ta_person a on t.person_id = a.person_id