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

# Conflicts:
#	src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java
#	src/main/resources/mapper/TaLiveActivityMapper.xml

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

     @RequestMapping(value = "/admin/taLiveActivity", method = RequestMethod.GET)
     public ResponseBean taLiveActivityList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                            @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                           String liveActivityTitle, String cityId, String buildingId,
-                                           String liveDetailType, Integer status,
+                                           String liveActivityTitle, String cityId, String buildingId, Integer status,
                                            HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            Integer orgId = getOrgId(request);
-            responseBean = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
-                    liveActivityTitle, cityId, buildingId, liveDetailType, status);
+            IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
+                    liveActivityTitle, cityId, buildingId, status);
+            responseBean.addSuccess(result);
+
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taLiveActivityList -=- {}", e.toString());

src/main/java/com/huiju/estateagents/entity/TaLiveActivity.java

     /**
      * 直播开始时间
      */
-    private LocalDateTime liveStartDate;
+    private String liveStartDate;
 
     /**
      * 直播结束时间
      */
-    private LocalDateTime liveEndDate;
+    private String liveEndDate;
 
     /**
      * 创建时间
     /**
      * 权重
      */
-//    private Integer weight;
+    private Integer weight;
 
     @TableField(exist = false)
     private List<TaPoster> posters;
     @TableField(exist = false)
     private List<TaShareContent> shareContents;
 
+    @TableField(exist = false)
+    private String buildingName;
 
+    @TableField(exist = false)
+    private String cityName;
 }

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

 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.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
-import java.util.List;
-
 /**
  * <p>
  * Mapper 接口
      */
     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);
     /**
      * 批量更新直播活动状态
      *

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

 package com.huiju.estateagents.service;
 
+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;
      * @param status
      * @return
      */
-    ResponseBean listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                             String cityId, String buildingId, String liveDetailType, Integer status);
+    IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                                      String cityId, String buildingId, Integer status);
 
     /**
      * 访问量自增

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

     }
 
     @Override
-    public ResponseBean listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
-                                                    String cityId, String buildingId, String liveDetailType, Integer status) {
+    public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
+                                                    String cityId, String buildingId, Integer status) {
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数：pageNum:{},pageSize:{},orgId:{}," +
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
-                liveActivityTitle, cityId, buildingId, liveDetailType, status);
+                liveActivityTitle, cityId, buildingId, status);
 
-        ResponseBean responseBean = new ResponseBean();
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
-        QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
-
-        if (orgId != null) {
-            queryWrapper.eq("org_id", orgId);
-        }
-        if (StringUtils.isNotBlank(liveActivityTitle)) {
-            queryWrapper.like("live_activity_title", liveActivityTitle);
-        }
-        if (StringUtils.isNotBlank(cityId)) {
-            queryWrapper.eq("city_id", cityId);
-        }
-        if (StringUtils.isNotBlank(buildingId)) {
-            queryWrapper.eq("building_id", buildingId);
-        }
-        if (StringUtils.isNotBlank(liveDetailType)) {
-            queryWrapper.eq("live_detail_type", liveDetailType);
-        }
-        if (status != null) {
-            queryWrapper.eq("status", status);
-        }
-        queryWrapper.orderByDesc("create_date");
-        IPage<TaLiveActivity> result = page(pg, queryWrapper);
-        responseBean.addSuccess(result);
-        return responseBean;
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId);
     }
 
     @Override

src/main/resources/mapper/TaLiveActivityMapper.xml

         </foreach>
     </update>
 
+    <select id="selectLiveListByCondition" resultType="com.huiju.estateagents.entity.TaLiveActivity">
+     select a.building_name,b.name as city_name, t.* From ta_live_activity t
+     left join ta_building a on t.building_id = a.building_id
+     LEFT JOIN td_city b on t.city_id = b.id
+     where t.org_id = #{orgId}
+     <if test="status != null and status != ''">
+         and t.status = #{status}
+     </if>
+     <if test="liveActivityTitle != null and liveActivityTitle != ''">
+         and t.liveActivityTitle like CONCAT('%', #{liveActivityTitle}, '%')
+     </if>
+     <if test="cityId != null and cityId != ''">
+         and t.city_id = #{cityId}
+     </if><if test="buildingId != null and buildingId != ''">
+         and t.building_id = #{buildingId}
+    </if>
+    </select>
+
 </mapper>

src/main/resources/mapper/TaShareMapper.xml

       left join ta_sales_batch b on t.be_share = b.sales_batch_id
       where a.org_id = #{orgId}
       and t.tagert_type in ('housePost','houseApp')
-      and b.sales_batch_id = #{liveActivityId}
+      and b.sales_batch_id = #{saleBatchId}
       <if test="personType != null and personType != ''">
           and a.person_Type = #{personType}
       </if>