* 新增接口

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
@@ -67,12 +68,14 @@ public class TaHousingResourcesController extends BaseController {
                                                @RequestParam(value = "apartmentId", required = false) String apartmentId,
                                                @RequestParam(value = "status", required = false) Integer status,
                                                @RequestParam(value = "houseId", required = false) String houseId,
+                                               @RequestParam(value = "lockingStatus", required = false) String lockingStatus,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName,
+                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -414,4 +417,52 @@ public class TaHousingResourcesController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 根据认筹记录查询房源列表
+     *
+     * @param pageNumber
+     * @param pageSize
+     * @param raiseRecordId
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/listHouseByRaiseRecordId", method = RequestMethod.GET)
+    public ResponseBean listHouseByRaiseRecordId(@RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                                 @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                 @RequestParam(value = "raiseRecordId") Integer raiseRecordId,
+                                                 HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.listHouseByRaiseRecordId(raiseRecordId, getOrgId(request), getPersonId(request), pageNumber, pageSize);
+            logger.info("listHouseByRaiseRecordId 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("listHouseByRaiseRecordId 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param houseId
+     * @param type         修改类型：lock为锁定房源，unlock为解锁房源
+     * @param raiseHouseId 认筹房源关系表ID, 接口‘/admin/house/listHouseByRaiseRecordId’ 有返回
+     * @param request
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/updateLockingStatus", method = RequestMethod.GET)
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer raiseHouseId,
+                                            HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, raiseHouseId, getOrgId(request), getPersonId(request));
+            logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
+        } catch (Exception e) {
+            logger.error("updateLockingStatus 异常：", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -12,16 +12,19 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDateTime;
+
 /**
  * <p>
-    * 认筹单与房源关系表  前端控制器
-    * </p>
+ * 认筹单与房源关系表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-26
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaRaiseHouseController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaRaiseHouseController.class);
@@ -32,25 +35,26 @@ public class TaRaiseHouseController extends BaseController {
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taRaiseHouse",method= RequestMethod.GET)
-    public ResponseBean taRaiseHouseList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value = "/taRaiseHouse", method = RequestMethod.GET)
+    public ResponseBean taRaiseHouseList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaRaiseHouse> pg = new Page<>(pageNum, pageSize);
+            IPage<TaRaiseHouse> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRaiseHouse> queryWrapper = new QueryWrapper<>();
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRaiseHouse> result = iTaRaiseHouseService.page(pg, queryWrapper);
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseHouseList -=- {}",e.toString());
+            logger.error("taRaiseHouseList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -58,21 +62,25 @@ public class TaRaiseHouseController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taRaiseHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaiseHouse",method= RequestMethod.POST)
-    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse){
+    @RequestMapping(value = "/admin/taRaiseHouse", method = RequestMethod.POST)
+    public ResponseBean taRaiseHouseAdd(@RequestBody TaRaiseHouse taRaiseHouse, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRaiseHouseService.save(taRaiseHouse)){
+            taRaiseHouse.setOrgId(getOrgId(request));
+            taRaiseHouse.setCreateDate(LocalDateTime.now());
+
+            if (iTaRaiseHouseService.save(taRaiseHouse)) {
                 responseBean.addSuccess(taRaiseHouse);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseHouseAdd -=- {}",e.toString());
+            logger.error("taRaiseHouseAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -80,21 +88,22 @@ public class TaRaiseHouseController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/taRaiseHouse/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taRaiseHouseDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taRaiseHouseDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaRaiseHouseService.removeById(id)){
+            if (iTaRaiseHouseService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseHouseDelete -=- {}",e.toString());
+            logger.error("taRaiseHouseDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -102,23 +111,24 @@ public class TaRaiseHouseController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id           实体ID
      * @param taRaiseHouse 实体对象
      * @return
      */
-    @RequestMapping(value="/taRaiseHouse/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.PUT)
     public ResponseBean taRaiseHouseUpdate(@PathVariable Integer id,
-                                        @RequestBody TaRaiseHouse taRaiseHouse){
+                                           @RequestBody TaRaiseHouse taRaiseHouse) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaRaiseHouseService.updateById(taRaiseHouse)){
+            if (iTaRaiseHouseService.updateById(taRaiseHouse)) {
                 responseBean.addSuccess(taRaiseHouse);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseHouseUpdate -=- {}",e.toString());
+            logger.error("taRaiseHouseUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -126,16 +136,17 @@ public class TaRaiseHouseController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/taRaiseHouse/{id}",method= RequestMethod.GET)
-    public ResponseBean taRaiseHouseGet(@PathVariable Integer id){
+    @RequestMapping(value = "/taRaiseHouse/{id}", method = RequestMethod.GET)
+    public ResponseBean taRaiseHouseGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaRaiseHouseService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taRaiseHouseDelete -=- {}",e.toString());
+            logger.error("taRaiseHouseDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -14,7 +14,7 @@ import java.util.List;
 
 /**
  * <p>
- * 认筹单(认筹记录表) 
+ * 认筹单(认筹记录表)
  * </p>
  *
  * @author jobob
@@ -144,6 +144,18 @@ public class TaRaiseRecord implements Serializable {
     @TableField(exist = false)
     private String personTel;
 
+    /**
+     * 用户昵称
+     */
+    @TableField(exist = false)
+    private String nickname;
+
+    /**
+     * 用户头像
+     */
+    @TableField(exist = false)
+    private String avatarurl;
+
     /**
      * 支付时间
      */
@@ -175,19 +187,19 @@ public class TaRaiseRecord implements Serializable {
     private String totalFee;
 
     /**
-     *  小程序端提交的房源的id的集合
+     * 小程序端提交的房源的id的集合
      */
     @TableField(exist = false)
     private List<Integer> houseList = new ArrayList<>();
 
     /**
-     *  房源信息列表
+     * 房源信息列表
      */
     @TableField(exist = false)
-    private List<TaHousingResources> taHousingResourcesList= new ArrayList<>();
+    private List<TaHousingResources> taHousingResourcesList = new ArrayList<>();
 
     /**
-     *  认筹单列表
+     * 认筹单列表
      */
     @TableField(exist = false)
     private List<TaRaiseRecord> taRaiseRecords;
@@ -197,4 +209,10 @@ public class TaRaiseRecord implements Serializable {
      */
     @TableField(exist = false)
     private Integer taHousingResourcesSize;
+
+    /**
+     * 户型名称
+     */
+    @TableField(exist = false)
+    private String apartmentName;
 }

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

@@ -92,12 +92,13 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      * @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,
+                                                   @Param("lockingStatus") String lockingStatus);
 
-    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 
     /**
      * 批量更新房源认筹基础认读
@@ -112,4 +113,26 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                  @Param("raiseHeat") Integer raiseHeat,
                                  @Param("salesBatchId") Integer salesBatchId,
                                  @Param("orgId") Integer orgId);
+
+    /**
+     * 根据认筹单ID查询房源列表
+     *
+     * @param pg
+     * @param raiseRecordId
+     * @param orgId
+     * @return
+     */
+    IPage<TaHousingResourcesPO> listHouseByRaiseRecordId(IPage<TaHousingResourcesPO> pg,
+                                                         @Param("raiseRecordId") Integer raiseRecordId,
+                                                         @Param("orgId") Integer orgId);
+
+    /**
+     * 根据认筹房源关联表ID查询房源信息
+     *
+     * @param orgId
+     * @param raiseHouseId
+     * @return
+     */
+    TaHousingResourcesPO getHouseByRaiseHouseId(@Param("orgId") Integer orgId,
+                                                @Param("raiseHouseId") Integer raiseHouseId);
 }

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

@@ -6,7 +6,6 @@ import com.huiju.estateagents.bo.request.HousingRaiseRequestBO;
 import com.huiju.estateagents.bo.request.RaiseOrderRequestBO;
 import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.entity.TaRaiseRecord;
-import com.huiju.estateagents.po.TaHousingResourcesPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
@@ -32,7 +31,7 @@ public interface TaRaiseRecordMapper extends BaseMapper<TaRaiseRecord> {
      * @param bo
      * @return
      */
-    IPage<TaHousingResourcesPO> listHousingRaiseByCondition(IPage<TaHousingResourcesPO> page,
+    IPage<TaRaiseRecord> listHousingRaiseByCondition(IPage<TaRaiseRecord> page,
                                                             @Param("bo") HousingRaiseRequestBO bo);
 
     /**

src/main/java/com/huiju/estateagents/po/TaHousingResourcesPO.java

@@ -54,20 +54,54 @@ public class TaHousingResourcesPO extends TaHousingResources {
     /**
      * 楼盘名称
      */
+    @TableField(exist = false)
     private String buildingName;
 
     /**
      * 我的预选
      */
+    @TableField(exist = false)
     private String minePreselection;
 
     /**
      * 我的认筹
      */
+    @TableField(exist = false)
     private String mineRaise;
 
     /**
      * 我的锁定
      */
+    @TableField(exist = false)
     private String mineLocked;
+
+    /**
+     * 锁定人ID
+     */
+    @TableField(exist = false)
+    private String lockingPersonId;
+
+    /**
+     * 锁定人姓名
+     */
+    @TableField(exist = false)
+    private String lockingPersonName;
+
+    /**
+     * 认筹房源关系表Id
+     */
+    @TableField(exist = false)
+    private String raiseHouseId;
+
+    /**
+     * 是否展示锁定按钮 true展示
+     */
+    @TableField(exist = false)
+    private Boolean showLocking;
+
+    /**
+     * 是否展示解锁按钮 true展示
+     */
+    @TableField(exist = false)
+    private Boolean showUnLocking;
 }

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

@@ -82,7 +82,8 @@ 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, String 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, String lockingStatus);
 
     /**
      * 更新房源信息
@@ -123,5 +124,28 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param orgId
      * @return
      */
-    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList,Integer raiseHeat, Integer salesBatchId, Integer orgId);
+    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId);
+
+    /**
+     * 根据认筹记录查询房源信息
+     *
+     * @param raiseRecordId
+     * @param orgId
+     * @param personId
+     * @param pageNumber
+     * @param pageSize
+     * @return
+     */
+    ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize);
+
+    /**
+     * 更新房源锁定状态
+     *
+     * @param houseId
+     * @param type
+     * @param orgId
+     * @param personId
+     * @return
+     */
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId);
 }

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

@@ -16,6 +16,7 @@ import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.BuildingImgPO;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaPersonService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.ss.usermodel.Row;
@@ -86,6 +87,12 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    private TaPersonServiceImpl taPersonService;
+
+    @Autowired
+    private TaRaiseHouseServiceImpl taRaiseHouseService;
+
 
     /**
      * 分页获取房源列表
@@ -328,9 +335,11 @@ 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, String 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, String lockingStatus) {
         IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
-        IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
+        IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName,
+                floorName, roomName, apartmentId, status, houseId, lockingStatus);
         return ResponseBean.success(pageData);
     }
 
@@ -559,6 +568,111 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         return responseBean;
     }
 
+    @Override
+    public ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, String personId, Integer pageNumber, Integer pageSize) {
+        logger.info("listHouseByRaiseRecordId 接收参数：raiseRecordId:{},orgId:{},personId:{},pageNumber:{},pageSize:{}",
+                raiseRecordId, orgId, personId, pageNumber, pageSize);
+
+        ResponseBean responseBean = new ResponseBean();
+        IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
+        taHousingResourcesMapper.listHouseByRaiseRecordId(pg, raiseRecordId, orgId);
+        if (CollectionUtils.isEmpty(pg.getRecords())) {
+            responseBean.addSuccess(pg);
+            return responseBean;
+        }
+
+        pg.getRecords().stream().forEach(record -> {
+            if (StringUtils.isEmpty(record.getLockingPersonId()) && "unlocked".equals(record.getHouseLockingStatus())) {
+                record.setShowLocking(true);
+            } else {
+                record.setShowLocking(false);
+            }
+
+            if (personId.equals(record.getLockingPersonId()) && "locked".equals(record.getHouseLockingStatus())) {
+                record.setShowUnLocking(true);
+            } else {
+                record.setShowUnLocking(false);
+            }
+        });
+
+        responseBean.addSuccess(pg);
+        return responseBean;
+    }
+
+    @Override
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId) {
+        logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
+                houseId, type, orgId, raiseHouseId, personId);
+        ResponseBean responseBean = new ResponseBean();
+
+        // 获取房源信息
+        TaHousingResourcesPO po = taHousingResourcesMapper.getHouseByRaiseHouseId(orgId, raiseHouseId);
+        if (po == null) {
+            responseBean.addError("未找到该房源");
+            return responseBean;
+        }
+
+        QueryWrapper<TaPerson> personQueryWrapper = new QueryWrapper<>();
+        personQueryWrapper.eq("person_id", personId);
+        TaPerson person = taPersonService.getOne(personQueryWrapper);
+        if (person == null) {
+            responseBean.addError("权限不足");
+            return responseBean;
+        }
+
+        // 更新为锁定状态
+        if ("lock".equals(type)) {
+
+            // 校验当前用户是否有修改权限
+            if (StringUtils.isEmpty(po.getLockingPersonId()) && "unlocked".equals(po.getHouseLockingStatus())) {
+                // 更行房源表状态
+                TaHousingResources housingResources = new TaHousingResources();
+                housingResources.setHouseId(po.getHouseId());
+                housingResources.setHouseLockingStatus("locked");
+                housingResources.setUpdateDate(LocalDateTime.now());
+                updateById(housingResources);
+
+                // 更新关联表状态
+                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+                raiseHouse.setRaiseHouseId(raiseHouseId);
+                raiseHouse.setHouseLockingStatus("locked");
+                raiseHouse.setPersonId(personId);
+                raiseHouse.setPersonName(person.getName());
+                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+                return responseBean;
+            }
+            responseBean.addError("无权操作");
+            return responseBean;
+        }
+
+        // 更新为解锁状态
+        if ("unlock".equals(type)) {
+
+            // 校验当前用户是否有修改权限
+            if (personId.equals(po.getLockingPersonId()) && "locked".equals(po.getHouseLockingStatus())) {
+                // 更新房源表状态
+                TaHousingResources housingResources = new TaHousingResources();
+                housingResources.setHouseId(po.getHouseId());
+                housingResources.setHouseLockingStatus("unlocked");
+                housingResources.setUpdateDate(LocalDateTime.now());
+                updateById(housingResources);
+
+                // 更新关联表状态
+                TaRaiseHouse raiseHouse = new TaRaiseHouse();
+                raiseHouse.setRaiseHouseId(raiseHouseId);
+                raiseHouse.setHouseLockingStatus("unlocked");
+                raiseHouse.setPersonId("");
+                raiseHouse.setPersonName("");
+                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
+                return responseBean;
+            }
+            responseBean.addError("无权操作");
+            return responseBean;
+        }
+        responseBean.addError("fail");
+        return responseBean;
+    }
+
     //更新房号
     private void updateRoom(TaHousingResources taHousingResources) {
         TaBuildingRoom taBuildingRoom = new TaBuildingRoom();

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

@@ -11,7 +11,6 @@ import com.huiju.estateagents.bo.request.RaiseRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.*;
 import com.huiju.estateagents.mapper.*;
-import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaRaiseRecordService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -57,7 +56,7 @@ public class TaRaiseRecordServiceImpl extends ServiceImpl<TaRaiseRecordMapper, T
         logger.info("TaRaiseRecordServiceImpl.listRaiseRecordByCondition 接收参数：bo:{},pageNumber:{},pageSize:{}", JSONObject.toJSONString(requestBO), pageNumber, pageSize);
 
         ResponseBean responseBean = new ResponseBean();
-        IPage<TaHousingResourcesPO> pg = new Page<>(pageNumber, pageSize);
+        IPage<TaRaiseRecord> pg = new Page<>(pageNumber, pageSize);
         responseBean.addSuccess(taRaiseRecordMapper.listHousingRaiseByCondition(pg, requestBO));
         return responseBean;
     }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -212,6 +212,9 @@
         <if test="roomName != null and roomName != ''">
             AND t.room_name like CONCAT('%',#{roomName}, '%')
         </if>
+        <if test="lockingStatus != null and lockingStatus != ''">
+            AND t.house_locking_status = #{lockingStatus}
+        </if>
     </select>
 
     <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">
@@ -233,4 +236,35 @@
         </foreach>
     </update>
 
+    <select id="listHouseByRaiseRecordId" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+            t.*,
+            t2.raise_house_id,
+            t2.person_id lockingPersonId,
+            t2.person_name lockingPersonName
+        FROM
+            ta_housing_resources t
+            LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+        WHERE
+            t.org_id = #{orgId}
+            AND t.`status` != - 1
+            AND t2.raise_record_id = #{raiseRecordId}
+        GROUP BY
+            t.create_date DESC
+    </select>
+
+    <select id="getHouseByRaiseHouseId" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+            t.*,
+            t2.person_id lockingPersonId,
+            t2.person_name lockingPersonName
+        FROM
+            ta_housing_resources t
+            LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
+        WHERE
+            t2.raise_house_id = #{raiseHouseId}
+            AND t2.org_id = #{orgId}
+            AND t.`status` != -1
+    </select>
+
 </mapper>

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -61,7 +61,9 @@
             t3.room_name,
             t3.apartment_id,
             t4.apartment_name,
-            t5.tel personTel
+            t5.tel personTel,
+            t5.nickname,
+            t5.avatarurl
         FROM
             ta_raise_record t
             LEFT JOIN ta_raise_house t2 ON t.raise_record_id = t2.raise_record_id
@@ -120,6 +122,8 @@
         <if test = "bo.endTime != null and bo.endTime != ''">
             AND t.create_date &lt;= STR_TO_DATE(#{bo.endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
+        GROUP BY
+            t2.raise_record_id
         ORDER BY
           t.create_date DESC
     </select>