Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents into dev

# Conflicts:
#	src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java

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

@@ -79,7 +79,7 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/taHousingResources", method = RequestMethod.POST)
-    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
+    public ResponseBean taHousingResourcesAdd(@RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taHousingResources.setOrgId(getOrgId(request));
@@ -133,7 +133,7 @@ public class TaHousingResourcesController extends BaseController {
      */
     @RequestMapping(value = "/admin/taHousingResources/{id}", method = RequestMethod.PUT)
     public ResponseBean taHousingResourcesUpdate(@PathVariable Integer id,
-                                                 @RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
+                                                 @RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taHousingResources.setHouseId(id);
@@ -152,7 +152,7 @@ public class TaHousingResourcesController extends BaseController {
      * 修改户型
      */
     @RequestMapping(value = "/admin/house/changeApartment", method = RequestMethod.PUT)
-    public ResponseBean houseApartment(@RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
+    public ResponseBean houseApartment(@RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             List<TaHousingResources> houseIdList = taHousingResources.getHouseIdList();
@@ -190,20 +190,23 @@ public class TaHousingResourcesController extends BaseController {
     /**
      * 获取房源列表
      *
-     * @param pageNum      页码
-     * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
+     * @param startPrice   房源起始价格
+     * @param endPrice     房源结束价格
+     * @param apartmentId  户型ID
+     * @param request
      * @return
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
-    public ResponseBean listHousingResources(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
-                                             @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                             @RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId) {
+    public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
+                                             String startPrice, String endPrice, String apartmentId,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(pageNum, pageSize, salesBatchId, startPrice, endPrice, apartmentId));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId));
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -211,6 +214,28 @@ public class TaHousingResourcesController extends BaseController {
         return responseBean;
     }
 
+    /**
+     * 获取房源列表-后台管理端
+     *
+     * @param salesBatchId 销售批次ID
+     * @return
+     * @author gushaoyong
+     */
+    @RequestMapping(value = "/admin/listHousingResources", method = RequestMethod.GET)
+    public ResponseBean listHousingResourcesFormCms(@RequestParam(value = "salesBatchId") String salesBatchId,
+                                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+
+        try {
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, "", "", ""));
+        } catch (Exception e) {
+            logger.error("listHousingResourcesFormCms -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 获取某销售批次下所有房源户型
      *
@@ -239,7 +264,8 @@ public class TaHousingResourcesController extends BaseController {
      */
     @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.GET)
     public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
-                                             @RequestParam(value = "personId") String personId) {
+                                             @RequestParam(value = "personId") String personId,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaHousingResourcesService.getHousingDetailById(personId, houseId));
@@ -257,7 +283,7 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/admin/house/checked", method = RequestMethod.PUT)
-    public ResponseBean houseChecked(@RequestBody TaHousingResources taHousingResources,HttpServletRequest request) {
+    public ResponseBean houseChecked(@RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taHousingResources.setOrgId(getOrgId(request));

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

@@ -71,11 +71,12 @@ public class TaPreselectionRecordController extends BaseController {
      * @author gushaoyong
      */
     @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.POST)
-    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord) {
+    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord,HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-
+        Integer orgId = getOrgId(request);
         logger.info("taPreselectionRecordAdd 接收参数，taPreselectionRecord：{}", JSONObject.toJSONString(taPreselectionRecord));
 
+        taPreselectionRecord.setOrgId(orgId);
         try {
 
             // 校验参数
@@ -194,47 +195,29 @@ public class TaPreselectionRecordController extends BaseController {
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean listPreselectionRecord(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               @RequestParam("personId") String personId) {
+                                               @RequestParam("personId") String personId,
+                                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
-        try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, personId));
-        } catch (Exception e) {
-            logger.error("listPreselectionRecord -=- {}", e);
-            responseBean.addError(e.getMessage());
-        }
-        return responseBean;
-    }
+        Integer orgId = getOrgId(request);
 
-    /**
-     * 校验用户是否已经预选该房源
-     *
-     * @param personId 用户ID
-     * @param houseId  房源ID
-     * @return
-     * @author gushaoyong
-     */
-    @RequestMapping(value = "/wx/checkPreselect", method = RequestMethod.POST)
-    public ResponseBean checkPreselect(@RequestParam("personId") String personId,
-                                       @RequestParam("houseId") String houseId) {
-        ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.checkPreselect(personId, houseId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, orgId, personId));
         } catch (Exception e) {
-            logger.error("checkPreselect -=- {}", e);
+            logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
     @RequestMapping(value = "/admin/taPreselectRecord", method = RequestMethod.GET)
-    public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                                  @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
-                                                  @RequestParam(value = "salesBatchId")String salesBatchId,
-                                                  @RequestParam(value = "houseId", required = false)Integer houseId,
+    public ResponseBean selectPreSelectRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                                  @RequestParam(value = "salesBatchId") String salesBatchId,
+                                                  @RequestParam(value = "houseId", required = false) Integer houseId,
                                                   @RequestParam(value = "phone", required = false) String phone,
                                                   @RequestParam(value = "apartmentId", required = false) String apartmentId,
                                                   @RequestParam(value = "status", required = false) Integer status,
-                                                  HttpServletRequest request){
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, houseId, getOrgId(request), phone, apartmentId, status);

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

@@ -26,14 +26,13 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
     /**
      * 分页获取房源列表
      *
-     * @param iPage
      * @param salesBatchId
      * @param startPrice
      * @param endPrice
      * @param apartmentId
      * @return
      */
-    IPage<TaHousingResourcesPO> listHousingResources(IPage<TaHousingResourcesPO> iPage,
+    List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
                                                      @Param("salesBatchId") String salesBatchId,
                                                      @Param("startPrice") String startPrice,
                                                      @Param("endPrice") String endPrice,

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

@@ -30,7 +30,9 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage, @Param("personId") String personId);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
+                                                         @Param("orgId") Integer orgId,
+                                                         @Param("personId") String personId);
 
     /**
      * 根据房源ID和用户ID获取预选记录

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

@@ -19,11 +19,6 @@ import java.util.List;
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
 
-    /**
-     * 户型名称
-     */
-    private String apartmentName;
-
     private Double insideArea;
 
     private Double buildingArea;
@@ -54,4 +49,7 @@ public class TaHousingResourcesPO extends TaHousingResources {
      */
     @TableField(exist = false)
     private List<TaBuildingImg> buildingImgList;
+
+    @TableField(exist = false)
+    private String termName;
 }

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

@@ -83,4 +83,14 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      * 最后修改人
      */
     private String updateName;
+
+    /**
+     * 房源状态
+     */
+    private String housingStatus;
+
+    /**
+     * 销售批次装填
+     */
+    private String saleBatchStatus;
 }

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

@@ -22,15 +22,13 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /* 分页获取房源列表
      *
-     * @param pageNum      页码
-     * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
      * @param startPrice
      * @param endPrice
      * @param apartmentId
      * @return
      */
-    IPage<TaHousingResourcesPO> listHousingResources(Integer pageNum, Integer pageSize, String salesBatchId, String startPrice, String endPrice, String apartmentId);
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -43,14 +41,15 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
     /**
      * 根据房源ID获取房源详情
      *
-     * @param personId
-     * @param houseId
+     * @param personId 用户ID
+     * @param houseId  房源ID
      * @return
      */
-    TaHousingResourcesPO getHousingDetailById(String personId,String houseId);
+    TaHousingResourcesPO getHousingDetailById(String personId, String houseId);
 
     /**
      * 校验楼栋信息存不存在
+     *
      * @param taHousingResources
      * @return
      */
@@ -58,6 +57,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 添加楼栋信息
+     *
      * @param taHousingResources
      * @return
      */
@@ -65,6 +65,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 分页获取房源信息
+     *
      * @param salesBatchId
      * @param buildingId
      * @param pageNumber
@@ -84,6 +85,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 更新房源信息
+     *
      * @param taHousingResources
      * @return
      */
@@ -91,6 +93,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 获取表格中的数据
+     *
      * @param file
      * @param salesBatchId
      * @param buildingId

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

@@ -21,10 +21,11 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      *
      * @param pageNum
      * @param pageSize
+     * @param orgId
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, String personId);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId);
 
     /**
      * 添加预选记录预选

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

@@ -66,7 +66,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     @Autowired
     private TaBuildingRoomMapper taBuildingRoomMapper;
-    
+
     @Autowired
     private TaBuildingMapper taBuildingMapper;
 
@@ -83,8 +83,6 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     /**
      * 分页获取房源列表
      *
-     * @param pageNum      页码
-     * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
      * @param startPrice
      * @param endPrice
@@ -92,12 +90,14 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      * @return
      */
     @Override
-    public IPage<TaHousingResourcesPO> listHousingResources(Integer pageNum, Integer pageSize, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
-        logger.info("listHousingResources 接收参数：pageNum：{},pageSize：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
-                pageNum, pageSize, salesBatchId, startPrice, endPrice, apartmentId);
+    public List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId) {
+        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+
+        List<TaHousingResourcesPO> resourcesPOList =
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId);
 
-        IPage<TaHousingResourcesPO> iPage = new Page<>(pageNum, pageSize);
-        return taHousingResourcesMapper.listHousingResources(iPage, salesBatchId, startPrice, endPrice, apartmentId);
+        return resourcesPOList;
     }
 
     /**
@@ -167,7 +167,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
         List<TaApartmentImg> buildingImg;
         QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
-        QueryWrapper<TaApartmentImg>  apartmentImgQueryWrapper = new QueryWrapper<>();
+        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
         apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
         buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
         for (TaApartmentImg apartmentImg : buildingImg) {
@@ -176,7 +176,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
             taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
         }
-        if(CollectionUtils.isNotEmpty(taBuildingImgList)){
+        if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
             resourcesPO.setBuildingImgList(taBuildingImgList);
         }
 
@@ -194,19 +194,19 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         StringBuffer result = new StringBuffer();
         //校验期
         String termResult = checckedTerm(taHousingResources);
-        result.append(termResult.equals("notExist") ? "期名" + taHousingResources.getTermName() + "不存在,会直接新建。" : termResult );
+        result.append(termResult.equals("notExist") ? "期名" + taHousingResources.getTermName() + "不存在,会直接新建。" : termResult);
         //校验栋
         String blockResult = checkedBlock(taHousingResources);
-        result.append(blockResult.equals("notExist") ? "楼栋名" + taHousingResources.getBlockName() + "不存在,会直接新建。" : blockResult );
+        result.append(blockResult.equals("notExist") ? "楼栋名" + taHousingResources.getBlockName() + "不存在,会直接新建。" : blockResult);
         //校验单元
         String unitResult = checkedUnit(taHousingResources);
-        result.append(unitResult.equals("notExist") ? "单元名" + taHousingResources.getUnitName() + "不存在,会直接新建。" : unitResult );
+        result.append(unitResult.equals("notExist") ? "单元名" + taHousingResources.getUnitName() + "不存在,会直接新建。" : unitResult);
         //校验楼层
         String floorResult = checkedFloor(taHousingResources);
-        result.append(floorResult.equals("notExist") ? "楼层名" + taHousingResources.getFloorName() + "不存在,会直接新建。" : floorResult );
+        result.append(floorResult.equals("notExist") ? "楼层名" + taHousingResources.getFloorName() + "不存在,会直接新建。" : floorResult);
         //校验房号
         String roomResult = checkedRoom(taHousingResources);
-        result.append(roomResult.equals("notExist") ? "房号" + taHousingResources.getRoomName() + "不存在,会直接新建。" : roomResult );
+        result.append(roomResult.equals("notExist") ? "房号" + taHousingResources.getRoomName() + "不存在,会直接新建。" : roomResult);
         return result;
     }
 
@@ -230,35 +230,35 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         String roomResult = checkedRoom(taHousingResources);
 
         //创建期
-        if (!roomResult.equals("notExist")){
-            return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！",ResponseBean.ERROR_UNAVAILABLE);
+        if (!roomResult.equals("notExist")) {
+            return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         //期不存在就添加
-        if (termResult.equals("notExist")){
+        if (termResult.equals("notExist")) {
             addTerm(taHousingResources);
         }
 
         //楼栋不存在就添加
-        if (blockResult.equals("notExist")){
+        if (blockResult.equals("notExist")) {
             addBlock(taHousingResources);
         }
 
         //单元不存在就添加
-        if (unitResult.equals("notExist")){
+        if (unitResult.equals("notExist")) {
             addUnit(taHousingResources);
         }
 
         //楼层不存在就添加
-        if (floorResult.equals("notExist")){
+        if (floorResult.equals("notExist")) {
             addFloor(taHousingResources);
         }
 
         //房间号不存在就添加
-        if (roomResult.equals("notExist")){
+        if (roomResult.equals("notExist")) {
             addRoom(taHousingResources);
         }
-        
+
         // 获取楼盘名称
         TaBuilding taBuilding = taBuildingMapper.selectById(taHousingResources.getBuildingId());
         taHousingResources.setBuildingName(taBuilding.getBuildingName());
@@ -317,15 +317,15 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         taHousingResources.setFloorId(oldTaHousingResources.getFloorId());
         taHousingResources.setRoomId(oldTaHousingResources.getRoomId());
         //只允许编辑房间名
-        if (!oldTaHousingResources.getRoomName().equals(taHousingResources.getRoomName())){
+        if (!oldTaHousingResources.getRoomName().equals(taHousingResources.getRoomName())) {
             //校验房号
             String roomResult = checkedRoom(taHousingResources);
 
             //房间号不存在就更新
-            if (roomResult.equals("notExist")){
+            if (roomResult.equals("notExist")) {
                 updateRoom(taHousingResources);
-            }else{
-                return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！",ResponseBean.ERROR_UNAVAILABLE);
+            } else {
+                return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！", ResponseBean.ERROR_UNAVAILABLE);
             }
 
         }
@@ -390,32 +390,32 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 Integer heat = Integer.valueOf(String.valueOf(row.getCell(6).getNumericCellValue()).substring(0,1));
                 Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
 
-                int currentRow = j+1;
-                if (StringUtils.isEmpty(termName)){
+                int currentRow = j + 1;
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(termName)) {
                     responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(blockName)){
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(blockName)) {
                     responseBean.addError("第" + currentRow + "行" + "楼栋不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(unitName)){
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(unitName)) {
                     responseBean.addError("第" + currentRow + "行" + "单元不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(floorName)){
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(floorName)) {
                     responseBean.addError("第" + currentRow + "行" + "层不能为空!");
                     return responseBean;
                 }
-                if (StringUtils.isEmpty(roomName)){
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(roomName)) {
                     responseBean.addError("第" + currentRow + "行" + "房号不能为空!");
                     return responseBean;
                 }
 
                 String houseInfo = termName + blockName + unitName + floorName + roomName;
-                if (temHousingList.contains(houseInfo)){
-                    logger.info("存在重复房源:{}",houseInfo);
-                    responseBean.addError("第"+ currentRow +"行存在重复房源");
+                if (temHousingList.contains(houseInfo)) {
+                    logger.info("存在重复房源:{}", houseInfo);
+                    responseBean.addError("第" + currentRow + "行存在重复房源");
                     return responseBean;
                 }
 
@@ -451,9 +451,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
             }
         }
         //构建分页
-        Map<String,Object> data = new HashMap<String, Object>();
-        data.put("list",list);
-        data.put("total",list.size());
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("list", list);
+        data.put("total", list.size());
 
         responseBean.addSuccess(data);
         return responseBean;
@@ -605,15 +605,15 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     //校验房号
     private String checkedRoom(TaHousingResources taHousingResources) {
-        if (StringUtils.isEmpty(taHousingResources.getRoomName())){
+        if (StringUtils.isEmpty(taHousingResources.getRoomName())) {
             return "请输入房号。";
-        }else{
+        } else {
             //查询房号
             TaBuildingRoom taBuildingRoom = selectRoom(taHousingResources);
-            if (null != taBuildingRoom){
+            if (null != taBuildingRoom) {
                 taHousingResources.setRoomId(taBuildingRoom.getRoomId());
                 return "房间名" + taHousingResources.getRoomName() + "存在。不允许保存，请修改！";
-            }else{
+            } else {
                 return "notExist";
             }
         }
@@ -622,35 +622,35 @@ 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());
+        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())){
+        if (StringUtils.isEmpty(taHousingResources.getFloorName())) {
             return "请输入楼层名。";
-        }else{
+        } 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());
+            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){
+            if (null != taBuildingFloor) {
                 taHousingResources.setFloorId(taBuildingFloor.getFloorId());
                 return "楼层名" + taHousingResources.getFloorName() + "存在。";
-            }else{
+            } else {
                 return "notExist";
             }
         }
@@ -658,21 +658,21 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     //校验单元
     private String checkedUnit(TaHousingResources taHousingResources) {
-        if (StringUtils.isEmpty(taHousingResources.getUnitName())){
+        if (StringUtils.isEmpty(taHousingResources.getUnitName())) {
             return "请输入单元名。";
-        }else{
+        } 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());
+            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){
+            if (null != taBuildingUnit) {
                 taHousingResources.setUnitId(taBuildingUnit.getUnitId());
                 return "单元名" + taHousingResources.getUnitName() + "存在。";
-            }else{
+            } else {
                 return "notExist";
             }
         }
@@ -680,20 +680,20 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     //校验楼盘
     private String checkedBlock(TaHousingResources taHousingResources) {
-        if (StringUtils.isEmpty(taHousingResources.getBlockName())){
+        if (StringUtils.isEmpty(taHousingResources.getBlockName())) {
             return "请输入楼栋名。";
-        }else{
+        } 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());
+            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){
+            if (null != taBuildingBlock) {
                 taHousingResources.setBlockId(taBuildingBlock.getBlockId());
                 return "楼栋名" + taHousingResources.getBlockName() + "存在。";
-            }else{
+            } else {
                 return "notExist";
             }
         }
@@ -701,19 +701,19 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
     //校验期
     private String checckedTerm(TaHousingResources taHousingResources) {
-        if (StringUtils.isEmpty(taHousingResources.getTermName())){
+        if (StringUtils.isEmpty(taHousingResources.getTermName())) {
             return "请输入期名。";
-        }else{
+        } 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());
+            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){
+            if (null != taBuildingTerm) {
                 taHousingResources.setTermId(taBuildingTerm.getTermId());
                 return "期名" + taHousingResources.getTermName() + "存在。";
-            }else{
+            } else {
                 return "notExist";
             }
         }

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

@@ -56,11 +56,11 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     TaApartmentImgMapper taApartmentImgMapper;
 
     @Override
-    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, String personId) {
-        logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，personId：{}", pageNum, pageSize, personId);
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId) {
+        logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, personId);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
         if (CollectionUtils.isNotEmpty(poList)) {
@@ -79,8 +79,8 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
                     buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
                     taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
                     po.setBuildingImgList(taBuildingImgList);
-                    resultList.add(po);
                 }
+                resultList.add(po);
             }
             iPage.setRecords(resultList);
         }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -3,6 +3,10 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaHousingResourcesMapper">
 
     <select id="listHousingResources" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
+        SELECT
+          *
+        FROM
+          (
         SELECT
             t.house_id,
             t.building_id,
@@ -17,27 +21,38 @@
             t.room_name,
             t.price,
             t.heat,
+            t.real_heat,
             t.apartment_id,
             t.`status`,
             t.org_id,
             t2.inside_area,
             t2.building_area,
-            t2.apartment_name
+            t2.apartment_name,
+            t3.term_id,
+            t4.term_name termName
         FROM
-            ta_housing_resources t,
-            ta_building_apartment t2
+          ta_housing_resources t
+        LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
+        LEFT JOIN ta_building_block t3 ON t.block_id = t3.block_id
+        LEFT JOIN ta_building_term t4 ON t3.term_id = t4.term_id
         WHERE
             t.sales_batch_id = #{salesBatchId}
-        <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
-            AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
-        </if>
-        <if test="apartmentId != null and apartmentId != ''">
-            AND t.apartment_id = #{apartmentId}
-        </if>
-        AND t.apartment_id = t2.apartment_id
-        AND t.`status` = 1
-        AND t2.`status` = 1
-        ORDER BY t.create_date DESC
+            <if test="startPrice != null and startPrice != '' and endPrice != null and endPrice != ''">
+                AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+            </if>
+            <if test="apartmentId != null and apartmentId != ''">
+                AND t.apartment_id = #{apartmentId}
+            </if>
+            AND t.org_id = #{orgId}
+            AND t.`status` = 1
+            AND t2.`status` = 1
+          ) t5
+        ORDER BY
+            t5.termName,
+            t5.block_name,
+            t5.unit_name,
+            t5.floor_name DESC,
+            t5.room_name
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
@@ -56,48 +71,49 @@
 
     <update id="updateForAddHeat" parameterType="java.lang.String">
         UPDATE ta_housing_resources t
-        SET t.heat = t.heat + 1
+        SET t.real_heat = t.real_heat + 1
         WHERE
             t.house_id = #{houseId}
-            AND t.heat >= 0
+            AND t.real_heat >= 0
     </update>
 
     <update id="updateForSubtractHeat" parameterType="java.lang.String">
         UPDATE ta_housing_resources t
-        SET t.heat = t.heat - 1
+        SET t.real_heat = t.real_heat - 1
         WHERE
             t.house_id = #{houseId}
-            AND t.heat > 0
+            AND t.real_heat > 0
     </update>
 
     <select id="getHousingDetailById" resultType="com.huiju.estateagents.po.TaHousingResourcesPO">
         SELECT
-        t.house_id,
-        t.building_id,
-        t.block_id,
-        t.block_name,
-        t.sales_batch_id,
-        t.unit_id,
-        t.unit_name,
-        t.floor_id,
-        t.floor_name,
-        t.room_id,
-        t.room_name,
-        t.price,
-        t.heat,
-        t.apartment_id,
-        t.`status`,
-        t.org_id,
-        t2.apartment_name,
-        t2.inside_area,
-        t2.building_area,
-        t3.preselection_start_time,
-        t3.preselection_end_time,
-        t3.`status` saleBatchStatus
+            t.house_id,
+            t.building_id,
+            t.block_id,
+            t.block_name,
+            t.sales_batch_id,
+            t.unit_id,
+            t.unit_name,
+            t.floor_id,
+            t.floor_name,
+            t.room_id,
+            t.room_name,
+            t.price,
+            t.heat,
+            t.real_heat,
+            t.apartment_id,
+            t.`status`,
+            t.org_id,
+            t2.apartment_name,
+            t2.inside_area,
+            t2.building_area,
+            t3.preselection_start_time,
+            t3.preselection_end_time,
+            t3.`status` saleBatchStatus
         FROM
-        ta_housing_resources t,
-        ta_building_apartment t2,
-        ta_sales_batch t3
+            ta_housing_resources t,
+            ta_building_apartment t2,
+            ta_sales_batch t3
         WHERE
         t.house_id = #{houseId}
         AND t.apartment_id = t2.apartment_id

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -5,28 +5,38 @@
     <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
         SELECT
             t3.*,
-            t4.building_name
+            t4.building_name,
+            t5.`status` saleBatchStatus
         FROM
             (
         SELECT
-            t.*,
+            t.preselection_record_id,
+            t.person_id,
+            t.org_id,
+            t.house_id,
+            t.`status`,
+            t.create_date,
             t2.block_name,
             t2.unit_name,
             t2.floor_name,
             t2.room_name,
             t2.price,
             t2.apartment_id,
-            t2.building_id buildingId
+            t2.building_id buildingId,
+            t2.`status` housingStatus,
+            t2.sales_batch_id saleBatchId
         FROM
             ta_preselection_record t,
             ta_housing_resources t2
         WHERE
             t.person_id = #{personId}
+            AND t.org_id = #{orgId}
             AND t.house_id = t2.house_id
         ORDER BY
             t.create_date DESC
             ) t3
             LEFT JOIN ta_building t4 ON t3.buildingId = t4.building_id
+            LEFT JOIN ta_sales_batch t5 ON t3.saleBatchId = t5.sales_batch_id
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">