update

whole-estate/src/main/java/com/example/wholeestate/dao/BuildingImgMapper.java

@@ -17,4 +17,6 @@ import java.util.List;
  */
 public interface BuildingImgMapper extends BaseMapper<BuildingImg> {
     List<BuildingImg> getBuildingImgByApartment(@Param("id") String id);
+
+    int delBuildingImgByApartment(@Param("id") String id);
 }

whole-estate/src/main/java/com/example/wholeestate/model/Building.java

@@ -94,6 +94,11 @@ public class Building implements Serializable {
      */
     private  String code;
 
+    /**
+     * 备注
+     */
+    private  String remark;
+
     /**
      * 图片
      */

whole-estate/src/main/java/com/example/wholeestate/model/BuildingApartment.java

@@ -32,6 +32,8 @@ public class BuildingApartment implements Serializable {
 
     private String apartmentName;
 
+    private String apartmentType;
+
     private String remark;
 
     private Integer status;

whole-estate/src/main/java/com/example/wholeestate/service/impl/BuildingServiceImpl.java

@@ -306,11 +306,12 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //转集合
         List<BuildingImg> buildingImgs = JSONObject.parseArray(imgStr, BuildingImg.class);
         //插入户型图片删除之前的图片
-        QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
-        BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
-        BuildingImgQueryWrapper.eq("img_type", "aparment");
-
-        buildingImgMapper.delete(BuildingImgQueryWrapper);
+        buildingImgMapper.delBuildingImgByApartment(building.getApartmentId());
+//        QueryWrapper<BuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
+//        BuildingImgQueryWrapper.eq("building_id", building.getApartmentId());
+//        BuildingImgQueryWrapper.eq("img_type", "aparment");
+//
+//        buildingImgMapper.delete(BuildingImgQueryWrapper);
         //删除户户型对应图片表
         QueryWrapper<ApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
         apartmentImgQueryWrapper.eq("apartment_id", building.getApartmentId());

whole-estate/src/main/resources/mapper/BuildingImgMapper.xml

@@ -5,4 +5,8 @@
       select a.* from ta_building_img a inner join ta_apartment_img b on a.img_id = b.img_id
       where a.status = 1 and b.status=1 and b.apartment_id = #{id}
     </select>
+
+    <delete id="delBuildingImgByApartment" >
+        delete a from ta_building_img a inner join ta_apartment_img b on a.img_id=b.img_id where b.apartment_id=#{id}
+    </delete>
 </mapper>