新需求

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -13,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- *  
+ *
  * </p>
  *
  * @author jobob
@@ -45,11 +46,13 @@ public class TaLiveActivity implements Serializable {
     /**
      * 所属城市
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer cityId;
 
     /**
      * 所属楼盘
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String buildingId;
 
     /**
@@ -100,12 +103,12 @@ public class TaLiveActivity implements Serializable {
     /**
      * 直播开始时间
      */
-    private String liveStartDate;
+    private LocalDateTime liveStartDate;
 
     /**
      * 直播结束时间
      */
-    private String liveEndDate;
+    private LocalDateTime liveEndDate;
 
     /**
      * 创建时间

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

@@ -102,4 +102,10 @@ public class TaShare implements Serializable {
      */
     @TableField(exist = false)
     private String shareContent;
+
+    /**
+     * 直播活动名称
+     */
+    @TableField(exist = false)
+    private String liveActivityTitle;
 }

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

@@ -81,6 +81,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private TaShareActivityMapper taShareActivityMapper;
 
+    @Autowired
+    private TaLiveActivityMapper taLiveActivityMapper;
+
     @Autowired
     private TaExtendContentMapper taExtendContentMapper;
 
@@ -108,9 +111,6 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaSalesBatchService iTaSalesBatchService;
 
-    @Autowired
-    private TaLiveActivityMapper taLiveActivityMapper;
-
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
@@ -437,6 +437,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             taShareActivityQueryWrapper.eq("building_id", building.getBuildingId());
             taShareActivityMapper.update(taShareActivity, taShareActivityQueryWrapper);
 
+            //更新直播城市
+            TaLiveActivity taLiveActivity = new TaLiveActivity();
+            taLiveActivity.setCityId(building.getCityId());
+            QueryWrapper<TaLiveActivity> taLiveActivityQueryWrapper = new QueryWrapper<>();
+            taLiveActivityQueryWrapper.eq("building_id", building.getBuildingId());
+            taLiveActivityMapper.update(taLiveActivity, taLiveActivityQueryWrapper);
+
             //更新首页轮播、开屏广告、宣传位
             TaExtendContent taExtendContent = new TaExtendContent();
             taExtendContent.setCityId(building.getCityId());
@@ -618,6 +625,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setStatus(-1);
         taBuildingMapper.update(building, buildingIdQueryWrapper);
 
+        TaLiveActivity taLiveActivity = new TaLiveActivity();
+        QueryWrapper<TaLiveActivity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("building_id", id);
+        taLiveActivity.setStatus(0);
+        taLiveActivity.setCityId(null);
+        taLiveActivity.setBuildingId(null);
+        taLiveActivityMapper.update(taLiveActivity, queryWrapper);
         return ResponseBean.success("");
     }
 

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

@@ -208,7 +208,7 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         List<TaShare> list = taShareMapper.listLiveShare(page, orgId, personType, shareType, phone, liveActivityId);
         TaLiveActivity taLiveActivity = taLiveActivityMapper.selectById(liveActivityId);
         list.forEach(e -> {
-            e.setSalesBatchName(taLiveActivity.getLiveActivityTitle());
+            e.setLiveActivityTitle(taLiveActivity.getLiveActivityTitle());
         });
         page.setRecords(list);
         return ResponseBean.success(page);

src/main/resources/mapper/TaLiveActivityMapper.xml

@@ -30,7 +30,7 @@
          and t.status = #{status}
      </if>
      <if test="liveActivityTitle != null and liveActivityTitle != ''">
-         and t.liveActivityTitle like CONCAT('%', #{liveActivityTitle}, '%')
+         and t.live_Activity_Title like CONCAT('%', #{liveActivityTitle}, '%')
      </if>
      <if test="cityId != null and cityId != ''">
          and t.city_id = #{cityId}