傅行帆 5 年前
父节点
当前提交
11973a8839

+ 3
- 0
src/main/java/com/huiju/estateagents/mapper/TaHousingResourcesMapper.java 查看文件

4
 import com.baomidou.mybatisplus.core.metadata.IPage;
4
 import com.baomidou.mybatisplus.core.metadata.IPage;
5
 import com.huiju.estateagents.entity.TaBuildingApartment;
5
 import com.huiju.estateagents.entity.TaBuildingApartment;
6
 import com.huiju.estateagents.entity.TaHousingResources;
6
 import com.huiju.estateagents.entity.TaHousingResources;
7
+import com.huiju.estateagents.entity.TaSalesBatch;
7
 import com.huiju.estateagents.po.TaHousingResourcesPO;
8
 import com.huiju.estateagents.po.TaHousingResourcesPO;
8
 import org.apache.ibatis.annotations.Mapper;
9
 import org.apache.ibatis.annotations.Mapper;
9
 import org.apache.ibatis.annotations.Param;
10
 import org.apache.ibatis.annotations.Param;
92
                                                    @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
93
                                                    @Param("orgId") Integer orgId,@Param("termName") String termName,@Param("blockName") String blockName,
93
                                                    @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
94
                                                    @Param("unitName") String unitName,@Param("floorName") String floorName,@Param("roomName") String roomName,
94
                                                    @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
95
                                                    @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
96
+
97
+    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
95
 }
98
 }

+ 21
- 4
src/main/java/com/huiju/estateagents/service/impl/TaSalesBatchServiceImpl.java 查看文件

6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
6
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
7
 import com.huiju.estateagents.base.ResponseBean;
7
 import com.huiju.estateagents.base.ResponseBean;
8
 import com.huiju.estateagents.common.CommConstant;
8
 import com.huiju.estateagents.common.CommConstant;
9
-import com.huiju.estateagents.entity.TaPoster;
10
-import com.huiju.estateagents.entity.TaSalesBatch;
11
-import com.huiju.estateagents.entity.TaShareContent;
12
-import com.huiju.estateagents.entity.TdPosterTemplate;
9
+import com.huiju.estateagents.entity.*;
10
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
13
 import com.huiju.estateagents.mapper.TaPosterMapper;
11
 import com.huiju.estateagents.mapper.TaPosterMapper;
14
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
12
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
13
+import com.huiju.estateagents.service.ITaBuildingRoomService;
15
 import com.huiju.estateagents.service.ITaSalesBatchService;
14
 import com.huiju.estateagents.service.ITaSalesBatchService;
16
 import org.apache.commons.collections.CollectionUtils;
15
 import org.apache.commons.collections.CollectionUtils;
17
 import org.checkerframework.checker.units.qual.A;
16
 import org.checkerframework.checker.units.qual.A;
53
     @Autowired
52
     @Autowired
54
     private TaPosterServiceImpl taPosterService;
53
     private TaPosterServiceImpl taPosterService;
55
 
54
 
55
+    @Autowired
56
+    private TaHousingResourcesMapper taHousingResourcesMapper;
57
+
58
+    @Autowired
59
+    private ITaBuildingRoomService taBuildingRoomService;
60
+
56
     @Override
61
     @Override
57
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
62
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
58
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
63
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
66
             responseBean.addError("已有用户预选,请先删除预选记录。");
71
             responseBean.addError("已有用户预选,请先删除预选记录。");
67
             return responseBean;
72
             return responseBean;
68
         }
73
         }
74
+        //无预选状态下删除销售批次的同时删除房源信息
75
+        List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
76
+        List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
77
+        housingList.forEach(e -> {
78
+            TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
79
+            taBuildingRoom.setRoomId(e.getRoomId());
80
+            taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
81
+            taBuildingRoomList.add(taBuildingRoom);
82
+        });
83
+        taBuildingRoomService.updateBatchById(taBuildingRoomList);
84
+
85
+        //删除销售批次
69
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
86
         taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
70
         return responseBean;
87
         return responseBean;
71
     }
88
     }

+ 7
- 0
src/main/resources/mapper/TaHousingResourcesMapper.xml 查看文件

204
         </if>
204
         </if>
205
     </select>
205
     </select>
206
 
206
 
207
+    <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">
208
+        select * from ta_housing_resources where org_id = #{orgId} and sales_batch_id in
209
+        <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
210
+            #{taSalesBatch.salesBatchId}
211
+        </foreach>
212
+    </select>
213
+
207
 </mapper>
214
 </mapper>