新需求

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

@@ -1,11 +1,26 @@
 package com.huiju.estateagents.controller;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingApartment;
+import com.huiju.estateagents.entity.TaBuildingBlock;
+import com.huiju.estateagents.service.ITaBuildingApartmentService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.huiju.estateagents.base.BaseController;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 项目户型表 前端控制器
@@ -18,4 +33,39 @@ import com.huiju.estateagents.base.BaseController;
 @RequestMapping("/api")
 public class TaBuildingApartmentController extends BaseController {
 
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingApartmentController.class);
+    @Autowired
+    private ITaBuildingApartmentService taBuildingApartmentService;
+
+    /**
+     * author fxf
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/admin/apartmentList",method= RequestMethod.GET)
+    public ResponseBean getApartmentList(@RequestParam(value ="buildingId") String buildingId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+            IPage<TaBuildingApartment> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingApartment> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("apartment_type",CommConstant.APARTMENT_TYPR_APART);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingApartment> result = taBuildingApartmentService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("getApartmentList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -42,12 +42,20 @@ public class TaHousingResourcesController extends BaseController {
     @RequestMapping(value = "/admin/taHousingResources", method = RequestMethod.GET)
     public ResponseBean taHousingResourcesList(@RequestParam(value = "salesBatchId", required = true) Integer salesBatchId,
                                                @RequestParam(value = "buildingId", required = true) String buildingId,
+                                               @RequestParam(value = "termName", required = false) String termName,
+                                               @RequestParam(value = "blockName", required = false) String blockName,
+                                               @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 = "status", required = false) Integer status,
+                                               @RequestParam(value = "houseId", required = false) String houseId,
                                                @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));
+            responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -62,15 +70,12 @@ public class TaHousingResourcesController extends BaseController {
      * @param taHousingResources 实体对象
      * @return
      */
-    @RequestMapping(value = "/taHousingResources", method = RequestMethod.POST)
-    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources) {
+    @RequestMapping(value = "/admin/taHousingResources", method = RequestMethod.POST)
+    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.save(taHousingResources)) {
-                responseBean.addSuccess(taHousingResources);
-            } else {
-                responseBean.addError("fail");
-            }
+            taHousingResources.setOrgId(getOrgId(request));
+            responseBean = iTaHousingResourcesService.addHouseResources(taHousingResources);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesAdd -=- {}", e.toString());
@@ -132,7 +137,7 @@ public class TaHousingResourcesController extends BaseController {
      *
      * @param id 实体ID
      */
-    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/taHousingResources/{id}", method = RequestMethod.GET)
     public ResponseBean taHousingResourcesGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -204,4 +209,25 @@ public class TaHousingResourcesController extends BaseController {
         }
         return responseBean;
     }
+
+
+    /**
+     * 校验房源是否合格
+     *
+     * @return
+     */
+    @RequestMapping(value = "/admin/house/checked", method = RequestMethod.PUT)
+    public ResponseBean houseChecked(@RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            taHousingResources.setOrgId(getOrgId(request));
+            StringBuffer result = iTaHousingResourcesService.checked(taHousingResources);
+            responseBean.addSuccess(result);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -48,7 +48,7 @@ public class TaBuildingBlock implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -58,7 +58,7 @@ public class TaBuildingFloor implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -63,7 +63,7 @@ public class TaBuildingRoom implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -43,7 +43,7 @@ public class TaBuildingTerm implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -53,7 +53,7 @@ public class TaBuildingUnit implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.entity;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -37,6 +38,11 @@ public class TaHousingResources implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
     /**
      * 楼栋 与楼盘区分
      */
@@ -50,7 +56,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 销售批次id
      */
-    private String salesBatchId;
+    private Integer salesBatchId;
 
     /**
      * 单元id
@@ -75,7 +81,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 房号id
      */
-    private String roomId;
+    private Integer roomId;
 
     /**
      * 房间名称
@@ -122,7 +128,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id

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

@@ -72,4 +72,25 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     TaHousingResourcesPO getHousingDetailById(@Param("houseId") String houseId,
                                               @Param("type") String type);
+
+    /**
+     * 分页获取数据
+     * @param pg
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @param termName
+     * @param blockName
+     * @param unitName
+     * @param floorName
+     * @param roomName
+     * @param apartmentId
+     * @param status
+     * @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") Integer apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
 }

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

@@ -19,17 +19,6 @@ import java.util.List;
  */
 public interface ITaHousingResourcesService extends IService<TaHousingResources> {
 
-    /**
-     * 分页获取房源详情数据
-     * @param salesBatchId
-     * @param buildingId
-     * @param pageNumber
-     * @param pageSize
-     * @param orgId
-     * @return
-     */
-    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId);
-
     /* 分页获取房源列表
      *
      * @param pageNum      页码
@@ -58,4 +47,37 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     TaHousingResourcesPO getHousingDetailById(String personId,String houseId);
+
+    /**
+     * 校验楼栋信息存不存在
+     * @param taHousingResources
+     * @return
+     */
+    StringBuffer checked(TaHousingResources taHousingResources);
+
+    /**
+     * 添加楼栋信息
+     * @param taHousingResources
+     * @return
+     */
+    ResponseBean addHouseResources(TaHousingResources taHousingResources);
+
+    /**
+     * 分页获取房源信息
+     * @param salesBatchId
+     * @param buildingId
+     * @param pageNumber
+     * @param pageSize
+     * @param orgId
+     * @param termName
+     * @param blockName
+     * @param unitName
+     * @param floorName
+     * @param roomName
+     * @param apartmentId
+     * @param status
+     * @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);
 }

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

@@ -6,10 +6,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.common.CommConstant;
-import com.huiju.estateagents.entity.TaBuildingApartment;
-import com.huiju.estateagents.entity.TaBuildingBlock;
-import com.huiju.estateagents.entity.TaHousingResources;
-import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
 import org.slf4j.Logger;
@@ -17,6 +16,7 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -35,31 +35,27 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
 
-    /**
-     * 分页获取房源详情数据
-     *
-     * @param salesBatchId
-     * @param buildingId
-     * @param pageNumber
-     * @param pageSize
-     * @param orgId
-     * @return
-     */
-    @Override
-    public ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId) {
-        //使用分页插件
-        IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
-        QueryWrapper<TaHousingResources> queryWrapper = new QueryWrapper<>();
-        //销售批次id
-        queryWrapper.eq("sales_batch_id", salesBatchId);
-        queryWrapper.eq("building_id", buildingId);
-        queryWrapper.eq("org_id", orgId);
-        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
-        queryWrapper.orderByDesc("create_date");
-        IPage<TaHousingResources> list = this.page(pg, queryWrapper);
+    @Autowired
+    private TaBuildingTermMapper taBuildingTermMapper;
+
+    @Autowired
+    private TaBuildingBlockMapper taBuildingBlockMapper;
+
+    @Autowired
+    private TaBuildingUnitMapper taBuildingUnitMapper;
+
+    @Autowired
+    private TaBuildingFloorMapper taBuildingFloorMapper;
+
+    @Autowired
+    private TaBuildingRoomMapper taBuildingRoomMapper;
+    
+    @Autowired
+    private TaBuildingMapper taBuildingMapper;
+
+    @Autowired
+    private TaPreselectionRecordMapper taPreselectionRecordMapper;
 
-        return ResponseBean.success(list);
-    }
 
     /**
      * 分页获取房源列表
@@ -107,4 +103,303 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         return taHousingResourcesMapper.getHousingDetailById(houseId, "1");
     }
+
+    /**
+     * 校验楼栋信息存不存在
+     *
+     * @param taHousingResources
+     * @return
+     */
+    @Override
+    public StringBuffer checked(TaHousingResources taHousingResources) {
+        StringBuffer result = new StringBuffer();
+        //校验期
+        String termResult = checckedTerm(taHousingResources);
+        result.append(termResult.equals("notExist") ? "期名" + taHousingResources.getTermName() + "不存在,会直接新建。" : termResult );
+        //校验栋
+        String blockResult = checkedBlock(taHousingResources);
+        result.append(blockResult.equals("notExist") ? "楼栋名" + taHousingResources.getBlockName() + "不存在,会直接新建。" : blockResult );
+        //校验单元
+        String unitResult = checkedUnit(taHousingResources);
+        result.append(unitResult.equals("notExist") ? "单元名" + taHousingResources.getUnitName() + "不存在,会直接新建。" : unitResult );
+        //校验楼层
+        String floorResult = checkedFloor(taHousingResources);
+        result.append(floorResult.equals("notExist") ? "楼层名" + taHousingResources.getFloorName() + "不存在,会直接新建。" : floorResult );
+        //校验房号
+        String roomResult = checkedRoom(taHousingResources);
+        result.append(roomResult.equals("notExist") ? "房号" + taHousingResources.getRoomName() + "不存在,会直接新建。" : roomResult );
+        return result;
+    }
+
+    /**
+     * 添加楼栋信息
+     *
+     * @param taHousingResources
+     * @return
+     */
+    @Override
+    public ResponseBean addHouseResources(TaHousingResources taHousingResources) {
+        //校验期
+        String termResult = checckedTerm(taHousingResources);
+        //校验栋
+        String blockResult = checkedBlock(taHousingResources);
+        //校验单元
+        String unitResult = checkedUnit(taHousingResources);
+        //校验楼层
+        String floorResult = checkedFloor(taHousingResources);
+        //校验房号
+        String roomResult = checkedRoom(taHousingResources);
+
+        //创建期
+        if (!roomResult.equals("notExist")){
+            return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！",ResponseBean.ERROR_UNAVAILABLE);
+        }
+
+        //期不存在就添加
+        if (termResult.equals("notExist")){
+            addTerm(taHousingResources);
+        }
+
+        //楼栋不存在就添加
+        if (blockResult.equals("notExist")){
+            addBlock(taHousingResources);
+        }
+
+        //单元不存在就添加
+        if (unitResult.equals("notExist")){
+            addUnit(taHousingResources);
+        }
+
+        //楼层不存在就添加
+        if (floorResult.equals("notExist")){
+            addFloor(taHousingResources);
+        }
+
+        //房间号不存在就添加
+        if (roomResult.equals("notExist")){
+            addRoom(taHousingResources);
+        }
+        
+        // 获取楼盘名称
+        TaBuilding taBuilding = taBuildingMapper.selectById(taHousingResources.getBuildingId());
+        taHousingResources.setBuildingName(taBuilding.getBuildingName());
+        //添加房源信息
+        taHousingResources.setCreateDate(LocalDateTime.now());
+        taHousingResourcesMapper.insert(taHousingResources);
+        return ResponseBean.success(taHousingResources);
+    }
+
+    /**
+     * 分页获取房源信息
+     *
+     * @param salesBatchId
+     * @param buildingId
+     * @param pageNumber
+     * @param pageSize
+     * @param orgId
+     * @param termName
+     * @param blockName
+     * @param unitName
+     * @param floorName
+     * @param roomName
+     * @param apartmentId
+     * @param status
+     * @param houseId
+     * @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) {
+        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();
+        records.forEach(e -> {
+            QueryWrapper<TaPreselectionRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("org_id", e.getOrgId());
+            queryWrapper.eq("house_id", e.getHouseId());
+            List<TaPreselectionRecord> taPreselectionRecords = taPreselectionRecordMapper.selectList(queryWrapper);
+            e.setRealHeat(taPreselectionRecords.size());
+        });
+        return ResponseBean.success(pageData);
+    }
+
+    //添加房间号
+    private void addRoom(TaHousingResources taHousingResources) {
+        TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+        taBuildingRoom.setBuildingId(taHousingResources.getBuildingId());
+        taBuildingRoom.setCreateDate(LocalDateTime.now());
+        taBuildingRoom.setOrgId(taHousingResources.getOrgId());
+        taBuildingRoom.setStatus(CommConstant.STATUS_NORMAL);
+        taBuildingRoom.setTermId(taHousingResources.getTermId());
+        taBuildingRoom.setBlockId(taHousingResources.getBlockId());
+        taBuildingRoom.setUnitId(taHousingResources.getUnitId());
+        taBuildingRoom.setFloorId(taHousingResources.getFloorId());
+        taBuildingRoom.setRoomName(taHousingResources.getRoomName());
+        taBuildingRoomMapper.insert(taBuildingRoom);
+        taHousingResources.setRoomId(taBuildingRoom.getRoomId());
+    }
+
+    //添加楼层
+    private void addFloor(TaHousingResources taHousingResources) {
+        TaBuildingFloor taBuildingFloor = new TaBuildingFloor();
+        taBuildingFloor.setBuildingId(taHousingResources.getBuildingId());
+        taBuildingFloor.setCreateDate(LocalDateTime.now());
+        taBuildingFloor.setOrgId(taHousingResources.getOrgId());
+        taBuildingFloor.setStatus(CommConstant.STATUS_NORMAL);
+        taBuildingFloor.setTermId(taHousingResources.getTermId());
+        taBuildingFloor.setBlockId(taHousingResources.getBlockId());
+        taBuildingFloor.setUnitId(taHousingResources.getUnitId());
+        taBuildingFloor.setFloorName(taHousingResources.getFloorName());
+        taBuildingFloorMapper.insert(taBuildingFloor);
+        taHousingResources.setFloorId(taBuildingFloor.getFloorId());
+    }
+
+    //添加单元
+    private void addUnit(TaHousingResources taHousingResources) {
+        TaBuildingUnit taBuildingUnit = new TaBuildingUnit();
+        taBuildingUnit.setBuildingId(taHousingResources.getBuildingId());
+        taBuildingUnit.setCreateDate(LocalDateTime.now());
+        taBuildingUnit.setOrgId(taHousingResources.getOrgId());
+        taBuildingUnit.setStatus(CommConstant.STATUS_NORMAL);
+        taBuildingUnit.setTermId(taHousingResources.getTermId());
+        taBuildingUnit.setBlockId(taHousingResources.getBlockId());
+        taBuildingUnit.setUnitName(taHousingResources.getUnitName());
+        taBuildingUnitMapper.insert(taBuildingUnit);
+        taHousingResources.setUnitId(taBuildingUnit.getUnitId());
+    }
+
+    //添加楼栋
+    private void addBlock(TaHousingResources taHousingResources) {
+        TaBuildingBlock taBuildingBlock = new TaBuildingBlock();
+        taBuildingBlock.setBuildingId(taHousingResources.getBuildingId());
+        taBuildingBlock.setCreateDate(LocalDateTime.now());
+        taBuildingBlock.setOrgId(taHousingResources.getOrgId());
+        taBuildingBlock.setStatus(CommConstant.STATUS_NORMAL);
+        taBuildingBlock.setTermId(taHousingResources.getTermId());
+        taBuildingBlock.setBlockName(taHousingResources.getBlockName());
+        taBuildingBlockMapper.insert(taBuildingBlock);
+        taHousingResources.setBlockId(taBuildingBlock.getBlockId());
+    }
+
+    //添加期
+    private void addTerm(TaHousingResources taHousingResources) {
+        TaBuildingTerm taBuildingTerm = new TaBuildingTerm();
+        taBuildingTerm.setBuildingId(taHousingResources.getBuildingId());
+        taBuildingTerm.setCreateDate(LocalDateTime.now());
+        taBuildingTerm.setOrgId(taHousingResources.getOrgId());
+        taBuildingTerm.setStatus(CommConstant.STATUS_NORMAL);
+        taBuildingTerm.setTermName(taHousingResources.getTermName());
+        taBuildingTermMapper.insert(taBuildingTerm);
+        taHousingResources.setTermId(taBuildingTerm.getTermId());
+    }
+
+    //校验房号
+    private String checkedRoom(TaHousingResources taHousingResources) {
+        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);
+            if (null != taBuildingRoom){
+                taHousingResources.setRoomId(taBuildingRoom.getRoomId());
+                return "房间名" + taHousingResources.getRoomName() + "存在。不允许保存，请修改！";
+            }else{
+                return "notExist";
+            }
+        }
+    }
+
+    //校验楼层
+    private String checkedFloor(TaHousingResources taHousingResources) {
+        if (StringUtils.isEmpty(taHousingResources.getFloorName())){
+            return "请输入楼层名。";
+        }else{
+            QueryWrapper<TaBuildingFloor> 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_name",taHousingResources.getFloorName());
+            TaBuildingFloor taBuildingFloor = taBuildingFloorMapper.selectOne(queryWrapper);
+            if (null != taBuildingFloor){
+                taHousingResources.setFloorId(taBuildingFloor.getFloorId());
+                return "楼层名" + taHousingResources.getFloorName() + "存在。";
+            }else{
+                return "notExist";
+            }
+        }
+    }
+
+    //校验单元
+    private String checkedUnit(TaHousingResources taHousingResources) {
+        if (StringUtils.isEmpty(taHousingResources.getUnitName())){
+            return "请输入单元名。";
+        }else{
+            QueryWrapper<TaBuildingUnit> 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_name",taHousingResources.getUnitName());
+            TaBuildingUnit taBuildingUnit = taBuildingUnitMapper.selectOne(queryWrapper);
+            if (null != taBuildingUnit){
+                taHousingResources.setUnitId(taBuildingUnit.getUnitId());
+                return "单元名" + taHousingResources.getUnitName() + "存在。";
+            }else{
+                return "notExist";
+            }
+        }
+    }
+
+    //校验楼盘
+    private String checkedBlock(TaHousingResources taHousingResources) {
+        if (StringUtils.isEmpty(taHousingResources.getBlockName())){
+            return "请输入楼栋名。";
+        }else{
+            QueryWrapper<TaBuildingBlock> 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_name",taHousingResources.getBlockName());
+            TaBuildingBlock taBuildingBlock = taBuildingBlockMapper.selectOne(queryWrapper);
+            if (null != taBuildingBlock){
+                taHousingResources.setBlockId(taBuildingBlock.getBlockId());
+                return "楼栋名" + taHousingResources.getBlockName() + "存在。";
+            }else{
+                return "notExist";
+            }
+        }
+    }
+
+    //校验期
+    private String checckedTerm(TaHousingResources taHousingResources) {
+        if (StringUtils.isEmpty(taHousingResources.getTermName())){
+            return "请输入期名。";
+        }else{
+            QueryWrapper<TaBuildingTerm> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",taHousingResources.getOrgId());
+            queryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("building_id",taHousingResources.getBuildingId());
+            queryWrapper.eq("term_name",taHousingResources.getTermName());
+            TaBuildingTerm taBuildingTerm = taBuildingTermMapper.selectOne(queryWrapper);
+            if (null != taBuildingTerm){
+                taHousingResources.setTermId(taBuildingTerm.getTermId());
+                return "期名" + taHousingResources.getTermName() + "存在。";
+            }else{
+                return "notExist";
+            }
+        }
+    }
 }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -109,4 +109,43 @@
         AND t2.`status` = 1
     </select>
 
+    <select id="getHouseResourceList" resultType="com.huiju.estateagents.entity.TaHousingResources">
+        SELECT
+            t.* ,
+            a.apartment_name,
+            u.user_name
+        FROM
+            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
+        AND t.org_id = #{orgId}
+        and t.building_id = #{buildingId}
+        and t.sales_batch_id = #{salesBatchId}
+        <if test="apartmentId != null and apartmentId != ''">
+            AND t.apartment_id = #{apartmentId}
+        </if>
+        <if test="status != null and status != ''">
+            AND t.status = #{status}
+        </if>
+        <if test="houseId != null and houseId != ''">
+            AND t.house_id like CONCAT('%',#{houseId}, '%')
+        </if>
+        <if test="termName != null and termName != ''">
+            AND t.term_name like CONCAT('%',#{termName}, '%')
+        </if>
+        <if test="blockName != null and blockName != ''">
+            AND t.block_name like CONCAT('%',#{blockName}, '%')
+        </if>
+        <if test="unitName != null and unitName != ''">
+            AND t.unit_name like CONCAT('%',#{unitName}, '%')
+        </if>
+        <if test="floorName != null and floorName != ''">
+            AND t.floor_name like CONCAT('%',#{floorName}, '%')
+        </if>
+        <if test="roomName != null and roomName != ''">
+            AND t.room_name like CONCAT('%',#{roomName}, '%')
+        </if>
+    </select>
+
 </mapper>