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

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

@@ -331,7 +331,7 @@ public class TaChannelController extends BaseController {
     @GetMapping(value = "/admin/channel/introductionListExport")
     public void getChannelIntroductionListExport(@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,
-                                                         @RequestParam(value = "channelType", required = false)String channelType,
+                                                         @RequestParam(value = "targetType", required = false)String targetType,
                                                          @RequestParam(value = "buildingId", required = false)String buildingId,
                                                          @RequestParam(value = "channelId") Integer channelId,
                                                          HttpServletRequest request, HttpServletResponse response) throws IOException {
@@ -341,7 +341,7 @@ public class TaChannelController extends BaseController {
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), TsChannelDaily.class).registerWriteHandler(new CustomCellWriteHandler()).build();
         // 设置 sheet, 同一个sheet只需要设置一次
         WriteSheet writeSheet = EasyExcel.writerSheet("引进注册用户").build();
-        List<TsChannelDaily> data = taChannelService.getChannelIntroductionListExport(getOrgId(request), startDate, endDate, channelType, buildingId, channelId);
+        List<TsChannelDaily> data = taChannelService.getChannelIntroductionListExport(getOrgId(request), startDate, endDate, targetType, buildingId, channelId, getTaPersonBuildingListByUserId(request));
         excelWriter.write(data, writeSheet);
         // finish 会帮忙关闭流
         excelWriter.finish();

src/main/java/com/huiju/estateagents/drainage/controller/TaDrainageController.java

@@ -1,23 +1,5 @@
 package com.huiju.estateagents.drainage.controller;
 
-import java.time.LocalDateTime;
-import java.util.List;
-import java.util.UUID;
-import java.util.stream.Collectors;
-
-import javax.servlet.http.HttpServletRequest;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -38,6 +20,16 @@ import com.huiju.estateagents.service.IExtendContentService;
 import com.huiju.estateagents.service.IMiniAppService;
 import com.huiju.estateagents.third.entity.TaThirdPartyMiniappConfig;
 import com.huiju.estateagents.third.service.ITaThirdPartyMiniappConfigService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.UUID;
+import java.util.stream.Collectors;
 
 
 /**
@@ -100,6 +92,7 @@ public class TaDrainageController extends BaseController {
             }
             queryWrapper.eq(null != status,"status",status);
             queryWrapper.eq(!StringUtils.isEmpty(buildingId),"building_id",buildingId);
+            queryWrapper.isNull(StringUtils.isEmpty(buildingId),"building_id");
             queryWrapper.eq(null != drainageId,"drainage_id",drainageId);
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.like(!StringUtils.isEmpty(name),"name",name);

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

@@ -65,7 +65,7 @@ public interface TaChannelMapper extends BaseMapper<TaChannel> {
 
     IPage<ChannelVisitPersonNum> getChannelPersonNumList(IPage<ChannelVisitPersonNum> iPage,@Param("orgId") Integer orgId,@Param("channelId") Integer channelId,@Param("targetId") String targetId,@Param("targetType") String targetType,@Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 
-    List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId);
+    List<TsChannelDaily> getChannelIntroductionListExport(@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("channelType") String channelType,@Param("buildingId") String buildingId,@Param("channelId") Integer channelId,@Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings);
 
     List<ChannelAddRegistNum> getChannelNewuserListExport( @Param("orgId") Integer orgId, @Param("channelId") Integer channelId, @Param("activityId") String activityId, @Param("activityType") String activityType, @Param("buildingId") String buildingId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate);
 

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

@@ -84,7 +84,7 @@ public interface TaChannelService extends IService<TaChannel> {
      * @param channelId
      * @return
      */
-    List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId);
+    List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings);
 
     /**
      * 导出

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

@@ -188,7 +188,6 @@ public class ExtendContentServiceImpl extends ServiceImpl<ExtendContentMapper, E
             taExtendContentQueryWrapper.eq("status", 1);
             taExtendContentQueryWrapper.eq("show_type", extendContent.getShowType());
             taExtendContentQueryWrapper.eq("show_position", extendContent.getShowPosition());
-            taExtendContentQueryWrapper.eq(StringUtils.isNotBlank(String.valueOf(extendContent.getIsHaveActive())), "is_have_active", extendContent.getIsHaveActive());
             if (null != extendContent.getContentId()){
                 taExtendContentQueryWrapper.ne("content_id", extendContent.getContentId());
             }

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

@@ -132,12 +132,12 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
      * @return
      */
     @Override
-    public List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId) {
-        List<TsChannelDaily> channelIntroductionListExport = taChannelMapper.getChannelIntroductionListExport(orgId, startDate, endDate, channelType, buildingId, channelId);
+    public List<TsChannelDaily> getChannelIntroductionListExport(Integer orgId, LocalDate startDate, LocalDate endDate, String channelType, String buildingId, Integer channelId, List<TaPersonBuilding> taPersonBuildings) {
+        List<TsChannelDaily> channelIntroductionListExport = taChannelMapper.getChannelIntroductionListExport(orgId, startDate, endDate, channelType, buildingId, channelId,taPersonBuildings);
         channelIntroductionListExport.forEach(e -> {
             String message = "";
             switch (e.getTargetType()){
-                case "project":
+                case "building":
                     message = "项目";
                     break;
                 case "activity":
@@ -159,7 +159,7 @@ public class TaChannelServiceImpl extends ServiceImpl<TaChannelMapper, TaChannel
                     message = "资讯";
                     break;
                 case "house":
-                    message = "销售批次";
+                    message = "在线选房";
                     break;
             }
             e.setTargetType(message);

src/main/resources/mapper/TaChannelMapper.xml

@@ -160,7 +160,7 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` in ( 'detail', 'house_list' )
+        t.`event` in ( 'detail', 'house_list' , 'poster')
         AND t.event_type IN (
         'activity',
         'help',
@@ -216,7 +216,7 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` in ( 'detail', 'house_list' )
+        t.`event` in ( 'detail', 'house_list' , 'poster')
         AND t.event_type IN (
         'activity',
         'help',
@@ -256,7 +256,22 @@
     <select id="getChannelIntroductionListExport"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.TsChannelDaily">
         SELECT
-        *
+        serial_no,
+        statis_date,
+        org_id,
+        building_id,
+        building_name,
+        target_id,
+        target_type,
+        target_name,
+        sum( share_num ) AS share_num,
+        sum( share_persons ) AS share_persons,
+        sum( visit_num ) AS visit_num,
+        sum( visit_persons ) AS visit_persons,
+        sum( new_persons ) AS new_persons,
+        sum( new_customers ) AS new_customers,
+        qr_code_id,
+        channel_id
         FROM
         ts_channel_daily
         WHERE
@@ -271,6 +286,13 @@
         <if test="buildingId != null and buildingId != ''">
             and building_id = #{buildingId}
         </if>
+        <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
+            and building_id in
+            <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
+                #{taPersonBuilding.buildingId}
+            </foreach>
+        </if>
+        GROUP BY   target_id, target_type
     </select>
     <select id="getChannelNewuserListExport"
             resultType="com.huiju.estateagents.excel.ActivityStatistics.ChannelAddRegistNum">
@@ -322,7 +344,7 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` in ( 'detail', 'house_list' )
+        t.`event` in ( 'detail', 'house_list', 'poster' )
         AND t.event_type IN (
         'activity',
         'help',
@@ -378,7 +400,7 @@
         FROM
         ta_person_visit_record t
         WHERE
-        t.`event` in ( 'detail', 'house_list' )
+        t.`event` in ( 'detail', 'house_list', 'poster' )
         AND t.event_type IN (
         'activity',
         'help',

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -39,6 +39,9 @@
      </if><if test="buildingId != null and buildingId != ''">
          and t.building_id = #{buildingId}
     </if>
+    <if test="buildingId == null or buildingId == ''">
+        and t.building_id is null
+    </if>
     <if test="personBuildingList != null and personBuildingList.size > 0">
         AND (t.building_id in
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">