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

# Conflicts:
#	src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java

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

 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
      * @param houseId
      * @return
      */
-    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg, @Param("salesBatchId") Integer salesBatchId, @Param("buildingId") String buildingId,
-                                                   @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
-                                                   @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
-                                                   @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId);
+    IPage<TaHousingResources> getHouseResourceList(IPage<TaHousingResources> pg,@Param("salesBatchId") Integer salesBatchId,@Param("buildingId") String buildingId,
+                                                   @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
+                                                   @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
+                                                   @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
+
+    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 }

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

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaPoster;
-import com.huiju.estateagents.entity.TaSalesBatch;
-import com.huiju.estateagents.entity.TaShareContent;
-import com.huiju.estateagents.entity.TdPosterTemplate;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
 import org.apache.commons.collections.CollectionUtils;
 import org.checkerframework.checker.units.qual.A;
     @Autowired
     private TaPosterServiceImpl taPosterService;
 
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+
+    @Autowired
+    private ITaBuildingRoomService taBuildingRoomService;
+
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
             responseBean.addError("已有用户预选，请先删除预选记录。");
             return responseBean;
         }
+        //无预选状态下删除销售批次的同时删除房源信息
+        List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
+        List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
+        housingList.forEach(e -> {
+            TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+            taBuildingRoom.setRoomId(e.getRoomId());
+            taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
+            taBuildingRoomList.add(taBuildingRoom);
+        });
+        taBuildingRoomService.updateBatchById(taBuildingRoomList);
+
+        //删除销售批次
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
         return responseBean;
     }

src/main/resources/mapper/TaHousingResourcesMapper.xml

         </if>
     </select>
 
+    <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">
+        select * from ta_housing_resources where org_id = #{orgId} and sales_batch_id in
+        <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+            #{taSalesBatch.salesBatchId}
+        </foreach>
+    </select>
+
 </mapper>