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

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

@@ -3,7 +3,9 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.huiju.estateagents.entity.TaBuildingIntention;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -16,4 +18,11 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface TaBuildingIntentionMapper extends BaseMapper<TaBuildingIntention> {
 
+    /**
+     * 根据项目id删除意向值
+     * @param buildingId
+     * @return
+     */
+    @Delete("delete FROM ta_building_intention WHERE building_id = #{buildingId}")
+    int deleteByBuildingId(@Param("buildingId") String buildingId);
 }

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.entity.TaBuildingIntention;
 import com.huiju.estateagents.entity.TdBizEvent;
 import com.huiju.estateagents.mapper.TaBuildingIntentionMapper;
 import com.huiju.estateagents.service.ITaBuildingIntentionService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -22,11 +23,17 @@ import java.util.stream.Collectors;
 @Service
 public class TaBuildingIntentionServiceImpl extends ServiceImpl<TaBuildingIntentionMapper, TaBuildingIntention> implements ITaBuildingIntentionService {
 
+    @Autowired
+    private TaBuildingIntentionMapper taBuildingIntentionMapper;
 
     @Override
     public ResponseBean taBuildingIntentionAddOrUpdate(List<TdBizEvent>tdBizEventsList, String buildingId) {
         ResponseBean responseBean = new ResponseBean();
 
+        // 先删除库中存在的
+        taBuildingIntentionMapper.deleteByBuildingId(buildingId);
+
+
         // 获取所有需要 保存 或者 修改
         List<TaBuildingIntention> taBuildingIntentions = tdBizEventsList.stream().filter(e -> e.getCheckbox()).map(e -> {
                 TaBuildingIntention taBuildingIntention = new TaBuildingIntention();