weiximei 5 年前
父节点
当前提交
ca4717cbed
共有 1 个文件被更改,包括 11 次插入11 次删除
  1. 11
    11
      src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

+ 11
- 11
src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java 查看文件

134
      */
134
      */
135
     private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
135
     private List<TaBuildingImg> getBuildingImg(String buildingId, String imgType) {
136
         //查询当前图片
136
         //查询当前图片
137
-        QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
138
-        BuildingImgQueryWrapper.eq("building_id", buildingId);
139
-        BuildingImgQueryWrapper.eq("img_type", imgType);
140
-        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(BuildingImgQueryWrapper);
137
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
138
+        buildingImgQueryWrapper.eq("building_id", buildingId);
139
+        buildingImgQueryWrapper.eq("img_type", imgType);
140
+        buildingImgQueryWrapper.orderByAsc("order_no");
141
+        List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
141
         return  buildingImg.size() > 0 ? buildingImg : null;
142
         return  buildingImg.size() > 0 ? buildingImg : null;
142
     }
143
     }
143
 
144
 
406
 
407
 
407
         // 视频封面图
408
         // 视频封面图
408
         String videoImage = object.getString("videoImage");
409
         String videoImage = object.getString("videoImage");
409
-        List<TaBuildingImg> videoImageList = JSONObject.parseArray(imgStr, TaBuildingImg.class);
410
+        List<TaBuildingImg> videoImageList = JSONObject.parseArray(videoImage, TaBuildingImg.class);
410
         if (CollectionUtils.isNotEmpty(videoImageList)) {
411
         if (CollectionUtils.isNotEmpty(videoImageList)) {
411
             videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
412
             videoImageList = insertImgBatch(videoImageList, building.getBuildingId());
412
         }
413
         }
748
         buildingApartmentQueryWrapper.eq("apartment_id", id);
749
         buildingApartmentQueryWrapper.eq("apartment_id", id);
749
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
750
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
750
 
751
 
751
-        TaBuilding  building= new TaBuilding();
752
+//        TaBuilding  building= new TaBuilding();
752
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
753
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
753
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
754
         buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
754
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
755
-
756
-        if (bui.getStatus().equals(1)){
757
-            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
758
-        }
755
+//        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
756
+//        if (bui.getStatus().equals(1)){
757
+//            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
758
+//        }
759
 
759
 
760
         buildingApartment.setStatus(-1);
760
         buildingApartment.setStatus(-1);
761
        taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);
761
        taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);