Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -440,6 +440,7 @@ public class CommConstant {
 	public static final Object GROUP_ACTIVITY = "groupActivity";
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
+    public static final String LIVE_ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/live/index\"}";
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
     public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
     

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

@@ -61,7 +61,7 @@ public class TaLiveActivityController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         try {
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status);
+                    liveActivityTitle, cityId, buildingId, status,getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {
@@ -253,7 +253,7 @@ public class TaLiveActivityController extends BaseController {
         try {
             status = status == null ? 1 : status;
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
-                    liveActivityTitle, cityId, buildingId, status);
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
 
         } catch (Exception e) {

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

@@ -67,7 +67,7 @@ public class TaSalesBatchController extends BaseController {
             //使用分页插件
             IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
-            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
+            IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request),getTaPersonBuildingListByUserId(request));
             responseBean.addSuccess(result);
         } catch (Exception e) {
             e.printStackTrace();

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -29,7 +30,7 @@ public interface TaLiveActivityMapper extends BaseMapper<TaLiveActivity> {
      */
     Boolean addVisitNum(@Param("id") String id);
 
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId")Integer orgId);
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
     /**
      * 批量更新直播活动状态
      *

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -19,7 +20,7 @@ import java.util.Map;
  */
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList")  List<TaPersonBuilding> personBuildingList);
 
     /**
      * 根据批次号统计预选数据

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaLiveActivity;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 
@@ -28,18 +29,19 @@ public interface ITaLiveActivityService extends IService<TaLiveActivity> {
     /**
      * 条件查询直播活动列表
      *
+     * @param liveDetailType
      * @param pageNum
      * @param pageSize
      * @param orgId
      * @param liveActivityTitle
      * @param cityId
      * @param buildingId
-     * @param liveDetailType
      * @param status
+     * @param taPersonBuildingListByUserId
      * @return
      */
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                      String cityId, String buildingId, Integer status);
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
 
     /**
      * 访问量自增

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

@@ -1,9 +1,9 @@
 package com.huiju.estateagents.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import com.huiju.estateagents.entity.TaSalesBatch;
 
 import java.util.List;
@@ -17,7 +17,7 @@ import java.util.List;
  * @since 2020-02-10
  */
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
-    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
+    IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId);
 
     ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
 

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

@@ -17,7 +17,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -71,7 +70,7 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
         taLiveActivity.setCreateDate(LocalDateTime.now());
         taLiveActivity.setUpdateDate(LocalDateTime.now());
         if (StringUtils.isNotBlank(taLiveActivity.getLiveRoomParam())) {
-            taLiveActivity.setLiveAppName(taLiveActivity.getLiveRoomParam().replace(".html", ""));
+            taLiveActivity.setLiveAppPath(taLiveActivity.getLiveRoomParam().replace(".html", ""));
         }
 
         Boolean result = save(taLiveActivity);
@@ -79,19 +78,14 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
             responseBean.addError("fail");
             return responseBean;
         }
-
-//        // 生成二维码
-//        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
-//        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
-//        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
-//        /**
-//         *  TODO 部分信息待修改
-//         */
-//        ResponseBean taMiniappQrcode = miniAppService.getQrCode
-//                (CommConstant.ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
-//                        .replace("#1", "live"), taMiniapp.getMiniappId());
-//        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
-//        updateById(taLiveActivity);
+        QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+        taMiniappQuery.eq("org_id", taLiveActivity.getOrgId());
+        TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
+        ResponseBean taMiniappQrcode = miniAppService.getQrCode
+                (CommConstant.LIVE_ACTIVITY_QRCODE.replace("#0", taLiveActivity.getLiveActivityId().toString())
+                        .replace("#1", "live"), taMiniapp.getMiniappId());
+        taLiveActivity.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+        updateById(taLiveActivity);
 
         // 设置默认海报数据
         TaShareContent shareContent = new TaShareContent();
@@ -110,13 +104,13 @@ public class TaLiveActivityServiceImpl extends ServiceImpl<TaLiveActivityMapper,
 
     @Override
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                             String cityId, String buildingId, Integer status) {
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
                 liveActivityTitle, cityId, buildingId, status);
 
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId);
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
     }
 
     @Override

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

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.common.StringUtils;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPosterMapper;
@@ -16,7 +15,6 @@ import com.huiju.estateagents.service.ITaBuildingService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.apache.commons.collections.CollectionUtils;
-import org.checkerframework.checker.units.qual.A;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -68,8 +66,8 @@ public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaS
     private ITaBuildingService taBuildingService;
 
     @Override
-    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
-        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
+    public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId, List<TaPersonBuilding> taPersonBuildingListByUserId) {
+        return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId,taPersonBuildingListByUserId);
     }
 
     @Override

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -38,6 +38,12 @@
          and t.city_id = #{cityId}
      </if><if test="buildingId != null and buildingId != ''">
          and t.building_id = #{buildingId}
+    </if>
+    <if test="personBuildingList != null and personBuildingList.size > 0">
+        AND t.building_id in
+        <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+            #{personBuilding.buildingId}
+        </foreach>
     </if>
         order by t.weight desc
     </select>

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -23,6 +23,12 @@
         <if test="status != null">
             and t.status = #{status}
         </if>
+        <if test="personBuildingList != null and personBuildingList.size > 0">
+            AND t.building_id in
+            <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                #{personBuilding.buildingId}
+            </foreach>
+        </if>
     </select>
 
     <select id="countPreSelectRecord" resultType="java.lang.Integer">