新需求

src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java

@@ -2,7 +2,10 @@ package com.huiju.estateagents.controller;
 
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingRoom;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -28,6 +31,8 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     public ITaHousingResourcesService iTaHousingResourcesService;
 
+    @Autowired
+    private ITaBuildingRoomService taBuildingRoomService;
 
     /**
      * 分页查询列表
@@ -47,7 +52,7 @@ public class TaHousingResourcesController extends BaseController {
                                                @RequestParam(value = "unitName", required = false) String unitName,
                                                @RequestParam(value = "floorName", required = false) String floorName,
                                                @RequestParam(value = "roomName", required = false) String roomName,
-                                               @RequestParam(value = "apartmentId", required = false) Integer apartmentId,
+                                               @RequestParam(value = "apartmentId", required = false) String apartmentId,
                                                @RequestParam(value = "status", required = false) Integer status,
                                                @RequestParam(value = "houseId", required = false) String houseId,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
@@ -90,11 +95,20 @@ public class TaHousingResourcesController extends BaseController {
      * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.DELETE)
+    @RequestMapping(value = "/admin/houseDelete/{id}", method = RequestMethod.DELETE)
     public ResponseBean taHousingResourcesDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.removeById(id)) {
+            TaHousingResources taHousingResources = new TaHousingResources();
+            taHousingResources.setHouseId(id);
+            taHousingResources.setStatus(CommConstant.STATUS_DELETE);
+            if (iTaHousingResourcesService.updateById(taHousingResources)) {
+                //删除房号
+                TaHousingResources housingResources = iTaHousingResourcesService.getById(id);
+                TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+                taBuildingRoom.setRoomId(housingResources.getRoomId());
+                taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
+                taBuildingRoomService.updateById(taBuildingRoom);
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -114,16 +128,15 @@ public class TaHousingResourcesController extends BaseController {
      * @param taHousingResources 实体对象
      * @return
      */
-    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taHousingResources/{id}", method = RequestMethod.PUT)
     public ResponseBean taHousingResourcesUpdate(@PathVariable Integer id,
-                                                 @RequestBody TaHousingResources taHousingResources) {
+                                                 @RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.updateById(taHousingResources)) {
-                responseBean.addSuccess(taHousingResources);
-            } else {
-                responseBean.addError("fail");
-            }
+            taHousingResources.setHouseId(id);
+            taHousingResources.setUpdateUser(getUserId(request));
+            taHousingResources.setOrgId(getOrgId(request));
+            responseBean = iTaHousingResourcesService.updateHouseResources(taHousingResources);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesUpdate -=- {}", e.toString());

src/main/java/com/huiju/estateagents/entity/TaBuildingBlock.java

@@ -63,7 +63,7 @@ public class TaBuildingBlock implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingFloor.java

@@ -73,7 +73,7 @@ public class TaBuildingFloor implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingRoom.java

@@ -78,7 +78,7 @@ public class TaBuildingRoom implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingTerm.java

@@ -58,7 +58,7 @@ public class TaBuildingTerm implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

src/main/java/com/huiju/estateagents/entity/TaBuildingUnit.java

@@ -68,7 +68,7 @@ public class TaBuildingUnit implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

src/main/java/com/huiju/estateagents/entity/TaHousingResources.java

@@ -143,7 +143,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
     private Integer updateUser;
 

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

@@ -92,5 +92,5 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
     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") Integer apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
+                                                   @Param("apartmentId") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
 }

src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java

@@ -79,5 +79,12 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param houseId
      * @return
      */
-    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, Integer apartmentId, Integer status, String houseId);
+    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId);
+
+    /**
+     * 更新房源信息
+     * @param taHousingResources
+     * @return
+     */
+    ResponseBean updateHouseResources(TaHousingResources taHousingResources);
 }

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

@@ -275,7 +275,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @return
      */
     @Override
-    public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, Integer apartmentId, Integer status, String houseId) {
+    public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId) {
         IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
         IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
         List<TaHousingResources> records = pageData.getRecords();
@@ -290,6 +290,85 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         return ResponseBean.success(pageData);
     }
 
+    /**
+     * 更新房源信息
+     *
+     * @param taHousingResources
+     * @return
+     */
+    @Override
+    public ResponseBean updateHouseResources(TaHousingResources taHousingResources) {
+        TaHousingResources oldTaHousingResources = taHousingResourcesMapper.selectById(taHousingResources.getHouseId());
+        taHousingResources.setTermId(oldTaHousingResources.getTermId());
+        taHousingResources.setBlockId(oldTaHousingResources.getBlockId());
+        taHousingResources.setUnitId(oldTaHousingResources.getUnitId());
+        taHousingResources.setFloorId(oldTaHousingResources.getFloorId());
+        taHousingResources.setRoomId(oldTaHousingResources.getRoomId());
+        //只允许编辑房间名
+        if (!oldTaHousingResources.getRoomName().equals(taHousingResources.getRoomName())){
+            //校验房号
+            String roomResult = checkedRoom(taHousingResources);
+
+            //房间号不存在就更新
+            if (roomResult.equals("notExist")){
+                updateRoom(taHousingResources);
+            }else{
+                return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！",ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+        }
+
+        //添加房源信息
+        taHousingResources.setUpdateDate(LocalDateTime.now());
+        taHousingResourcesMapper.updateById(taHousingResources);
+        return ResponseBean.success(taHousingResources);
+    }
+
+    //更新房号
+    private void updateRoom(TaHousingResources taHousingResources) {
+        TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+        taBuildingRoom.setUpdateDate(LocalDateTime.now());
+        taBuildingRoom.setTermId(taHousingResources.getTermId());
+        taBuildingRoom.setBlockId(taHousingResources.getBlockId());
+        taBuildingRoom.setUnitId(taHousingResources.getUnitId());
+        taBuildingRoom.setFloorId(taHousingResources.getFloorId());
+        taBuildingRoom.setRoomName(taHousingResources.getRoomName());
+        taBuildingRoom.setRoomId(taHousingResources.getRoomId());
+        taBuildingRoomMapper.updateById(taBuildingRoom);
+    }
+
+    //更新楼层
+    private void updateFloor(TaHousingResources taHousingResources) {
+        TaBuildingFloor taBuildingFloor = new TaBuildingFloor();
+        taBuildingFloor.setUpdateDate(LocalDateTime.now());
+        taBuildingFloor.setTermId(taHousingResources.getTermId());
+        taBuildingFloor.setBlockId(taHousingResources.getBlockId());
+        taBuildingFloor.setUnitId(taHousingResources.getUnitId());
+        taBuildingFloor.setFloorName(taHousingResources.getFloorName());
+        taBuildingFloorMapper.updateById(taBuildingFloor);
+    }
+
+    //更新单元
+    private void updateUnit(TaHousingResources taHousingResources) {
+        TaBuildingUnit taBuildingUnit = new TaBuildingUnit();
+        taBuildingUnit.setUpdateDate(LocalDateTime.now());
+        taBuildingUnit.setTermId(taHousingResources.getTermId());
+        taBuildingUnit.setBlockId(taHousingResources.getBlockId());
+        taBuildingUnit.setUnitName(taHousingResources.getUnitName());
+        taBuildingUnit.setUnitId(taHousingResources.getUnitId());
+        taBuildingUnitMapper.updateById(taBuildingUnit);
+    }
+
+    //更新栋
+    private void updataBlock(TaHousingResources taHousingResources) {
+        TaBuildingBlock taBuildingBlock = new TaBuildingBlock();
+        taBuildingBlock.setUpdateDate(LocalDateTime.now());
+        taBuildingBlock.setTermId(taHousingResources.getTermId());
+        taBuildingBlock.setBlockName(taHousingResources.getBlockName());
+        taBuildingBlock.setBlockId(taHousingResources.getBlockId());
+        taBuildingBlockMapper.updateById(taBuildingBlock);
+    }
+
     //添加房间号
     private void addRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
@@ -365,16 +444,8 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         if (StringUtils.isEmpty(taHousingResources.getRoomName())){
             return "请输入房号。";
         }else{
-            QueryWrapper<TaBuildingRoom> queryWrapper = new QueryWrapper<>();
-            queryWrapper.eq("org_id",taHousingResources.getOrgId());
-            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
-            queryWrapper.eq("building_id",taHousingResources.getBuildingId());
-            queryWrapper.eq("term_id",taHousingResources.getTermId());
-            queryWrapper.eq("block_id",taHousingResources.getBlockId());
-            queryWrapper.eq("unit_id",taHousingResources.getUnitId());
-            queryWrapper.eq("floor_id",taHousingResources.getFloorId());
-            queryWrapper.eq("room_name",taHousingResources.getRoomName());
-            TaBuildingRoom taBuildingRoom = taBuildingRoomMapper.selectOne(queryWrapper);
+            //查询房号
+            TaBuildingRoom taBuildingRoom = selectRoom(taHousingResources);
             if (null != taBuildingRoom){
                 taHousingResources.setRoomId(taBuildingRoom.getRoomId());
                 return "房间名" + taHousingResources.getRoomName() + "存在。不允许保存，请修改！";
@@ -384,6 +455,20 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         }
     }
 
+    //查询房间号
+    private TaBuildingRoom selectRoom(TaHousingResources taHousingResources) {
+        QueryWrapper<TaBuildingRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id",taHousingResources.getOrgId());
+        queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        queryWrapper.eq("building_id",taHousingResources.getBuildingId());
+        queryWrapper.eq("term_id",taHousingResources.getTermId());
+        queryWrapper.eq("block_id",taHousingResources.getBlockId());
+        queryWrapper.eq("unit_id",taHousingResources.getUnitId());
+        queryWrapper.eq("floor_id",taHousingResources.getFloorId());
+        queryWrapper.eq("room_name",taHousingResources.getRoomName());
+        return taBuildingRoomMapper.selectOne(queryWrapper);
+    }
+
     //校验楼层
     private String checkedFloor(TaHousingResources taHousingResources) {
         if (StringUtils.isEmpty(taHousingResources.getFloorName())){

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -118,7 +118,7 @@
             ta_housing_resources t
         LEFT JOIN ta_building_apartment a ON t.apartment_id = a.apartment_id
         LEFT JOIN ta_user u on t.update_user = u.user_id
-        WHERE t.`status` > 0
+        WHERE t.`status` > -1
         AND t.org_id = #{orgId}
         and t.building_id = #{buildingId}
         and t.sales_batch_id = #{salesBatchId}