Merge branch 'dev'

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

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.huiju</groupId>
 	<artifactId>estateagents</artifactId>
-	<version>v3.5.8</version>
+	<version>v3.5.10</version>
 	<name>estateages</name>
 	<description>置业经纪人</description>
 

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -441,6 +441,7 @@ public class CommConstant {
 	public static final String TARGET_TYPE_H5 = "H5";
     public static final String ACTIVITY_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/checkin/index\"}";
     public static final String DRAINAGE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"pages/project/h5Page\"}";
+    public static final String HOUSE_QRCODE = "{\"scene\":\"id=#0&type=#1\",\"page\":\"onlineSelling/pages/houseList/index\"}";
     
     /**
      * 消息通知
@@ -517,6 +518,11 @@ public class CommConstant {
      */
     public static final String EVENT_H5 = "h5";
 
+    /**
+     * 房源分享
+     */
+    public static final String HOUSE = "house";
+
     /**
      * 系统参数  通知消息次时间间隔
      */
@@ -592,4 +598,10 @@ public class CommConstant {
      */
     public static final String PRICE_TYPE_AVERAGE = "average";
 
+    /**
+     * excel后缀
+     */
+    public static final String SUFFIX_2003 = ".xls";
+    public static final String SUFFIX_2007 = ".xlsx";
+
 }

src/main/java/com/huiju/estateagents/common/DateUtils.java

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.common;
 
+import java.time.Duration;
 import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
@@ -39,13 +40,68 @@ public class DateUtils {
     }
 
     public static boolean checkTimeRange(LocalDateTime start, LocalDateTime end, LocalDateTime dt) {
-        if(dt == null){
+        if (dt == null) {
             dt = LocalDateTime.now();
         }
 
-        if(dt.isAfter(start) && dt.isBefore(end)){
+        if (dt.isAfter(start) && dt.isBefore(end)) {
             return true;
         }
         return false;
     }
+
+    /**
+     * 当前时间是否早于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isBefore(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isBefore(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 当前时间是否晚于指定时间
+     *
+     * @param target
+     * @return
+     */
+    public static boolean isAfter(String target) {
+        LocalDateTime dt = LocalDateTime.now();
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        LocalDateTime targetTime = LocalDateTime.parse(target, df);
+        if (dt.isAfter(targetTime)) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取时间差
+     *
+     * @param dt1
+     * @param dt2 目标时间
+     * @return
+     */
+    public static String diffTime(LocalDateTime dt1, LocalDateTime dt2) {
+        Duration duration = Duration.between(dt1, dt2);
+        long minutes = duration.toMinutes();
+        int hours = (int) Math.floor(minutes / 60);
+        int minute = (int) minutes % 60;
+        int day = (int) Math.floor(hours / 24);
+        int hour = hours % 24;
+
+        return day + "天" + hour + "小时" + minute + "分钟";
+    }
+
+    public static LocalDateTime timeToLocalDateTime(String target){
+        DateTimeFormatter df = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        return LocalDateTime.parse(target, df);
+    }
 }

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

@@ -28,7 +28,7 @@ public class CommonController {
     ITdMiniappTemplateTypeService iTdMiniappTemplateTypeService;
 
     /**
-     * 图片上传
+     * 图片
      * @param multipartFile
      * @return
      */

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/TaBuildingBlockController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingBlock;
 import com.huiju.estateagents.service.ITaBuildingBlockService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 楼栋表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingBlockController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingBlockController.class);
@@ -31,19 +34,25 @@ public class TaBuildingBlockController extends BaseController {
 
 
     /**
+     * author fxf
      * 分页查询列表
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingBlock",method= RequestMethod.GET)
-    public ResponseBean taBuildingBlockList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingBlock",method= RequestMethod.GET)
+    public ResponseBean taBuildingBlockList(@RequestParam(value ="buildingId",required = true) String buildingId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                            HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingBlock> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingBlock> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingBlock> result = iTaBuildingBlockService.page(pg, queryWrapper);

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

@@ -64,6 +64,7 @@ public class TaBuildingController extends BaseController {
 
     /**
      * 楼盘详情
+     *
      * @param id
      * @return
      */
@@ -72,12 +73,13 @@ public class TaBuildingController extends BaseController {
     @ApiImplicitParams({
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id")
     })
-    public ResponseBean buildingSelectId(@PathVariable(value = "id") String id){
+    public ResponseBean buildingSelectId(@PathVariable(value = "id") String id) {
         return taBuildingService.buildingSelectId(id);
     }
 
     /**
      * 楼盘列表 查询所有有效的
+     *
      * @param pageNum
      * @param pageSize
      * @param name
@@ -97,21 +99,22 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
     })
     @GetMapping("/admin/buildinglist")
-    public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
-                                     @RequestParam(value = "name", required = false)String name,
-                                     @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
-                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
-                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
-                                     @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,
-                                     HttpServletRequest request){
-        return taBuildingService.buildingList(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain, getOrgId(request),getTaPersonBuildingListByUserId(request));
+    public ResponseBean buildingList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                     @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                     @RequestParam(value = "name", required = false) String name,
+                                     @RequestParam(value = "code", required = false) String code,
+                                     @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                     @RequestParam(value = "buildingStatus", required = false) String buildingStatus,
+                                     @RequestParam(value = "marketStatus", required = false) String marketStatus,
+                                     @RequestParam(value = "cityId", required = false) Integer cityId,
+                                     @RequestParam(value = "isMain", required = false) Integer isMain,
+                                     HttpServletRequest request) {
+        return taBuildingService.buildingList(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request));
     }
 
     /**
      * 楼盘列表
+     *
      * @param pageNum
      * @param pageSize
      * @param name
@@ -131,21 +134,22 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "query", name = "isMain", value = "是否主推项目"),
     })
     @GetMapping("/admin/buildinglist/select")
-    public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1")Integer pageNum,
-                                     @RequestParam(value = "pageSize", defaultValue = "10")Integer pageSize,
-                                     @RequestParam(value = "name", required = false)String name,
-                                     @RequestParam(value = "code", required = false)String code,
-                                     @RequestParam(value = "startDate",required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME)LocalDateTime startDate,
-                                     @RequestParam(value = "buildingStatus",required = false)String buildingStatus,
-                                     @RequestParam(value = "marketStatus",required = false)String marketStatus,
-                                     @RequestParam(value = "cityId",required = false)Integer cityId,
-                                     @RequestParam(value = "isMain",required = false)Integer isMain,
-                                           HttpServletRequest request){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getTaPersonBuildingListByUserId(request));
+    public ResponseBean buildingListSelect(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                           @RequestParam(value = "name", required = false) String name,
+                                           @RequestParam(value = "code", required = false) String code,
+                                           @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) LocalDateTime startDate,
+                                           @RequestParam(value = "buildingStatus", required = false) String buildingStatus,
+                                           @RequestParam(value = "marketStatus", required = false) String marketStatus,
+                                           @RequestParam(value = "cityId", required = false) Integer cityId,
+                                           @RequestParam(value = "isMain", required = false) Integer isMain,
+                                           HttpServletRequest request) {
+        return taBuildingService.buildingListSelect(pageNum, pageSize, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, getOrgId(request), getTaPersonBuildingListByUserId(request));
     }
 
     /**
      * 更新楼盘
+     *
      * @param parameter
      * @return
      */
@@ -154,12 +158,13 @@ public class TaBuildingController extends BaseController {
 
     })
     @PutMapping("/admin/building/update")
-    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingUpdate(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingUpdate(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘添加
+     *
      * @param parameter
      * @return
      */
@@ -168,12 +173,13 @@ public class TaBuildingController extends BaseController {
 
     })
     @RequestMapping(value = "/admin/building/add", method = RequestMethod.POST)
-    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingAdd(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingAdd(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘getPersonId(request);
+     *
      * @param parameter
      * @return
      */
@@ -182,12 +188,13 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "body", name = "parameter", value = "status：状态，id：项目id"),
     })
     @RequestMapping(value = "/admin/building/update/status", method = RequestMethod.PUT)
-    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request){
+    public ResponseBean buildingUpdateStatus(@RequestBody String parameter, HttpServletRequest request) {
         return taBuildingService.buildingUpdateStatus(parameter, getOrgId(request));
     }
 
     /**
      * 楼盘删除
+     *
      * @param id
      * @param request
      * @return
@@ -197,35 +204,38 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "项目id"),
     })
     @RequestMapping(value = "/admin/building/delete/{id}", method = RequestMethod.DELETE)
-    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request){
+    public ResponseBean buildingdelete(@PathVariable("id") String id, HttpServletRequest request) {
         return taBuildingService.buildingdelete(id, getOrgId(request));
     }
 
     /**
      * 添加户型
+     *
      * @param parameter
      * @param session
      * @return
      */
     @ApiOperation(value = "添加户型", notes = "添加户型")
     @RequestMapping(value = "/admin/buildingApartment/add", method = RequestMethod.POST)
-    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session){
+    public ResponseBean buildingApartment(@RequestBody String parameter, HttpSession session) {
         return taBuildingService.buildingApartmentAdd(parameter);
     }
 
     /**
      * 户型编辑
+     *
      * @param parameter
      * @return
      */
     @ApiOperation(value = "户型编辑", notes = "户型编辑")
     @RequestMapping(value = "/admin/buildingApartment/update", method = RequestMethod.PUT)
-    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter){
+    public ResponseBean buildingApartmentUpdate(@RequestBody String parameter) {
         return taBuildingService.buildingApartmentUpdate(parameter);
     }
 
     /**
      * 户型详情
+     *
      * @param id
      * @return
      */
@@ -234,12 +244,13 @@ public class TaBuildingController extends BaseController {
             @ApiImplicitParam(dataTypeClass = String.class, paramType = "path", name = "id", value = "户型id"),
     })
     @RequestMapping(value = "/admin/buildingApartment/{id}", method = RequestMethod.GET)
-    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id){
+    public ResponseBean buildingApartmentSelectId(@PathVariable(value = "id") String id) {
         return taBuildingService.buildingApartmentSelectId(id);
     }
 
     /**
      * 依据项目ID 查户型
+     *
      * @param id
      * @return
      */
@@ -250,18 +261,19 @@ public class TaBuildingController extends BaseController {
     })
     @RequestMapping(value = "/admin/buildingApartment/buildingId/{id}", method = RequestMethod.GET)
     public ResponseBean buildingApartmentBuildingId(@PathVariable(value = "id") String id,
-                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType){
+                                                    @RequestParam(value = "apartmentType", required = false) String apartmentType) {
         return taBuildingService.buildingApartmentBuildingId(id, apartmentType);
     }
 
     /**
      * 微信楼盘列表
+     *
      * @return
      */
     @RequestMapping(value = "/wx/building/list", method = RequestMethod.GET)
     public ResponseBean getWxBuildingList(
             @RequestParam(defaultValue = "1") Integer pageNumber,
-            @RequestParam(defaultValue = "10")Integer pageSize,
+            @RequestParam(defaultValue = "10") Integer pageSize,
             @RequestParam(defaultValue = "false") Boolean mine,
             @RequestParam(required = false) Integer cityId,
             @RequestParam(required = false) String name,
@@ -275,7 +287,7 @@ public class TaBuildingController extends BaseController {
 //            @RequestParam(required = false) Double minBuildingArea, // 最小面积
 //            @RequestParam(required = false) Double maxBuildingArea, // 最大面积
             HttpServletRequest request
-    ){
+    ) {
         Integer orgId = getOrgId(request);
         List<String> targets = null;
         if (null != mine && mine) {
@@ -293,12 +305,13 @@ public class TaBuildingController extends BaseController {
         List<String[]> priceList = getParamListOf(price);
         List<String[]> areaList = getParamListOf(area);
 
-        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId,mine, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
+        return taBuildingService.getWxBuildingList(pageNumber, pageSize, name, targets, cityId, mine, houseTypeList, buildingTypeList, priceList, areaList, orgId, priceType);
     }
 
 
     /**
      * 先按照 逗号 拆分, 再按照 横线 拆分
+     *
      * @param params
      * @return
      */
@@ -310,7 +323,7 @@ public class TaBuildingController extends BaseController {
         }
 
         String[] paramsArray = params.split(",");
-        for(String param : paramsArray) {
+        for (String param : paramsArray) {
             paramList.add(param.split("-"));
         }
 
@@ -320,31 +333,34 @@ public class TaBuildingController extends BaseController {
 
     /**
      * 微信推荐楼盘列表
+     *
      * @return
      */
     @RequestMapping(value = "/wx/building/main", method = RequestMethod.GET)
-    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request){
+    public ResponseBean getWxMainBuildingList(String cityId, HttpServletRequest request) {
         Integer orgId = getOrgId(request);
         return taBuildingService.getWxMainBuildingList(cityId, orgId);
     }
 
     /**
      * 删除户型
+     *
      * @param id
      * @return
      */
     @RequestMapping(value = "/admin/apartment/deleted/{id}", method = RequestMethod.DELETE)
-    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id){
+    public ResponseBean apartmentDeleted(@PathVariable(value = "id") String id) {
         return taBuildingService.apartmentDel(id);
     }
 
     /**
      * 微信楼盘详情
+     *
      * @param id
      * @return
      */
     @RequestMapping(value = "/wx/buildingSelectId/{id}", method = RequestMethod.GET)
-    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id,HttpServletRequest request){
+    public ResponseBean wxBuildingSelectId(@PathVariable(value = "id") String id, HttpServletRequest request) {
         String openid = getOpenId(request);
         Integer orgId = getOrgId(request);
         List<TaPerson> persons = iTaPersonService.getPersonsByOpenId(openid);
@@ -352,14 +368,15 @@ public class TaBuildingController extends BaseController {
             return ResponseBean.error("当前账户信息异常, 清除缓存重试", ResponseBean.ERROR_UNAVAILABLE);
         }
         TaPerson person = persons.get(0);
-        return taBuildingService.buildingAllSelectId(id,person.getPersonId(), orgId);
+        return taBuildingService.buildingAllSelectId(id, person.getPersonId(), orgId);
     }
+
     /**
      * 查询当前所有项目
      */
     @RequestMapping(value = "/admin/buildingAll", method = RequestMethod.GET)
-    public  ResponseBean buildingAll(HttpServletRequest request){
-        ResponseBean taBuilding= taBuildingService.buildingAll(getOrgId(request));
+    public ResponseBean buildingAll(HttpServletRequest request) {
+        ResponseBean taBuilding = taBuildingService.buildingAll(getOrgId(request));
         return taBuilding;
     }
 

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingFloor;
 import com.huiju.estateagents.service.ITaBuildingFloorService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 楼层表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingFloorController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingFloorController.class);
@@ -36,14 +39,22 @@ public class TaBuildingFloorController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingFloor",method= RequestMethod.GET)
-    public ResponseBean taBuildingFloorList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingFloor",method= RequestMethod.GET)
+    public ResponseBean taBuildingFloorList(@RequestParam(value = "buildingId") String buildingId,
+                                            @RequestParam(value = "blockId",required = false) Integer blockId,
+                                            @RequestParam(value = "unitid",required = false) Integer unitId,
+                                            @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingFloor> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingFloor> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(null != blockId,"block_id",blockId);
+            queryWrapper.eq(null != unitId,"unit_id",unitId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingFloor> result = iTaBuildingFloorService.page(pg, queryWrapper);

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

@@ -0,0 +1,143 @@
+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.BaseController;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.entity.TaBuildingTerm;
+import com.huiju.estateagents.service.ITaBuildingTermService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 楼栋期表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2020-02-12
+ */
+@RestController
+@RequestMapping("/")
+public class TaBuildingTermController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(TaBuildingTermController.class);
+
+    @Autowired
+    public ITaBuildingTermService iTaBuildingTermService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/taBuildingTerm",method= RequestMethod.GET)
+    public ResponseBean taBuildingTermList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<TaBuildingTerm> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<TaBuildingTerm> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<TaBuildingTerm> result = iTaBuildingTermService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingTermList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param taBuildingTerm 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingTerm",method= RequestMethod.POST)
+    public ResponseBean taBuildingTermAdd(@RequestBody TaBuildingTerm taBuildingTerm){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingTermService.save(taBuildingTerm)){
+                responseBean.addSuccess(taBuildingTerm);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingTermAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/taBuildingTerm/{id}", method= RequestMethod.DELETE)
+    public ResponseBean taBuildingTermDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iTaBuildingTermService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingTermDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param taBuildingTerm 实体对象
+     * @return
+     */
+    @RequestMapping(value="/taBuildingTerm/{id}",method= RequestMethod.PUT)
+    public ResponseBean taBuildingTermUpdate(@PathVariable Integer id,
+                                        @RequestBody TaBuildingTerm taBuildingTerm){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iTaBuildingTermService.updateById(taBuildingTerm)){
+                responseBean.addSuccess(taBuildingTerm);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingTermUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/taBuildingTerm/{id}",method= RequestMethod.GET)
+    public ResponseBean taBuildingTermGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iTaBuildingTermService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taBuildingTermDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaBuildingUnit;
 import com.huiju.estateagents.service.ITaBuildingUnitService;
 import org.slf4j.Logger;
@@ -12,6 +13,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
     * 单元表  前端控制器
@@ -21,7 +24,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaBuildingUnitController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaBuildingUnitController.class);
@@ -36,14 +39,21 @@ public class TaBuildingUnitController extends BaseController {
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/taBuildingUnit",method= RequestMethod.GET)
-    public ResponseBean taBuildingUnitList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+    @RequestMapping(value="/admin/taBuildingUnit",method= RequestMethod.GET)
+    public ResponseBean taBuildingUnitList(@RequestParam(value = "buildingId") String buildingId,
+                                           @RequestParam(value = "blockId", required = false) Integer blockId,
+                                           @RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                           @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                           HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
 		    IPage<TaBuildingUnit> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaBuildingUnit> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("org_id",getOrgId(request));
+            queryWrapper.eq("building_id",buildingId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq(null != blockId,"block_id",blockId);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaBuildingUnit> result = iTaBuildingUnitService.page(pg, queryWrapper);

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

@@ -1,15 +1,25 @@
 package com.huiju.estateagents.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaBuildingRoom;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.po.TaHousingResourcesPO;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
 import com.huiju.estateagents.service.ITaHousingResourcesService;
+import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -28,6 +38,11 @@ public class TaHousingResourcesController extends BaseController {
     @Autowired
     public ITaHousingResourcesService iTaHousingResourcesService;
 
+    @Autowired
+    private ITaBuildingRoomService taBuildingRoomService;
+
+    @Autowired
+    private ITaPreselectionRecordService taPreselectionRecordService;
 
     /**
      * 分页查询列表
@@ -42,12 +57,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) String 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 +85,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());
@@ -85,11 +105,29 @@ public class TaHousingResourcesController extends BaseController {
      * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.DELETE)
-    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id) {
+    @RequestMapping(value = "/admin/houseDelete/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taHousingResourcesDelete(@PathVariable Integer id, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.removeById(id)) {
+            //校验是否有预选记录
+            QueryWrapper<TaPreselectionRecord> queryWrapper = new QueryWrapper<>();
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+            queryWrapper.eq("org_id", getOrgId(request));
+            queryWrapper.eq("house_id", id);
+            List<TaPreselectionRecord> taPreselectionRecords = taPreselectionRecordService.list(queryWrapper);
+            if (taPreselectionRecords.size() > 0) {
+                return ResponseBean.error("存在预选房源不能删除！", ResponseBean.ERROR_UNAVAILABLE);
+            }
+            TaHousingResources taHousingResources = new TaHousingResources();
+            taHousingResources.setHouseId(id);
+            taHousingResources.setStatus(CommConstant.STATUS_DELETE);
+            if (iTaHousingResourcesService.updateById(taHousingResources)) {
+                //删除房号
+                TaHousingResources housingResources = iTaHousingResourcesService.getById(id);
+                TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+                taBuildingRoom.setRoomId(housingResources.getRoomId());
+                taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
+                taBuildingRoomService.updateById(taBuildingRoom);
                 responseBean.addSuccess("success");
             } else {
                 responseBean.addError("fail");
@@ -109,16 +147,36 @@ public class TaHousingResourcesController extends BaseController {
      * @param taHousingResources 实体对象
      * @return
      */
-    @RequestMapping(value = "/taHousingResources/{id}", method = RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taHousingResources/{id}", method = RequestMethod.PUT)
     public ResponseBean taHousingResourcesUpdate(@PathVariable Integer id,
-                                                 @RequestBody TaHousingResources taHousingResources) {
+                                                 @RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (iTaHousingResourcesService.updateById(taHousingResources)) {
-                responseBean.addSuccess(taHousingResources);
-            } else {
-                responseBean.addError("fail");
-            }
+            taHousingResources.setHouseId(id);
+            taHousingResources.setUpdateUser(getUserId(request));
+            taHousingResources.setOrgId(getOrgId(request));
+            responseBean = iTaHousingResourcesService.updateHouseResources(taHousingResources);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改户型
+     */
+    @RequestMapping(value = "/admin/house/changeApartment", method = RequestMethod.PUT)
+    public ResponseBean houseApartment(@RequestBody TaHousingResources taHousingResources, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            List<TaHousingResources> houseIdList = taHousingResources.getHouseIdList();
+            houseIdList.forEach(e -> {
+                e.setApartmentId(taHousingResources.getApartmentId());
+            });
+            iTaHousingResourcesService.updateBatchById(houseIdList);
+            responseBean.addSuccess(houseIdList);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesUpdate -=- {}", e.toString());
@@ -132,7 +190,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 {
@@ -148,19 +206,26 @@ 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.POST)
-    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) {
+    @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
+    public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
+                                             String startPrice, String endPrice, String apartmentId,
+                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
+        Integer orgId = getOrgId(request);
+
+        logger.info("TaHouseingResourcesController.listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId);
+
         try {
-            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(pageNum, pageSize, salesBatchId, startPrice, endPrice, apartmentId));
+            responseBean.addSuccess(iTaHousingResourcesService.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, 1));
         } catch (Exception e) {
             logger.error("listHousingResources -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -168,13 +233,36 @@ 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, "", "", "", 0));
+        } catch (Exception e) {
+            logger.error("listHousingResourcesFormCms -=- {}", e);
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
     /**
      * 获取某销售批次下所有房源户型
      *
      * @param salesBatchId
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/listBuildApartmentBySalesBatchId", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/listBuildApartmentBySalesBatchId", method = RequestMethod.GET)
     public ResponseBean listBuildApartmentBySalesBatchId(@RequestParam(value = "salesBatchId") String salesBatchId) {
         ResponseBean responseBean = new ResponseBean();
         try {
@@ -191,8 +279,9 @@ public class TaHousingResourcesController extends BaseController {
      *
      * @param houseId
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.POST)
+    @RequestMapping(value = "/wx/getHousingDetailById", method = RequestMethod.GET)
     public ResponseBean getHousingDetailById(@RequestParam(value = "houseId") String houseId,
                                              @RequestParam(value = "personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
@@ -204,4 +293,57 @@ 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;
+    }
+
+    @PostMapping(value = "/admin/house/uploadExcel")
+    public ResponseBean uploadExcel(@RequestParam("file") MultipartFile file,
+                                    @RequestParam("salesBatchId") Integer salesBatchId,
+                                    @RequestParam("buildingId") String buildingId,
+                                    HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.getExcelData(file, salesBatchId, buildingId, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError("请检查文件");
+        }
+        return responseBean;
+    }
+
+    @PostMapping(value = "/admin/house/saveExcelValue", consumes = "multipart/*", headers = "content-type=multipart/form-data")
+    public ResponseBean saveExcelValue(@RequestParam("file") MultipartFile file,
+                                       @RequestParam("salesBatchId") Integer salesBatchId,
+                                       @RequestParam("buildingId") String buildingId,
+                                       HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaHousingResourcesService.saveExcelValue(file, salesBatchId, buildingId, getOrgId(request));
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taHousingResourcesUpdate -=- {}", e.toString());
+            responseBean.addError("请检查文件");
+        }
+        return responseBean;
+    }
 }

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

@@ -380,6 +380,9 @@ public class TaPersonVisitRecordController extends BaseController {
                 case CommConstant.EVENT_H5:
                     e.setDrainageShareNum(shareNum);
                     break;
+                case CommConstant.HOUSE:
+                    e.setHouseShareNum(shareNum);
+                    break;
             }
         });
         result.setRecords(taConsultantInfos);

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

@@ -15,6 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
+
 /**
  * <p>
  * 预选记录表  前端控制器
@@ -24,7 +26,7 @@ import org.springframework.web.bind.annotation.*;
  * @since 2020-02-10
  */
 @RestController
-@RequestMapping("/")
+@RequestMapping("/api")
 public class TaPreselectionRecordController extends BaseController {
 
     private final Logger logger = LoggerFactory.getLogger(TaPreselectionRecordController.class);
@@ -39,8 +41,9 @@ public class TaPreselectionRecordController extends BaseController {
      * @param pageNum
      * @param pageSize
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.GET)
+    @RequestMapping(value = "/admin/taPreselectionRecord", method = RequestMethod.GET)
     public ResponseBean taPreselectionRecordList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                  @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize) {
         ResponseBean responseBean = new ResponseBean();
@@ -65,17 +68,19 @@ public class TaPreselectionRecordController extends BaseController {
      *
      * @param taPreselectionRecord 实体对象
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/taPreselectionRecord", method = RequestMethod.POST)
-    public ResponseBean taPreselectionRecordAdd(@RequestBody TaPreselectionRecord taPreselectionRecord) {
+    @RequestMapping(value = "/wx/taPreselectionRecord", method = RequestMethod.POST)
+    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 {
 
             // 校验参数
-            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) && StringUtils.isBlank(taPreselectionRecord.getPersonId()) &&
+            if (StringUtils.isBlank(taPreselectionRecord.getHouseId()) || StringUtils.isBlank(taPreselectionRecord.getPersonId()) ||
                 taPreselectionRecord.getOrgId() == null) {
                 logger.info("taPreselectionRecordAdd 参数错误");
                 responseBean.addError("参数错误");
@@ -162,17 +167,16 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 取消房源预选
      *
-     * @param personId 用户ID
      * @return
      */
-    @RequestMapping("/wx/taPreselectionRecordCancel")
-    public ResponseBean taPreselectionRecordCancel(@RequestParam("personId") String personId,
-                                                   @RequestParam("houseId") String houseId) {
+    @RequestMapping(value = "/wx/taPreselectionRecordCancel", method = RequestMethod.DELETE)
+    public ResponseBean taPreselectionRecordCancel(@RequestParam("houseId") String houseId,
+                                                   @RequestParam("personId") String personId) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId));
+            responseBean = iTaPreselectionRecordService.taPreselectionRecordCancel(personId, houseId);
         } catch (Exception e) {
-            logger.error("taPreselectionRecordCancel -=- {}", e.toString());
+            logger.error("taPreselectionRecordCancel -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -185,36 +189,39 @@ public class TaPreselectionRecordController extends BaseController {
      * @param pageSize 分页大小
      * @param personId 用户ID
      * @return
+     * @author gushaoyong
      */
-    @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.POST)
+    @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();
+        Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, personId));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNum, pageSize, orgId, personId));
         } catch (Exception e) {
-            logger.error("listPreselectionRecord -=- {}", e.toString());
+            logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());
         }
         return responseBean;
     }
 
-    /**
-     * 校验用户是否已经预选该房源
-     *
-     * @param personId 用户ID
-     * @param houseId  房源ID
-     * @return
-     */
-    @RequestMapping(value = "/wx/checkPreselect", method = RequestMethod.POST)
-    public ResponseBean checkPreselect(@RequestParam("personId") String personId,
-                                       @RequestParam("houseId") String houseId) {
+    @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 = "house", required = false) Integer house,
+                                                  @RequestParam(value = "phone", required = false) String phone,
+                                                  @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                                  @RequestParam(value = "status", required = false) Integer status,
+                                                  HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.checkPreselect(personId, houseId));
+            responseBean = iTaPreselectionRecordService.selectPreSelectRecordList(pageNum, pageSize, salesBatchId, house, getOrgId(request), phone, apartmentId, status);
         } catch (Exception e) {
-            logger.error("checkPreselect -=- {}", e.toString());
+            e.printStackTrace();
+            logger.error("taHousingResourcesList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -5,8 +5,14 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.TaMiniapp;
 import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.entity.TaShareContent;
+import com.huiju.estateagents.service.IMiniAppService;
+import com.huiju.estateagents.service.ITaMiniappService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import com.huiju.estateagents.service.TaShareContentService;
 import io.swagger.models.auth.In;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -16,11 +22,12 @@ import sun.misc.Request;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
-    * 销售批次表  前端控制器
-    * </p>
+ * 销售批次表  前端控制器
+ * </p>
  *
  * @author jobob
  * @since 2020-02-10
@@ -34,29 +41,38 @@ public class TaSalesBatchController extends BaseController {
     @Autowired
     public ITaSalesBatchService iTaSalesBatchService;
 
+    @Autowired
+    public ITaMiniappService taMiniappService;
+
+    @Autowired
+    public IMiniAppService miniAppService;
+
+    @Autowired
+    private TaShareContentService taShareContentService;
 
     /**
      * 分页查询列表
+     *
      * @param pageNum
      * @param pageSize
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.GET)
-    public ResponseBean taSalesBatchList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
-                                         @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
-                                         @RequestParam(value ="salesBatchName", required = false) String salesBatchName,
-                                         @RequestParam(value ="buildingId", required = false) String buildingId,
-                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchList(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
+                                         @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                         @RequestParam(value = "salesBatchName", required = false) String salesBatchName,
+                                         @RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "status", required = false) Integer status, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
-		    IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
+            IPage<TaSalesBatch> pg = new Page<>(pageNum, pageSize);
 
             IPage<TaSalesBatch> result = iTaSalesBatchService.selectByCondition(pg, salesBatchName, buildingId, status, getOrgId(request));
             responseBean.addSuccess(result);
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchList -=- {}",e.toString());
+            logger.error("taSalesBatchList -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -64,24 +80,63 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 保存对象
+     *
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch",method= RequestMethod.POST)
-    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request){
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.POST)
+    public ResponseBean taSalesBatchAdd(@RequestBody TaSalesBatch taSalesBatch, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            taSalesBatch.setOrgId(getOrgId(request));
+            Integer orgId = getOrgId(request);
+
+            taSalesBatch.setOrgId(orgId);
             taSalesBatch.setCreateDate(LocalDateTime.now());
             taSalesBatch.setUpdateTime(LocalDateTime.now());
-            if (iTaSalesBatchService.save(taSalesBatch)){
-                responseBean.addSuccess(taSalesBatch);
-            }else {
-                responseBean.addError("fail");
-            }
-        }catch (Exception e){
+            iTaSalesBatchService.save(taSalesBatch);
+
+            QueryWrapper<TaMiniapp> taMiniappQuery = new QueryWrapper<>();
+            taMiniappQuery.eq("org_id", getOrgId(request));
+            TaMiniapp taMiniapp = taMiniappService.getOne(taMiniappQuery);
+            // 生成二维码
+            ResponseBean taMiniappQrcode = miniAppService.getQrCode(CommConstant.HOUSE_QRCODE.replace("#0", taSalesBatch.getSalesBatchId().toString()).replace("#1", "house"), taMiniapp.getMiniappId());
+            taSalesBatch.setQrCode(String.valueOf(taMiniappQrcode.getData()));
+            iTaSalesBatchService.updateById(taSalesBatch);
+
+            // 设置默认分享设置
+            TaShareContent shareContent = new TaShareContent();
+            shareContent.setOrgId(orgId);
+            shareContent.setTargetId(taSalesBatch.getSalesBatchId().toString());
+            shareContent.setShareContentTitle("诚挚邀您在线选房购房~");
+            shareContent.setShareContentImg(taSalesBatch.getAerialViewImg());
+            shareContent.setShareContentType("house");
+            shareContent.setStatus(1);
+            shareContent.setCreateDate(LocalDateTime.now());
+            taShareContentService.save(shareContent);
+
+            responseBean.addSuccess(taSalesBatch);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchAdd -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 删除批次
+     *
+     * @param taSalesBatch 实体对象
+     * @return
+     */
+    @RequestMapping(value = "/admin/taSalesBatch", method = RequestMethod.PUT)
+    public ResponseBean taSalesBatchDel(@RequestBody List<TaSalesBatch> salesBatchs, HttpServletRequest request) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.delSalesBatchList(getOrgId(request), salesBatchs);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchAdd -=- {}",e.toString());
+            logger.error("taSalesBatchAdd -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -89,21 +144,22 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 根据id删除对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
     @ResponseBody
-    @RequestMapping(value="/admin/taSalesBatch/{id}", method= RequestMethod.DELETE)
-    public ResponseBean taSalesBatchDelete(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.DELETE)
+    public ResponseBean taSalesBatchDelete(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            if(iTaSalesBatchService.removeById(id)){
+            if (iTaSalesBatchService.removeById(id)) {
                 responseBean.addSuccess("success");
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchDelete -=- {}",e.toString());
+            logger.error("taSalesBatchDelete -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -111,24 +167,25 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 修改对象
-     * @param id  实体ID
+     *
+     * @param id           实体ID
      * @param taSalesBatch 实体对象
      * @return
      */
-    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.PUT)
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.PUT)
     public ResponseBean taSalesBatchUpdate(@PathVariable Integer id,
-                                           @RequestBody TaSalesBatch taSalesBatch){
+                                           @RequestBody TaSalesBatch taSalesBatch) {
         ResponseBean responseBean = new ResponseBean();
         try {
             taSalesBatch.setSalesBatchId(id);
-            if (iTaSalesBatchService.updateById(taSalesBatch)){
+            if (iTaSalesBatchService.updateById(taSalesBatch)) {
                 responseBean.addSuccess(taSalesBatch);
-            }else {
+            } else {
                 responseBean.addError("fail");
             }
-        }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchUpdate -=- {}",e.toString());
+            logger.error("taSalesBatchUpdate -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;
@@ -136,16 +193,53 @@ public class TaSalesBatchController extends BaseController {
 
     /**
      * 根据id查询对象
-     * @param id  实体ID
+     *
+     * @param id 实体ID
      */
-    @RequestMapping(value="/admin/taSalesBatch/{id}",method= RequestMethod.GET)
-    public ResponseBean taSalesBatchGet(@PathVariable Integer id){
+    @RequestMapping(value = "/admin/taSalesBatch/{id}", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGet(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean.addSuccess(iTaSalesBatchService.getById(id));
-        }catch (Exception e){
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("taSalesBatchDelete -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id提示信息-小程序端
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/wx/getNoticeInfo/{id}", method = RequestMethod.GET)
+    public ResponseBean getNoticeInfo(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.getNoticeInfo(id);
+        } catch (Exception e) {
+            e.printStackTrace();
+            logger.error("getNoticeInfo -=- {}", e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象--小程序
+     *
+     * @param id 实体ID
+     */
+    @RequestMapping(value = "/wx/taSalesBatch/{id}", method = RequestMethod.GET)
+    public ResponseBean taSalesBatchGetForMiniApp(@PathVariable Integer id) {
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean = iTaSalesBatchService.getSalesBatchById(id);
+        } catch (Exception e) {
             e.printStackTrace();
-            logger.error("taSalesBatchDelete -=- {}",e.toString());
+            logger.error("taSalesBatchGetForMiniApp -=- {}", e.toString());
             responseBean.addError(e.getMessage());
         }
         return responseBean;

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

@@ -66,7 +66,7 @@ public class TaShareController extends BaseController {
                                          @RequestParam(value = "shareType", required = false)String shareType,
                                          @RequestParam(value = "personType", required = false)String personType,
                                          @RequestParam(value = "phone", required = false)String phone,
-                                         Integer salesBatchId, HttpServletRequest request){
+                                         @RequestParam(value = "salesBatchId")Integer salesBatchId, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             if (salesBatchId == null){

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

@@ -154,4 +154,28 @@ public class TaSharePersonFromController extends BaseController {
         }
         return responseBean;
     }
+
+    /**
+     * 根据id查询对象
+     */
+    @RequestMapping(value="api/admin/taHouseVisit",method= RequestMethod.GET)
+    public ResponseBean taSharePersonFromVisit(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                               @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
+                                               @RequestParam(value = "sceneType", required = false)String sceneType,
+                                               @RequestParam(value = "personType", required = false)String personType,
+                                               @RequestParam(value = "phone", required = false)String phone,
+                                               @RequestParam(value = "salesBatchId")String salesBatchId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (salesBatchId == null){
+                return ResponseBean.success("");
+            }
+            responseBean = iTaSharePersonFromService.selectHouseVisitList(pageNum, pageSize, getOrgId(request), personType, sceneType, phone, salesBatchId);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("taShareCountList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

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

@@ -340,6 +340,9 @@ public class TaBuilding implements Serializable {
     /**
      * 项目亮点封面
      */
-    @TableField(strategy=FieldStrategy.IGNORED)
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String highlightsCover;
+
+    @TableField(exist = false)
+    private List<TaSalesBatch> salesBatch;
 }

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

@@ -40,10 +40,15 @@ public class TaBuildingBlock implements Serializable {
      */
     private String blockName;
 
+    /**
+     * 期id
+     */
+    private Integer termId;
+
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id
@@ -58,7 +63,7 @@ public class TaBuildingBlock implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

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

@@ -40,6 +40,11 @@ public class TaBuildingFloor implements Serializable {
      */
     private Integer blockId;
 
+    /**
+     * 期id
+     */
+    private Integer termId;
+
     /**
      * 单元id
      */
@@ -53,7 +58,7 @@ public class TaBuildingFloor implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id
@@ -68,7 +73,7 @@ public class TaBuildingFloor implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

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

@@ -40,6 +40,11 @@ public class TaBuildingRoom implements Serializable {
      */
     private Integer blockId;
 
+    /**
+     * 期id
+     */
+    private Integer termId;
+
     /**
      * 单元id
      */
@@ -58,7 +63,7 @@ public class TaBuildingRoom implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id
@@ -73,7 +78,7 @@ public class TaBuildingRoom implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

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

@@ -0,0 +1,64 @@
+package com.huiju.estateagents.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 楼栋期表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class TaBuildingTerm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 楼栋期id
+     */
+    @TableId(value = "term_id", type = IdType.AUTO)
+    private Integer termId;
+
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
+
+    /**
+     * 楼栋名称
+     */
+    private String termName;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updateDate;
+
+
+}

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

@@ -40,6 +40,11 @@ public class TaBuildingUnit implements Serializable {
      */
     private Integer blockId;
 
+    /**
+     * 期id
+     */
+    private Integer termId;
+
     /**
      * 单元
      */
@@ -48,7 +53,7 @@ public class TaBuildingUnit implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id
@@ -63,7 +68,7 @@ public class TaBuildingUnit implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
 
 }

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

@@ -32,6 +32,8 @@ public class TaConsultantInfo {
 
     private Integer drainageShareNum;
 
+    private Integer houseShareNum;
+
     private Integer buildingTypeId;
 
     private String priceType;

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;
@@ -10,6 +11,7 @@ import lombok.experimental.Accessors;
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -37,6 +39,11 @@ public class TaHousingResources implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
     /**
      * 楼栋 与楼盘区分
      */
@@ -50,7 +57,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 销售批次id
      */
-    private String salesBatchId;
+    private Integer salesBatchId;
 
     /**
      * 单元id
@@ -75,13 +82,23 @@ public class TaHousingResources implements Serializable {
     /**
      * 房号id
      */
-    private String roomId;
+    private Integer roomId;
 
     /**
      * 房间名称
      */
     private String roomName;
 
+    /**
+     * 期id
+     */
+    private Integer termId;
+
+    /**
+     * 期名称
+     */
+    private String termName;
+
     /**
      * 价格
      */
@@ -95,7 +112,6 @@ public class TaHousingResources implements Serializable {
     /**
      * 实际热度
      */
-    @TableField(exist = false)
     private Integer realHeat;
 
     /**
@@ -112,7 +128,7 @@ public class TaHousingResources implements Serializable {
     /**
      * 状态
      */
-    private String status;
+    private Integer status;
 
     /**
      * 公司id
@@ -127,10 +143,13 @@ public class TaHousingResources implements Serializable {
     /**
      * 更新时间
      */
-    private String updateDate;
+    private LocalDateTime updateDate;
 
     private Integer updateUser;
 
     @TableField(exist = false)
     private String updateName;
+
+    @TableField(exist = false)
+    private List<TaHousingResources> houseIdList;
 }

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

@@ -1,5 +1,6 @@
 package com.huiju.estateagents.entity;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
@@ -79,4 +80,7 @@ public class TaPoster implements Serializable {
 
     @TableField(exist = false)
     private List<Integer> templateIds = new ArrayList<>();
+
+    @TableField(exist = false)
+    private List<TdPosterTemplate> templates;
 }

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

@@ -65,5 +65,13 @@ public class TaPreselectionRecord implements Serializable {
      */
     private Integer updateUser;
 
+    /**
+     * 销售批次id
+     */
+    private Integer salesBatchId;
 
+    /**
+     * 楼盘id
+     */
+    private String buildingId;
 }

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

@@ -9,6 +9,7 @@ import lombok.experimental.Accessors;
 
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -86,10 +87,21 @@ public class TaSalesBatch implements Serializable {
      */
     private String remark;
 
+    /**
+     * 房源列表二维码
+     */
+    private String qrCode;
+
     /**
      * 项目名称
      */
     @TableField(exist = false)
     private String buildingName;
 
+    @TableField(exist = false)
+    private List<TaPoster> posters;
+
+    @TableField(exist = false)
+    private List<TaShareContent> shareContents;
+
 }

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

@@ -1,6 +1,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 lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -74,5 +75,21 @@ public class TaSharePersonFrom implements Serializable {
 
     private Boolean isFirstTime;
 
+    @TableField(exist = false)
+    private String nameOrnick;
 
+    @TableField(exist = false)
+    private String sceneName;
+
+    @TableField(exist = false)
+    private String name;
+
+    @TableField(exist = false)
+    private String phone;
+
+    @TableField(exist = false)
+    private String photoOravatar;
+
+    @TableField(exist = false)
+    private String salesBatchName;
 }

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

@@ -0,0 +1,18 @@
+package com.huiju.estateagents.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaBuildingTerm;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 楼栋期表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-12
+ */
+@Mapper
+public interface TaBuildingTermMapper extends BaseMapper<TaBuildingTerm> {
+
+}

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaHousingResources;
+import com.huiju.estateagents.entity.TaSalesBatch;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -26,18 +27,19 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
     /**
      * 分页获取房源列表
      *
-     * @param iPage
      * @param salesBatchId
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type         为1只展示已发布的房源
      * @return
      */
-    IPage<TaHousingResourcesPO> listHousingResources(IPage<TaHousingResourcesPO> iPage,
-                                                     @Param("salesBatchId") String salesBatchId,
-                                                     @Param("startPrice") String startPrice,
-                                                     @Param("endPrice") String endPrice,
-                                                     @Param("apartmentId") String apartmentId);
+    List<TaHousingResourcesPO> listHousingResources(@Param("orgId") Integer orgId,
+                                                    @Param("salesBatchId") String salesBatchId,
+                                                    @Param("startPrice") String startPrice,
+                                                    @Param("endPrice") String endPrice,
+                                                    @Param("apartmentId") String apartmentId,
+                                                    @Param("type") Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -72,4 +74,28 @@ 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") String apartmentId,@Param("status") Integer status,@Param("houseId") String houseId);
+
+    List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId,@Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 }

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

@@ -2,12 +2,15 @@ package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * <p>
  * 预选记录表  Mapper 接口
@@ -27,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获取预选记录
@@ -38,4 +43,23 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     TaPreselectionRecord getRecordByPersonIdAndHouseId(@Param("personId") String personId,
                                                        @Param("houseId") String houseId);
+
+    /**
+     * 查询预选记录表
+     * @param page
+     * @param salesBatchId
+     * @param houseId
+     * @param orgId
+     * @param phone
+     * @param apartmentId
+     * @param status
+     * @return
+     */
+    List<TaPreselectionRecord> selectPreSelectRecordList(Page page,
+                                                         @Param("salesBatchId") String salesBatchId,
+                                                         @Param("houseId") Integer houseId,
+                                                         @Param("orgId") Integer orgId,
+                                                         @Param("phone") String phone,
+                                                         @Param("apartmentId") String apartmentId,
+                                                         @Param("status") Integer status);
 }

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

@@ -6,6 +6,9 @@ import com.huiju.estateagents.entity.TaSalesBatch;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 销售批次表  Mapper 接口
@@ -17,4 +20,23 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaSalesBatchMapper extends BaseMapper<TaSalesBatch> {
     IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, @Param("salesBatchName") String salesBatchName, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId);
+
+    /**
+     * 根据批次号统计预选数据
+     *
+     * @param orgId
+     * @param taSalesBatchList
+     * @return
+     */
+    Integer countPreSelectRecord(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+
+    void updateSalesBatchStatus(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
+
+    /**
+     * 获取房源总数和总热度
+     *
+     * @param salesBatchId
+     * @return
+     */
+    Map<String,Object> getTotalHousesAndHeat(@Param("salesBatchId") Integer salesBatchId);
 }

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

@@ -1,10 +1,13 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaSharePersonFrom;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
+import java.util.List;
+
 /**
  * <p>
  *   Mapper 接口
@@ -16,4 +19,5 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaSharePersonFromMapper extends BaseMapper<TaSharePersonFrom> {
     Integer countViewNum(@Param("userId") Integer userId, @Param("orgId")Integer orgId, @Param("personId")String personId, @Param("startCreateDate") String startCreateDate, @Param("endCreateDate") String endCreateDate);
+    List<TaSharePersonFrom> selectHouseVisitList(Page page, @Param("orgId") Integer orgId, @Param("personType") String personType, @Param("sceneType")String sceneType, @Param("phone")String phone, @Param("saleBatchId")String saleBatchId);
 }

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

@@ -0,0 +1,31 @@
+package com.huiju.estateagents.po;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * @Auther: gusy
+ * @Date: 2020/2/19 16:24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+public class BuildingImgPO {
+
+    /**
+     * 是否全景图，1是
+     */
+    private Integer type;
+
+    /**
+     * 图片链接
+     */
+    private String url;
+
+    /**
+     * 全景图链接
+     */
+    private String panoramaLink;
+
+}

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

@@ -1,12 +1,15 @@
 package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaBuildingPanorama;
 import com.huiju.estateagents.entity.TaHousingResources;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * @Auther: gusy
@@ -17,17 +20,12 @@ import java.time.LocalDateTime;
 @Accessors(chain = true)
 public class TaHousingResourcesPO extends TaHousingResources {
 
-    /**
-     * 户型名称
-     */
-    private String apartmentName;
-
     private Double insideArea;
 
     private Double buildingArea;
 
     /**
-     * 是否预选已经预选，1 是 0 否
+     * 是否已经预选该房源，true 是 false 否
      */
     @TableField(exist = false)
     private Boolean isPreselect;
@@ -46,4 +44,15 @@ public class TaHousingResourcesPO extends TaHousingResources {
      * 销售批次状态
      */
     private Integer saleBatchStatus;
+
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<BuildingImgPO> buildingImgList;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
 }

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

@@ -1,10 +1,14 @@
 package com.huiju.estateagents.po;
 
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
+import java.util.List;
+
 /**
  * @Auther: gusy
  * @Date: 2020/2/11 15:16
@@ -38,4 +42,65 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      * 价格
      */
     private String price;
+
+    /**
+     * 户型id
+     */
+    private String apartmentId;
+
+    /**
+     * 户型名称
+     */
+    private String apartmentName;
+
+    /**
+     * 楼盘名称
+     */
+    private String buildingName;
+
+    /**
+     * 户型图片列表
+     */
+    @TableField(exist = false)
+    private List<TaBuildingImg> buildingImgList;
+
+    /**
+     * 期区
+     */
+    private String termname;
+
+    /**
+     * 用户昵称
+     */
+    private String nameOrnick;
+
+    /**
+     * 用户U型明
+     */
+    private String name;
+
+    /**
+     * 用户头像
+     */
+    private String avatarurl;
+
+    /**
+     * 手机号
+     */
+    private String phone;
+
+    /**
+     * 最后修改人
+     */
+    private String updateName;
+
+    /**
+     * 房源状态
+     */
+    private String housingStatus;
+
+    /**
+     * 销售批次装填
+     */
+    private String saleBatchStatus;
 }

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

@@ -0,0 +1,16 @@
+package com.huiju.estateagents.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaBuildingTerm;
+
+/**
+ * <p>
+ * 楼栋期表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-12
+ */
+public interface ITaBuildingTermService extends IService<TaBuildingTerm> {
+
+}

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

@@ -6,6 +6,7 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingApartment;
 import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
+import org.springframework.web.multipart.MultipartFile;
 
 import java.util.List;
 
@@ -19,28 +20,16 @@ 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      页码
-     * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type  为1只展示已发布的房源
      * @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, Integer type);
 
     /**
      * 获取某销售批次下所有房源户型
@@ -53,9 +42,75 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
     /**
      * 根据房源ID获取房源详情
      *
-     * @param personId
+     * @param personId 用户ID
+     * @param houseId  房源ID
+     * @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
      */
-    TaHousingResourcesPO getHousingDetailById(String personId,String houseId);
+    ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName, String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId);
+
+    /**
+     * 更新房源信息
+     *
+     * @param taHousingResources
+     * @return
+     */
+    ResponseBean updateHouseResources(TaHousingResources taHousingResources);
+
+    /**
+     * 获取表格中的数据
+     *
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    ResponseBean getExcelData(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
+
+    /**
+     * 保存文件
+     *
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId);
 }

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);
 
     /**
      * 添加预选记录预选
@@ -37,19 +38,12 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
     /**
      * 取消预选
      *
-     * @param personId 用户ID
+     * @param personId
      * @param houseId  房源ID
      * @return
      */
-    Boolean taPreselectionRecordCancel(String personId, String houseId);
+    ResponseBean taPreselectionRecordCancel(String personId, String houseId);
 
-    /**
-     * 校验用户是否预选
-     *
-     * @param personId 用户ID
-     * @param houseId  房源ID
-     * @return
-     */
-    TaPreselectionRecord checkPreselect(String personId, String houseId);
+    ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status);
 
 }

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

@@ -3,8 +3,11 @@ package com.huiju.estateagents.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaSalesBatch;
 
+import java.util.List;
+
 /**
  * <p>
  * 销售批次表  服务类
@@ -15,4 +18,22 @@ import com.huiju.estateagents.entity.TaSalesBatch;
  */
 public interface ITaSalesBatchService extends IService<TaSalesBatch> {
     IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId);
+
+    ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList);
+
+    /**
+     * 获取通知信息
+     *
+     * @param salesBatchId 销售批次ID
+     * @return
+     */
+    ResponseBean getNoticeInfo(Integer salesBatchId);
+
+    /**
+     * 获取销售批次详情
+     *
+     * @param salesBatchId
+     * @return
+     */
+    ResponseBean getSalesBatchById(Integer salesBatchId);
 }

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

@@ -24,4 +24,6 @@ public interface ITaSharePersonFromService extends IService<TaSharePersonFrom> {
      * @return
      */
     TaSharePersonFrom addSharePersonRecord(String personId, Integer orgId, String from, String recommender, String targetId);
+
+    ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId);
 }

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

@@ -62,13 +62,13 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 	 * @return
 	 */
 	@Override
-	public ResponseBean saveBooster(HelpRecord helpRecord, Integer orgId, TaPerson person) {
+	public synchronized ResponseBean saveBooster(HelpRecord helpRecord, Integer orgId, TaPerson person) {
 		//查看是否助力成功
 		HelpInitiateRecord helpInitiateRecord = helpInitiateRecordMapper.selectById(helpRecord.getHelpRecordInitiateId());
 		if (!StringUtils.isEmpty(helpInitiateRecord.getVerification())){
 			return ResponseBean.error("该活动已成功", ResponseBean.ERROR_UNAVAILABLE);
 		}
-		
+
 		HelpActivity helpActivity = helpActivityMapper.selectById(helpRecord.getHelpActivityId());
 		//是否助力成功
 		if (null != helpInitiateRecord.getEnlistNum() && helpInitiateRecord.getEnlistNum() >= helpActivity.getPersonNum()){
@@ -137,7 +137,7 @@ public class HelpRecordServiceImpl extends ServiceImpl<HelpRecordMapper, HelpRec
 		map.put("helpInitiateRecord",helpInitiateRecord);
 		return ResponseBean.success(map);
 	}
-	
+
 	/**
 	 * 发送微信消息
 	 * @param helpInitiateRecord

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

@@ -94,7 +94,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     private TaShareContentService taShareContentService;
 
     @Autowired
-    private  TaOrgMapper  taOrgMapper;
+    private TaOrgMapper taOrgMapper;
 
     @Autowired
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
@@ -105,16 +105,19 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaBuildingPanoramaService taBuildingPanoramaService;
 
+    @Autowired
+    private ITaSalesBatchService iTaSalesBatchService;
+
     @Override
-    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+    public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
 
-        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain, orgId,taPersonBuildingList);
+        List<TaBuilding> buildings = taBuildingMapper.buildingList(page, name, code, startDate, buildingStatus, marketStatus, cityId, isMain, orgId, taPersonBuildingList);
 
         if (null != buildings) {
-            for(TaBuilding taBuilding: buildings) {
+            for (TaBuilding taBuilding : buildings) {
                 //查询当前图片
                 QueryWrapper<TaBuildingImg> queryWrapper = new QueryWrapper<>();
                 queryWrapper.eq("building_id", taBuilding.getBuildingId());
@@ -139,8 +142,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         return ResponseBean.success(page);
     }
+
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId, List<TaPersonBuilding> taPersonBuildingList) {
 //        Page<TaBuilding> page = new Page<>();
 //        page.setSize(pageSize == null ? 10 : pageSize);
 //        page.setCurrent(pageNum == null ? 1 : pageNum);
@@ -151,6 +155,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     /**
      * 查询项目图片
+     *
      * @param buildingId
      * @param imgType
      * @return
@@ -162,15 +167,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingImgQueryWrapper.eq("img_type", imgType);
         buildingImgQueryWrapper.orderByAsc("order_no");
         List<TaBuildingImg> buildingImg = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-        return  buildingImg.size() > 0 ? buildingImg : null;
+        return buildingImg.size() > 0 ? buildingImg : null;
     }
 
     @Override
     public ResponseBean buildingSelectId(String id) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
+        buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
         //查询当前图片
@@ -185,7 +190,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         // 查询tag
         QueryWrapper<TaBuildingTag> BuildingTagQueryWrapper = new QueryWrapper<>();
         BuildingTagQueryWrapper.eq("building_id", id);
-        List<TaBuildingTag> buildingTags= taBuildingTagMapper.selectList(BuildingTagQueryWrapper);
+        List<TaBuildingTag> buildingTags = taBuildingTagMapper.selectList(BuildingTagQueryWrapper);
         building.setBuildingTag(buildingTags);
 
         // 项目类型
@@ -193,8 +198,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingProjectTypeQueryWrapper.eq("building_id", building.getBuildingId());
         List<TaBuildingProjectType> taBuildingProjectTypes = taBuildingProjectTypeMapper.selectList(buildingProjectTypeQueryWrapper);
         building.setBuildingProjectType(taBuildingProjectTypes);
-        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
-        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setPosters(taPosterService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         // 查询 周边数据
         QueryWrapper<TaBuildingMapRelation> mapRelationQueryWrapper = new QueryWrapper<>();
@@ -207,15 +212,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean buildingAllSelectId(String id,String personId, Integer orgId) {
+    public ResponseBean buildingAllSelectId(String id, String personId, Integer orgId) {
         // 查询基础信息
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().gt(TaBuilding::getStatus,-1);
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
+        buildingtWrapper.lambda().gt(TaBuilding::getStatus, -1);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
         TaBuilding building = taBuildingMapper.selectOne(buildingtWrapper);
 
-        if (null == building){
-            return ResponseBean.error("项目不存在",ResponseBean.ERROR_UNAVAILABLE);
+        if (null == building) {
+            return ResponseBean.error("项目不存在", ResponseBean.ERROR_UNAVAILABLE);
         }
         //查询当前图片
         building.setBuildingImg(getBuildingImg(id, CommConstant.BUILDING_IMG_BANNER));
@@ -242,7 +247,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         AppointmentQueryWrapper.eq("status", 1);
         AppointmentQueryWrapper.orderByDesc("create_date");
         List<TaBuildingApartment> appoint = taBuildingApartmentMapper.selectList(AppointmentQueryWrapper);
-        for (TaBuildingApartment apar:appoint) {
+        for (TaBuildingApartment apar : appoint) {
             List<TaBuildingImg> imgs = taBuildingImgMapper.getBuildingImgByApartment(apar.getApartmentId());
             apar.setBuildingImgList(imgs);
         }
@@ -250,13 +255,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
         getBuildingAttaches(building);
         QueryWrapper<TaSave> saveQueryWrapper = new QueryWrapper<>();
-        saveQueryWrapper.eq("tagert_type",CommConstant.FAVOR_PROJECT);
-        saveQueryWrapper.eq("person_id",personId);
-        saveQueryWrapper.eq("saved_target",building.getBuildingId());
+        saveQueryWrapper.eq("tagert_type", CommConstant.FAVOR_PROJECT);
+        saveQueryWrapper.eq("person_id", personId);
+        saveQueryWrapper.eq("saved_target", building.getBuildingId());
         Integer num = taSaveMapper.selectCount(saveQueryWrapper);
-        if (num>0){
+        if (num > 0) {
             building.setIsSave(CommConstant.STATUS_NORMAL);
-        }else {
+        } else {
             building.setIsSave(CommConstant.STATUS_UNACCALIMED);
         }
 
@@ -268,8 +273,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         building.setBuildingProjectType(buildingProjectTypes);
 
         // 海报和分享
-        building.setPosters(taPosterService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
-        building.setShareContents(taShareContentService.getPostersForTarget(id,CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setPosters(taPosterService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
+        building.setShareContents(taShareContentService.getPostersForTarget(id, CommConstant.POSTER_CONTENT_TYPE_BUILDING));
 
         // 助力活动
         QueryWrapper<HelpActivity> helpActivityQueryWrapper = new QueryWrapper<>();
@@ -304,18 +309,25 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         List<TaBuildingPanorama> panoramaList = taBuildingPanoramaService.list(panoramaQueryWrapper);
         building.setPanoramaList(panoramaList);
 
+        // 查询关联的销售批次
+        QueryWrapper<TaSalesBatch> salesBatchQueryWrapper = new QueryWrapper<>();
+        salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getBuildingId, id);
+        salesBatchQueryWrapper.lambda().eq(TaSalesBatch::getStatus, CommConstant.STATUS_NORMAL);
+        List<TaSalesBatch> taSalesBatch = iTaSalesBatchService.list(salesBatchQueryWrapper);
+        building.setSalesBatch(taSalesBatch);
+
         return ResponseBean.success(building);
     }
 
     @Override
     public ResponseBean buildingUpdate(String parameter, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
-        JSONObject object= JSONObject.parseObject(parameter);
+        JSONObject object = JSONObject.parseObject(parameter);
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "update");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
@@ -334,7 +346,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             buildingIdQueryWrapper.eq("building_id", building.getBuildingId());
             buildingIdQueryWrapper.eq("org_id", orgId);
             building.setName(building.getBuildingName());
-            taBuildingMapper.update(building,buildingIdQueryWrapper);
+            taBuildingMapper.update(building, buildingIdQueryWrapper);
             QueryWrapper<TaBuildingImg> BuildingImgQueryWrapper = new QueryWrapper<>();
             BuildingImgQueryWrapper.eq("building_id", building.getBuildingId());
             BuildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_BANNER);
@@ -375,7 +387,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             insertTagBatch(buildingTags, building.getBuildingId());
         }
 
-        if(null != building.getCityId()){
+        if (null != building.getCityId()) {
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
@@ -456,22 +468,22 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingAdd(String parameter, Integer orgId) {
         ResponseBean responseBean = new ResponseBean();
 
-        JSONObject object= JSONObject.parseObject(parameter);
+        JSONObject object = JSONObject.parseObject(parameter);
         // 根据orgId查询当前楼盘最大数
         TaOrg taOrg = taOrgMapper.selectById(orgId);
         // 查询当前org楼盘总数
-        QueryWrapper<TaBuilding>  taBuildingQuery = new QueryWrapper<>();
-        taBuildingQuery.eq("org_id",orgId);
-        taBuildingQuery.gt("status",-1);
-        int orgNum= taBuildingMapper.selectCount(taBuildingQuery);
-        if (orgNum >= taOrg.getBuildingNum()){
-            return ResponseBean.error("当前系统仅供维护"+taOrg.getBuildingNum()+"个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
+        QueryWrapper<TaBuilding> taBuildingQuery = new QueryWrapper<>();
+        taBuildingQuery.eq("org_id", orgId);
+        taBuildingQuery.gt("status", -1);
+        int orgNum = taBuildingMapper.selectCount(taBuildingQuery);
+        if (orgNum >= taOrg.getBuildingNum()) {
+            return ResponseBean.error("当前系统仅供维护" + taOrg.getBuildingNum() + "个项目，需要维护更多项目，请联系相关管理人员", ResponseBean.ERROR_UNAVAILABLE);
         }
 
         TaBuilding building = object.toJavaObject(TaBuilding.class);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, null, "add");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦。");
             return responseBean;
         }
@@ -483,7 +495,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         if (taBuildingMapper.insert(building) < 1) {
             return ResponseBean.error("添加项目楼栋失败", ResponseBean.ERROR_UNAVAILABLE);
         }
-        if(null != building.getCityId()){
+        if (null != building.getCityId()) {
             TdCity city = tdCityMapper.selectById(building.getCityId());
             city.setStatus("1");
             tdCityMapper.updateById(city);
@@ -531,13 +543,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         }
 
         //添加默认意向值
-        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(),building.getBuildingId());
+        iTaBuildingIntentionService.saveDefaultIntention(building.getOrgId(), building.getBuildingId());
 
         return ResponseBean.success(building);
     }
 
     /**
      * 批量插入 周边地图数据
+     *
      * @param list
      * @param buildingId
      * @param orgId
@@ -561,31 +574,31 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         ResponseBean responseBean = new ResponseBean();
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
-        Integer  status= jsonobject.getInteger("status");
+        Integer status = jsonobject.getInteger("status");
         String id = jsonobject.getString("id");
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
         buildingIdQueryWrapper.eq("building_id", id);
         buildingIdQueryWrapper.eq("org_id", orgId);
-        TaBuilding  building = taBuildingMapper.selectOne(buildingIdQueryWrapper);
+        TaBuilding building = taBuildingMapper.selectOne(buildingIdQueryWrapper);
 
         boolean isMainMoreThanTenFlag = publishCountIsMainBuilding(building, orgId, status, "updateStatus");
-        if (!isMainMoreThanTenFlag){
+        if (!isMainMoreThanTenFlag) {
             responseBean.addError("当前城市最多只能推荐10个项目至首页哦");
             return responseBean;
         }
         building.setStatus(status);
-        taBuildingMapper.update(building,buildingIdQueryWrapper);
+        taBuildingMapper.update(building, buildingIdQueryWrapper);
         return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingdelete(String id, Integer orgId) {
-        TaBuilding  building = new TaBuilding();
+        TaBuilding building = new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,id);
-        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, id);
+        TaBuilding bui = taBuildingMapper.selectOne(buildingtWrapper);
 
-        if (bui.getStatus().equals(1)){
+        if (bui.getStatus().equals(1)) {
             return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
         }
         QueryWrapper<TaBuilding> buildingIdQueryWrapper = new QueryWrapper<>();
@@ -593,14 +606,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingIdQueryWrapper.eq("org_id", orgId);
         building.setBuildingId(String.valueOf(id));
         building.setStatus(-1);
-        taBuildingMapper.update(building,buildingIdQueryWrapper);
+        taBuildingMapper.update(building, buildingIdQueryWrapper);
 
         return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingApartmentAdd(String parameter) {
-        TaBuildingApartment building = JSONObject.parseObject(parameter,TaBuildingApartment.class);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
         building.setStatus(1);
         building.setCreateDate(LocalDateTime.now());
         if (taBuildingApartmentMapper.insert(building) < 1) {
@@ -622,7 +635,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Override
     public ResponseBean buildingApartmentUpdate(String parameter) {
         ResponseBean responseBean = new ResponseBean();
-        TaBuildingApartment building = JSONObject.parseObject(parameter,TaBuildingApartment.class);
+        TaBuildingApartment building = JSONObject.parseObject(parameter, TaBuildingApartment.class);
         if (StringUtils.isEmpty(building.getApartmentId())) {
             responseBean.addError("id不存在!");
             return responseBean;
@@ -638,7 +651,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", building.getApartmentId());
         building.setInsideArea(building.getInsideArea() == null ? 0d : building.getInsideArea());
         building.setBuildingArea(building.getBuildingArea() == null ? 0d : building.getBuildingArea());
-        taBuildingApartmentMapper.update(building,buildingApartmentQueryWrapper);
+        taBuildingApartmentMapper.update(building, buildingApartmentQueryWrapper);
 
         JSONObject jsonobject = JSONObject.parseObject(parameter);
         //图片数组
@@ -658,21 +671,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         buildingApartmentQueryWrapper.eq("apartment_id", id);
         //拿到当前户型信息
         TaBuildingApartment buildingApartment = taBuildingApartmentMapper.selectOne(buildingApartmentQueryWrapper);
-        if ( null == buildingApartment ){
+        if (null == buildingApartment) {
             return ResponseBean.success("", "没有发现户型图上传");
         }
 
         //根据户型ID查楼盘户型对应图片表
-        ArrayList arrayList= new ArrayList<>();
+        ArrayList arrayList = new ArrayList<>();
         QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
         ApartmentImgQueryWrapper.eq("apartment_id", buildingApartment.getApartmentId());
-        List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
-        for (TaApartmentImg apartmentImg:buildingImg){
+        List<TaApartmentImg> buildingImg = taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+        for (TaApartmentImg apartmentImg : buildingImg) {
             QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
-            buildingImgQueryWrapper.eq("img_id",apartmentImg.getImgId());
-            buildingImgQueryWrapper.eq("img_type",CommConstant.BUILDING_IMG_APARMENT);
-            List<TaBuildingImg> buildingImgList= taBuildingImgMapper.selectList(buildingImgQueryWrapper);
-            for (TaBuildingImg buImg:buildingImgList) {
+            buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+            buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+            List<TaBuildingImg> buildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            for (TaBuildingImg buImg : buildingImgList) {
                 arrayList.add(buImg);
             }
         }
@@ -697,10 +710,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             String[] buildingTypeList,
             List<String[]> priceList,
             List<String[]> areaList,
-            Integer orgId,String priceType) {
+            Integer orgId, String priceType) {
         IPage<TaBuilding> page = new Page<>(pageNum, pageSize);
 
-        if(CollectionUtils.isEmpty(targets) && mine){
+        if (CollectionUtils.isEmpty(targets) && mine) {
             return ResponseBean.success(page);
         }
 
@@ -715,11 +728,11 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 //
 //        IPage<TaBuilding> result = taBuildingMapper.selectPage(page, buildingQueryWrapper);
 
-        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList,orgId,priceType);
+        IPage<TaBuilding> result = taBuildingMapper.selectBuildingPage(page, name, cityId, targets, houseTypeList, buildingTypeList, priceList, areaList, orgId, priceType);
 
         List<TaBuilding> buildingList = result.getRecords();
         if (CollectionUtils.isNotEmpty(buildingList)) {
-            for (TaBuilding build:buildingList) {
+            for (TaBuilding build : buildingList) {
                 getBuildingAttaches(build);
 
                 // 兼容 3.0/3.5 版本（3.0/3.5 封面取的全是 buildingListImg 的第一张），因为在3.5.1新增了封面图
@@ -799,9 +812,9 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
             // tags
             if (!StringUtils.isEmpty(building.getTags())) {
                 List<TaBuildingTag> tags = new ArrayList<>();
-                String[] tagsArray =  building.getTags().split(",");
+                String[] tagsArray = building.getTags().split(",");
                 if (null != tagsArray) {
-                    for(String tagName: tagsArray) {
+                    for (String tagName : tagsArray) {
                         TaBuildingTag tag = new TaBuildingTag();
                         tag.setBuildingId(buildingId);
                         tag.setTagName(tagName);
@@ -875,14 +888,14 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     public ResponseBean buildingApartmentBuildingId(String id, String apartmentType) {
         QueryWrapper<TaBuildingApartment> buildingApartmentQueryWrapper = new QueryWrapper<>();
         buildingApartmentQueryWrapper.eq("building_id", id);
-        buildingApartmentQueryWrapper.eq("status",1);
-        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType),"apartment_type",apartmentType);
+        buildingApartmentQueryWrapper.eq("status", 1);
+        buildingApartmentQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(apartmentType), "apartment_type", apartmentType);
         buildingApartmentQueryWrapper.orderByDesc("create_date");
-        List<TaBuildingApartment> buildingApartment= taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
+        List<TaBuildingApartment> buildingApartment = taBuildingApartmentMapper.selectList(buildingApartmentQueryWrapper);
         buildingApartment.forEach(e -> {
             QueryWrapper<TaApartmentImg> ApartmentImgQueryWrapper = new QueryWrapper<>();
             ApartmentImgQueryWrapper.eq("apartment_id", e.getApartmentId());
-            List<TaApartmentImg> buildingImg= taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
+            List<TaApartmentImg> buildingImg = taApartmentImgMapper.selectList(ApartmentImgQueryWrapper);
 
             List<TaBuildingImg> buildingImag = buildingImg.stream().map(img -> {
                 QueryWrapper<TaBuildingImg> buildingImgQueryWrapper = new QueryWrapper<>();
@@ -907,21 +920,21 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
 //        TaBuilding  building= new TaBuilding();
         QueryWrapper<TaBuilding> buildingtWrapper = new QueryWrapper<>();
-        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId,buildingApartment.getBuildingId());
+        buildingtWrapper.lambda().eq(TaBuilding::getBuildingId, buildingApartment.getBuildingId());
 //        TaBuilding bui= taBuildingMapper.selectOne(buildingtWrapper);
 //        if (bui.getStatus().equals(1)){
 //            return ResponseBean.error("楼盘已发布不可以删除", ResponseBean.ERROR_UNAVAILABLE);
 //        }
 
         buildingApartment.setStatus(-1);
-       taBuildingApartmentMapper.update(buildingApartment,buildingApartmentQueryWrapper);
+        taBuildingApartmentMapper.update(buildingApartment, buildingApartmentQueryWrapper);
 
-       return ResponseBean.success("");
+        return ResponseBean.success("");
     }
 
     @Override
     public ResponseBean buildingAll(Integer orgId) {
-        List<TaBuilding> taBuilding= taBuildingMapper.buildingAll(orgId);
+        List<TaBuilding> taBuilding = taBuildingMapper.buildingAll(orgId);
         return ResponseBean.success(taBuilding);
     }
 
@@ -936,8 +949,8 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     }
 
     @Override
-    public ResponseBean getBuildingListById(Integer orgId,Integer cityId) {
-        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId,cityId);
+    public ResponseBean getBuildingListById(Integer orgId, Integer cityId) {
+        List<TaBuilding> buildings = taBuildingMapper.getBuildingListById(orgId, cityId);
         return ResponseBean.success(buildings);
     }
 
@@ -948,6 +961,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     /**
      * 推荐到首页楼盘不能超过10个
+     *
      * @param taBuilding
      * @return
      */
@@ -956,13 +970,13 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         queryWrapper.eq("building_id", taBuilding.getBuildingId());
         queryWrapper.eq("org_id", orgId);
         TaBuilding info = taBuildingMapper.selectOne(queryWrapper);
-        if (taBuilding.getIsMain() != 1){
+        if (taBuilding.getIsMain() != 1) {
             return true;
         }
 //        if (operte.equals("update") && (info.getStatus() == 2)){
 //            return true;
 //        }
-        if (operte.equals("updateStatus") && status == 2){
+        if (operte.equals("updateStatus") && status == 2) {
             return true;
         }
         QueryWrapper<TaBuilding> taBuildingQueryWrapper = new QueryWrapper<>();
@@ -971,19 +985,17 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         taBuildingQueryWrapper.eq("org_id", orgId);
         taBuildingQueryWrapper.ne("status", "-1");
         taBuildingQueryWrapper.ne("status", "2");
-        if (taBuilding.getBuildingId() != null){
+        if (taBuilding.getBuildingId() != null) {
             taBuildingQueryWrapper.ne("building_id", taBuilding.getBuildingId());
         }
         List<TaBuilding> taBuildings = taBuildingMapper.selectList(taBuildingQueryWrapper);
-        if (taBuildings != null && taBuildings.size() >= 10){
+        if (taBuildings != null && taBuildings.size() >= 10) {
             return false;
         }
         return true;
     }
 
 
-
-
     private List<TaBuildingImg> insertImgBatch(List<TaBuildingImg> imgs, String buildingId) {
         return imgs.stream().map(img -> {
             TaBuildingImg Images = new TaBuildingImg();
@@ -1011,7 +1023,7 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
     int insertApartmentImgBatch(List<TaBuildingImg> imgs, String buildingId, String apartmentId) {
         int rows = 0;
-        for (TaBuildingImg img: imgs){
+        for (TaBuildingImg img : imgs) {
             TaBuildingImg Images = new TaBuildingImg();
             Images.setBuildingId(buildingId);
             Images.setImgType(img.getImgType());
@@ -1022,9 +1034,10 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
 
             if (taBuildingImgMapper.insert(Images) < 1) {
                 continue;
-            };
+            }
+            ;
 
-            TaApartmentImg apartmentImg= new TaApartmentImg();
+            TaApartmentImg apartmentImg = new TaApartmentImg();
             apartmentImg.setApartmentId(apartmentId);
             apartmentImg.setImgId(Images.getImgId());
             apartmentImg.setStatus(1);

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

@@ -0,0 +1,20 @@
+package com.huiju.estateagents.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.huiju.estateagents.entity.TaBuildingTerm;
+import com.huiju.estateagents.mapper.TaBuildingTermMapper;
+import com.huiju.estateagents.service.ITaBuildingTermService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 楼栋期表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2020-02-12
+ */
+@Service
+public class TaBuildingTermServiceImpl extends ServiceImpl<TaBuildingTermMapper, TaBuildingTerm> implements ITaBuildingTermService {
+
+}

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

@@ -6,18 +6,35 @@ 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.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.*;
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
+import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
+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 org.apache.commons.collections.CollectionUtils;
+import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -27,6 +44,7 @@ import java.util.List;
  * @author jobob
  * @since 2020-02-10
  */
+@Transactional(rollbackFor = Exception.class)
 @Service
 public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResourcesMapper, TaHousingResources> implements ITaHousingResourcesService {
 
@@ -35,50 +53,59 @@ 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;
+
+    @Autowired
+    TaBuildingImgMapper taBuildingImgMapper;
+
+    @Autowired
+    TaApartmentImgMapper taApartmentImgMapper;
+
+    @Autowired
+    private TaBuildingPanoramaMapper taBuildingPanoramaMapper;
 
-        return ResponseBean.success(list);
-    }
 
     /**
      * 分页获取房源列表
      *
-     * @param pageNum      页码
-     * @param pageSize     分页大小
      * @param salesBatchId 销售批次ID
      * @param startPrice
      * @param endPrice
      * @param apartmentId
+     * @param type
      * @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, Integer type) {
+        logger.info("listHousingResources 接收参数：orgId：{},salesBatchId：{},startPrice：{},endPrice：{},apartmentId：{}，type：{}",
+                orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
+
+        startPrice = StringUtils.isEmpty(startPrice) ? null : startPrice;
+        endPrice = StringUtils.isEmpty(endPrice) ? null : endPrice;
 
-        IPage<TaHousingResourcesPO> iPage = new Page<>(pageNum, pageSize);
-        return taHousingResourcesMapper.listHousingResources(iPage, salesBatchId, startPrice, endPrice, apartmentId);
+        List<TaHousingResourcesPO> resourcesPOList =
+                taHousingResourcesMapper.listHousingResources(orgId, salesBatchId, startPrice, endPrice, apartmentId, type);
+
+        return resourcesPOList;
     }
 
     /**
@@ -91,7 +118,33 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     public List<TaBuildingApartment> listBuildApartmentBySalesBatchId(String salesBatchId) {
         logger.info("listBuildApartmentBySalesBatchId 接收参数：salesBatchId：{}", salesBatchId);
 
-        return taHousingResourcesMapper.listBuildApartmentBySalesBatchId(salesBatchId);
+        // 获取户型列表
+        List<TaBuildingApartment> apartmentList = taHousingResourcesMapper.listBuildApartmentBySalesBatchId(salesBatchId);
+        if (CollectionUtils.isEmpty(apartmentList)) {
+            return null;
+        }
+
+        // 组装户型图片
+        List<TaBuildingApartment> resultList = new ArrayList<>();
+        List<TaBuildingImg> taBuildingImgList;
+        List<TaApartmentImg> buildingImg;
+        QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
+        QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+        for (TaBuildingApartment apartment : apartmentList) {
+            apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", apartment.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                apartment.setBuildingImgList(taBuildingImgList);
+                resultList.add(apartment);
+            }
+        }
+        return resultList;
     }
 
     /**
@@ -105,6 +158,595 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     public TaHousingResourcesPO getHousingDetailById(String personId, String houseId) {
         logger.info("getHousingDetailById 接收参数：personId：{}，houseId：{}", personId, houseId);
 
-        return taHousingResourcesMapper.getHousingDetailById(houseId, "1");
+        // 查询房源详情
+        TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "1");
+        if (resourcesPO == null) {
+            return null;
+        }
+
+        // 获取该用户是否预选房源信息
+        TaPreselectionRecord taPreselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+        if (taPreselectionRecord != null) {
+            resourcesPO.setIsPreselect(true);
+        } else {
+            resourcesPO.setIsPreselect(false);
+        }
+
+        List<BuildingImgPO> buildingImgPOList = new ArrayList<>();
+        BuildingImgPO buildingImgPO;
+        if (!StringUtils.isEmpty(resourcesPO.getApartmentId())) {
+            // 获取全景图
+            QueryWrapper<TaBuildingPanorama> buildingPanoramaQueryWrapper = new QueryWrapper<>();
+            buildingPanoramaQueryWrapper.eq("org_id", resourcesPO.getOrgId());
+            buildingPanoramaQueryWrapper.eq("building_id", resourcesPO.getBuildingId());
+            buildingPanoramaQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingPanoramaQueryWrapper.eq("panorama_type", "apartment");
+            buildingPanoramaQueryWrapper.eq("status", "1");
+            List<TaBuildingPanorama> panoramaList = taBuildingPanoramaMapper.selectList(buildingPanoramaQueryWrapper);
+            if (CollectionUtils.isNotEmpty(panoramaList)) {
+                for (TaBuildingPanorama panorama : panoramaList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setUrl(panorama.getCoverImg());
+                    buildingImgPO.setType(1);
+                    buildingImgPO.setPanoramaLink(panorama.getPanoramaLink());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
+
+            // 获取户型图片列表
+            List<TaBuildingImg> taBuildingImgList = new ArrayList<>();
+            List<TaApartmentImg> buildingImg;
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper = new QueryWrapper<>();
+            apartmentImgQueryWrapper.eq("apartment_id", resourcesPO.getApartmentId());
+            buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+            for (TaApartmentImg apartmentImg : buildingImg) {
+                buildingImgQueryWrapper = new QueryWrapper<>();
+                buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                buildingImgQueryWrapper.orderByAsc("order_no");
+                taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+            }
+            if (CollectionUtils.isNotEmpty(taBuildingImgList)) {
+                for (TaBuildingImg img : taBuildingImgList) {
+                    buildingImgPO = new BuildingImgPO();
+                    buildingImgPO.setType(0);
+                    buildingImgPO.setUrl(img.getUrl());
+                    buildingImgPOList.add(buildingImgPO);
+                }
+            }
+        }
+
+        resourcesPO.setBuildingImgList(buildingImgPOList);
+        return resourcesPO;
+    }
+
+    /**
+     * 校验楼栋信息存不存在
+     *
+     * @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, String apartmentId, Integer status, String houseId) {
+        IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
+        IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName, floorName, roomName, apartmentId, status, houseId);
+        return ResponseBean.success(pageData);
+    }
+
+    /**
+     * 更新房源信息
+     *
+     * @param taHousingResources
+     * @return
+     */
+    @Override
+    public ResponseBean updateHouseResources(TaHousingResources taHousingResources) {
+        TaHousingResources oldTaHousingResources = taHousingResourcesMapper.selectById(taHousingResources.getHouseId());
+        taHousingResources.setTermId(oldTaHousingResources.getTermId());
+        taHousingResources.setBlockId(oldTaHousingResources.getBlockId());
+        taHousingResources.setUnitId(oldTaHousingResources.getUnitId());
+        taHousingResources.setFloorId(oldTaHousingResources.getFloorId());
+        taHousingResources.setRoomId(oldTaHousingResources.getRoomId());
+        //只允许编辑房间名
+        if (!oldTaHousingResources.getRoomName().equals(taHousingResources.getRoomName())) {
+            //校验房号
+            String roomResult = checkedRoom(taHousingResources);
+
+            //房间号不存在就更新
+            if (roomResult.equals("notExist")) {
+                updateRoom(taHousingResources);
+            } else {
+                return ResponseBean.error("房间名" + taHousingResources.getRoomName() + "存在。请修改房间名！", ResponseBean.ERROR_UNAVAILABLE);
+            }
+
+        }
+
+        //添加房源信息
+        taHousingResources.setUpdateDate(LocalDateTime.now());
+        taHousingResourcesMapper.updateById(taHousingResources);
+        return ResponseBean.success(taHousingResources);
+    }
+
+    /**
+     * 获取表格中的数据
+     *
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean getExcelData(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        List<TaHousingResources> list = new ArrayList<>();
+        if (file == null) {
+            responseBean.addError("对象不能为空");
+            return responseBean;
+        }
+        //获取文件的名字
+        String originalFilename = file.getOriginalFilename();
+        Workbook workbook = null;
+        try {
+            if (originalFilename.endsWith(CommConstant.SUFFIX_2003)) {
+                workbook = new HSSFWorkbook(file.getInputStream());
+            } else if (originalFilename.endsWith(CommConstant.SUFFIX_2007)) {
+                workbook = new XSSFWorkbook(file.getInputStream());
+            }
+        } catch (Exception e) {
+            logger.info(originalFilename);
+            e.printStackTrace();
+            responseBean.addError("格式错误");
+            return responseBean;
+        }
+        if (workbook == null) {
+            logger.info(originalFilename);
+            responseBean.addError("格式错误");
+            return responseBean;
+        } else {
+            List<String> temHousingList = new ArrayList<String>();
+            //获取一个sheet也就是一个工作簿
+            Sheet sheet = workbook.getSheetAt(0);
+            int lastRowNum = sheet.getLastRowNum();
+            //从第一行开始第一行一般是标题
+            for (int j = 3; j <= lastRowNum; j++) {
+                Row row = sheet.getRow(j);
+                TaHousingResources taHousingResources = new TaHousingResources();
+                String termName = row.getCell(0).getStringCellValue().trim();
+                String blockName = row.getCell(1).getStringCellValue().trim();
+                String unitName = row.getCell(2).getStringCellValue().trim();
+                String floorName = row.getCell(3).getStringCellValue().trim();
+                String roomName = row.getCell(4).getStringCellValue().trim();
+                BigDecimal price = BigDecimal.valueOf(row.getCell(5).getNumericCellValue());
+                String heatString = String.valueOf(row.getCell(6).getNumericCellValue());
+                String split = heatString.substring(0, heatString.indexOf("."));
+                Integer heat = Integer.valueOf(split);
+                Integer status = row.getCell(7).getStringCellValue().trim().equals("是") ? 1 : 0;
+
+                int currentRow = j + 1;
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(termName)) {
+                    responseBean.addError("第" + currentRow + "行" + "期/区不能为空!");
+                    return responseBean;
+                }
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(blockName)) {
+                    responseBean.addError("第" + currentRow + "行" + "楼栋不能为空!");
+                    return responseBean;
+                }
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(unitName)) {
+                    responseBean.addError("第" + currentRow + "行" + "单元不能为空!");
+                    return responseBean;
+                }
+                if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isEmpty(floorName)) {
+                    responseBean.addError("第" + currentRow + "行" + "层不能为空!");
+                    return responseBean;
+                }
+                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 + "行存在重复房源,请删除重复房源后再次上传文件。");
+                    return responseBean;
+                }
+
+                QueryWrapper<TaHousingResources> taHousingResourcesQueryWrapper = new QueryWrapper<>();
+//                taHousingResourcesQueryWrapper.eq("sales_batch_id",salesBatchId);
+                taHousingResourcesQueryWrapper.eq("building_id", buildingId);
+                taHousingResourcesQueryWrapper.eq("org_id", orgId);
+                taHousingResourcesQueryWrapper.gt("status", CommConstant.STATUS_DELETE);
+                taHousingResourcesQueryWrapper.eq("term_name", termName);
+                taHousingResourcesQueryWrapper.eq("block_name", blockName);
+                taHousingResourcesQueryWrapper.eq("unit_name", unitName);
+                taHousingResourcesQueryWrapper.eq("floor_name", floorName);
+                taHousingResourcesQueryWrapper.eq("room_name", roomName);
+                TaHousingResources oldTaHouseingResources = taHousingResourcesMapper.selectOne(taHousingResourcesQueryWrapper);
+                if (null != oldTaHouseingResources) {
+                    logger.info("数据库存在重复房源:{}", houseInfo);
+                    responseBean.addError("第" + currentRow + "行与系统已录入房源" + oldTaHouseingResources.getHouseId() + "重复，请删除重复房源后再次上传文件。（注意，要检查本楼盘下所有批次的房源）。");
+                    return responseBean;
+                }
+
+                //把数据塞入temList校验是否有重复的数据
+                temHousingList.add(houseInfo);
+                //构建数据
+                taHousingResources.setTermName(termName);
+                taHousingResources.setBlockName(blockName);
+                taHousingResources.setUnitName(unitName);
+                taHousingResources.setFloorName(floorName);
+                taHousingResources.setRoomName(roomName);
+                taHousingResources.setPrice(price);
+                taHousingResources.setHeat(heat);
+                taHousingResources.setStatus(status);
+                list.add(taHousingResources);
+            }
+        }
+        //构建分页
+        Map<String, Object> data = new HashMap<String, Object>();
+        data.put("list", list);
+        data.put("total", list.size());
+
+        responseBean.addSuccess(data);
+        return responseBean;
+    }
+
+    /**
+     * 保存文件
+     *
+     * @param file
+     * @param salesBatchId
+     * @param buildingId
+     * @param orgId
+     * @return
+     */
+    @Override
+    public ResponseBean saveExcelValue(MultipartFile file, Integer salesBatchId, String buildingId, Integer orgId) {
+        ResponseBean responseBean = new ResponseBean();
+        responseBean = getExcelData(file, salesBatchId, buildingId, orgId);
+        if (responseBean.getCode() != ResponseBean.CODE_SUCCESS) {
+            return responseBean;
+        }
+
+        //获取校验成功的数据
+        Map<String, Object> data = (Map<String, Object>) responseBean.getData();
+        List<TaHousingResources> list = (List<TaHousingResources>) data.get("list");
+        list.forEach(e -> {
+            e.setOrgId(orgId);
+            e.setSalesBatchId(salesBatchId);
+            e.setBuildingId(buildingId);
+            addHouseResources(e);
+        });
+        return ResponseBean.success(list);
+    }
+
+    //更新房号
+    private void updateRoom(TaHousingResources taHousingResources) {
+        TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+        taBuildingRoom.setUpdateDate(LocalDateTime.now());
+        taBuildingRoom.setTermId(taHousingResources.getTermId());
+        taBuildingRoom.setBlockId(taHousingResources.getBlockId());
+        taBuildingRoom.setUnitId(taHousingResources.getUnitId());
+        taBuildingRoom.setFloorId(taHousingResources.getFloorId());
+        taBuildingRoom.setRoomName(taHousingResources.getRoomName());
+        taBuildingRoom.setRoomId(taHousingResources.getRoomId());
+        taBuildingRoomMapper.updateById(taBuildingRoom);
+    }
+
+    //更新楼层
+    private void updateFloor(TaHousingResources taHousingResources) {
+        TaBuildingFloor taBuildingFloor = new TaBuildingFloor();
+        taBuildingFloor.setUpdateDate(LocalDateTime.now());
+        taBuildingFloor.setTermId(taHousingResources.getTermId());
+        taBuildingFloor.setBlockId(taHousingResources.getBlockId());
+        taBuildingFloor.setUnitId(taHousingResources.getUnitId());
+        taBuildingFloor.setFloorName(taHousingResources.getFloorName());
+        taBuildingFloorMapper.updateById(taBuildingFloor);
+    }
+
+    //更新单元
+    private void updateUnit(TaHousingResources taHousingResources) {
+        TaBuildingUnit taBuildingUnit = new TaBuildingUnit();
+        taBuildingUnit.setUpdateDate(LocalDateTime.now());
+        taBuildingUnit.setTermId(taHousingResources.getTermId());
+        taBuildingUnit.setBlockId(taHousingResources.getBlockId());
+        taBuildingUnit.setUnitName(taHousingResources.getUnitName());
+        taBuildingUnit.setUnitId(taHousingResources.getUnitId());
+        taBuildingUnitMapper.updateById(taBuildingUnit);
+    }
+
+    //更新栋
+    private void updataBlock(TaHousingResources taHousingResources) {
+        TaBuildingBlock taBuildingBlock = new TaBuildingBlock();
+        taBuildingBlock.setUpdateDate(LocalDateTime.now());
+        taBuildingBlock.setTermId(taHousingResources.getTermId());
+        taBuildingBlock.setBlockName(taHousingResources.getBlockName());
+        taBuildingBlock.setBlockId(taHousingResources.getBlockId());
+        taBuildingBlockMapper.updateById(taBuildingBlock);
+    }
+
+    //添加房间号
+    private void addRoom(TaHousingResources taHousingResources) {
+        TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+        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 {
+            //查询房号
+            TaBuildingRoom taBuildingRoom = selectRoom(taHousingResources);
+            if (null != taBuildingRoom) {
+                taHousingResources.setRoomId(taBuildingRoom.getRoomId());
+                return "房间名" + taHousingResources.getRoomName() + "存在。不允许保存，请修改！";
+            } else {
+                return "notExist";
+            }
+        }
+    }
+
+    //查询房间号
+    private TaBuildingRoom selectRoom(TaHousingResources taHousingResources) {
+        QueryWrapper<TaBuildingRoom> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("org_id", taHousingResources.getOrgId());
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        queryWrapper.eq("building_id", taHousingResources.getBuildingId());
+        queryWrapper.eq("term_id", taHousingResources.getTermId());
+        queryWrapper.eq("block_id", taHousingResources.getBlockId());
+        queryWrapper.eq("unit_id", taHousingResources.getUnitId());
+        queryWrapper.eq("floor_id", taHousingResources.getFloorId());
+        queryWrapper.eq("room_name", taHousingResources.getRoomName());
+        return taBuildingRoomMapper.selectOne(queryWrapper);
+    }
+
+    //校验楼层
+    private String checkedFloor(TaHousingResources taHousingResources) {
+        if (StringUtils.isEmpty(taHousingResources.getFloorName())) {
+            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/java/com/huiju/estateagents/service/impl/TaPersonServiceImpl.java

@@ -179,9 +179,13 @@ public class TaPersonServiceImpl extends ServiceImpl<TaPersonMapper, TaPerson> i
 
         UpdateWrapper<TaPerson> wrapper = new UpdateWrapper<>();
         wrapper.set("phone", phone);
-        wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
+
+        if (CommConstant.PERSON_ESTATE_DRIFT.equals(person.getPersonType())) {
+            wrapper.set("person_type",CommConstant.PERSON_ESTATE_CUSTOMER);
+        }
+
         wrapper.eq("mini_openid", miniOpenid);
-        wrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
+//        wrapper.eq("person_type",CommConstant.PERSON_ESTATE_DRIFT);
         taPersonMapper.update(new TaPerson(), wrapper);
 
         person.setPhone(phone);

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

@@ -1,17 +1,26 @@
 package com.huiju.estateagents.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.TaApartmentImg;
+import com.huiju.estateagents.entity.TaBuildingImg;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.entity.TaSharePersonFrom;
+import com.huiju.estateagents.mapper.TaApartmentImgMapper;
+import com.huiju.estateagents.mapper.TaBuildingImgMapper;
 import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
 import com.huiju.estateagents.mapper.TaPreselectionRecordMapper;
 import com.huiju.estateagents.po.TaHousingResourcesPO;
 import com.huiju.estateagents.po.TaPreselectionRecordPO;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
+import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,6 +28,8 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -39,12 +50,43 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     @Autowired
     private TaHousingResourcesMapper taHousingResourcesMapper;
 
+    @Autowired
+    TaBuildingImgMapper taBuildingImgMapper;
+
+    @Autowired
+    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);
-        return taPreselectionRecordMapper.listPreselectionRecord(iPage, personId);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId);
+
+        List<TaPreselectionRecordPO> poList = iPage.getRecords();
+        if (CollectionUtils.isNotEmpty(poList)) {
+            List<TaPreselectionRecordPO> resultList = new ArrayList<>();
+            List<TaBuildingImg> taBuildingImgList;
+            List<TaApartmentImg> buildingImg;
+            QueryWrapper<TaApartmentImg> apartmentImgQueryWrapper;
+            QueryWrapper<TaBuildingImg> buildingImgQueryWrapper;
+            for (TaPreselectionRecordPO po : poList) {
+                apartmentImgQueryWrapper = new QueryWrapper<>();
+                apartmentImgQueryWrapper.eq("apartment_id", po.getApartmentId());
+                buildingImg = taApartmentImgMapper.selectList(apartmentImgQueryWrapper);
+                for (TaApartmentImg apartmentImg : buildingImg) {
+                    buildingImgQueryWrapper = new QueryWrapper<>();
+                    buildingImgQueryWrapper.eq("img_id", apartmentImg.getImgId());
+                    buildingImgQueryWrapper.eq("img_type", CommConstant.BUILDING_IMG_APARMENT);
+                    buildingImgQueryWrapper.orderByAsc("order_no");
+                    taBuildingImgList = taBuildingImgMapper.selectList(buildingImgQueryWrapper);
+                    po.setBuildingImgList(taBuildingImgList);
+                }
+                resultList.add(po);
+            }
+            iPage.setRecords(resultList);
+        }
+        return iPage;
     }
 
     @Override
@@ -58,7 +100,7 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         TaPreselectionRecord record = taPreselectionRecordMapper
                 .getRecordByPersonIdAndHouseId(taPreselectionRecord.getPersonId(), taPreselectionRecord.getHouseId());
         if (record != null) {
-            responseBean.addError("您已经预选过该房源");
+            responseBean.addError("已预选过此房源，请到选房记录中查看。");
             return responseBean;
         }
 
@@ -75,18 +117,19 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
         }
 
         // 校验当前房源状态是否为已发布
-        if (!"1".equals(resourcesPO.getStatus())) {
+        if (1 != resourcesPO.getStatus()) {
             responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
             return responseBean;
         }
 
         // 校验预选操作时间是否在规定范围内
-        if (DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
+        if (!DateUtils.checkTimeRange(resourcesPO.getPreselectionStartTime(), resourcesPO.getPreselectionEndTime(), null)) {
             responseBean.addError("当前时间不在预选时间范围内，请联系置业顾问了解详情。");
             return responseBean;
         }
 
         // 添加预选记录
+        taPreselectionRecord.setSalesBatchId(resourcesPO.getSalesBatchId());
         taPreselectionRecord.setStatus(1);
         taPreselectionRecord.setCreateDate(LocalDateTime.now());
         save(taPreselectionRecord);
@@ -103,24 +146,47 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
 
     @Override
     @Transactional
-    public Boolean taPreselectionRecordCancel(String personId, String houseId) {
+    public ResponseBean taPreselectionRecordCancel(String personId, String houseId) {
         logger.info("taPreselectionRecordCancel 接收参数：personId：{}，houseId：{}", personId, houseId);
 
+        ResponseBean responseBean = new ResponseBean<>();
+        // 校验是否已经取消
+        TaPreselectionRecord preselectionRecord = taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+        if (preselectionRecord == null) {
+            responseBean.addError("未预选过此房源，或已取消预选此房源");
+            return responseBean;
+        }
+
+        TaHousingResourcesPO resourcesPO = taHousingResourcesMapper.getHousingDetailById(houseId, "0");
+        if (resourcesPO == null || 1 != resourcesPO.getStatus()) {
+            responseBean.addError("当前房源已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
+        // 校验当前批次状态是否为已发布
+        if (resourcesPO.getSaleBatchStatus() != 1) {
+            responseBean.addError("当前销售批次已临时取消发布，请稍后再试或联系置业顾问了解详情。");
+            return responseBean;
+        }
+
         // 更新预选记录
         TaPreselectionRecord record = new TaPreselectionRecord();
-        record.setPreselectionRecordId(Integer.parseInt(personId));
+        record.setPreselectionRecordId(preselectionRecord.getPreselectionRecordId());
         record.setStatus(0);
         record.setUpdateDate(DateUtils.today());
         updateById(record);
 
         // 更新房源表热度
-        return taHousingResourcesMapper.updateForSubtractHeat(houseId);
+        responseBean.addSuccess(taHousingResourcesMapper.updateForSubtractHeat(houseId));
+        return responseBean;
     }
 
     @Override
-    public TaPreselectionRecord checkPreselect(String personId, String houseId) {
-        logger.info("checkPreselect 接收参数：personId：{}，houseId：{}", personId, houseId);
-
-        return taPreselectionRecordMapper.getRecordByPersonIdAndHouseId(personId, houseId);
+    public ResponseBean selectPreSelectRecordList(Integer pageNum, Integer pageSize, String salesBatchId, Integer houseId, Integer orgId, String phone, String apartmentId, Integer status) {
+        Page page = new Page(pageNum, pageSize);
+        // 分页查询
+        List<TaPreselectionRecord> list = taPreselectionRecordMapper.selectPreSelectRecordList(page, salesBatchId, houseId, orgId, phone, apartmentId, status);
+        page.setRecords(list);
+        return ResponseBean.success(page);
     }
 }

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

@@ -210,7 +210,7 @@ public class TaRecommendCustomerServiceImpl extends ServiceImpl<TaRecommendCusto
     }
 
     @Override
-    public ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
+    public synchronized ResponseBean recommendCust(String paramStr, String openid,Integer orgId) {
         JSONObject params = JSONObject.parseObject(paramStr);
         if (null == params) {
             return ResponseBean.error("解析参数失败", ResponseBean.ERROR_ILLEGAL_PARAMS);

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

@@ -1,14 +1,31 @@
 package com.huiju.estateagents.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.huiju.estateagents.entity.TaSalesBatch;
+import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.common.StringUtils;
+import com.huiju.estateagents.entity.*;
+import com.huiju.estateagents.mapper.TaHousingResourcesMapper;
+import com.huiju.estateagents.mapper.TaPosterMapper;
 import com.huiju.estateagents.mapper.TaSalesBatchMapper;
+import com.huiju.estateagents.service.ITaBuildingRoomService;
+import com.huiju.estateagents.service.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaSalesBatchService;
+import org.apache.commons.collections.CollectionUtils;
+import org.checkerframework.checker.units.qual.A;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
 /**
  * <p>
  * 销售批次表  服务实现类
@@ -20,11 +37,153 @@ import org.springframework.stereotype.Service;
 @Service
 public class TaSalesBatchServiceImpl extends ServiceImpl<TaSalesBatchMapper, TaSalesBatch> implements ITaSalesBatchService {
 
+    private Logger logger = LoggerFactory.getLogger(TaSalesBatchServiceImpl.class);
+
     @Autowired
     private TaSalesBatchMapper taSalesBatchMapper;
 
+    @Autowired
+    TaPosterMapper taPosterMapper;
+
+    @Autowired
+    private ShareContentServiceImpl shareContentService;
+
+    @Autowired
+    private TdPosterTemplateServiceImpl tdPosterTemplateService;
+
+    @Autowired
+    private TaPosterServiceImpl taPosterService;
+
+    @Autowired
+    private TaHousingResourcesMapper taHousingResourcesMapper;
+
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
+    @Autowired
+    private ITaBuildingRoomService taBuildingRoomService;
+
     @Override
     public IPage<TaSalesBatch> selectByCondition(IPage<TaSalesBatch> page, String salesBatchName, String buildingId, Integer status, Integer orgId) {
         return taSalesBatchMapper.selectByCondition(page, salesBatchName, buildingId, status, orgId);
     }
+
+    @Override
+    public ResponseBean delSalesBatchList(Integer orgId, List<TaSalesBatch> taSalesBatchList) {
+        ResponseBean responseBean = new ResponseBean();
+        Integer count = taSalesBatchMapper.countPreSelectRecord(orgId, taSalesBatchList);
+        if (count > 0) {
+            responseBean.addError("已有用户预选，请先删除预选记录。");
+            return responseBean;
+        }
+        //无预选状态下删除销售批次的同时删除房源信息
+        List<TaHousingResources> housingList =taHousingResourcesMapper.selectHousingList(orgId,taSalesBatchList);
+        List<TaBuildingRoom> taBuildingRoomList = new ArrayList<>();
+        housingList.forEach(e -> {
+            e.setStatus(CommConstant.STATUS_DELETE);
+            TaBuildingRoom taBuildingRoom = new TaBuildingRoom();
+            taBuildingRoom.setRoomId(e.getRoomId());
+            taBuildingRoom.setStatus(CommConstant.STATUS_DELETE);
+            taBuildingRoomList.add(taBuildingRoom);
+        });
+
+        //房源改为无效
+        if (CollectionUtils.isNotEmpty(housingList)){
+            taHousingResourcesService.updateBatchById(housingList);
+        }
+
+        if (CollectionUtils.isNotEmpty(taBuildingRoomList)){
+            taBuildingRoomService.updateBatchById(taBuildingRoomList);
+        }
+
+        //删除销售批次
+        taSalesBatchMapper.updateSalesBatchStatus(orgId, taSalesBatchList);
+        return responseBean;
+    }
+
+    /**
+     * 获取通知信息
+     *
+     * @param salesBatchId 销售批次ID
+     * @return
+     */
+    @Override
+    public ResponseBean getNoticeInfo(Integer salesBatchId) {
+        logger.info("getNoticeInfo 接收参数：saleBatchId：{}", salesBatchId);
+
+        ResponseBean responseBean = new ResponseBean();
+
+        TaSalesBatch salesBatch = getById(salesBatchId);
+        if (salesBatch == null) {
+            responseBean.addError("未查询到数据");
+            return responseBean;
+        }
+
+        Long totalHouses = null;
+        BigDecimal totalRealHeat = null;
+        BigDecimal totalHeat = null;
+
+        // 获取房源预选数量
+        Map<String, Object> result = taSalesBatchMapper.getTotalHousesAndHeat(salesBatchId);
+        if (result != null) {
+            totalHouses = (Long) result.get("totalHouses");
+            totalRealHeat = (BigDecimal) result.get("totalRealHeat");
+            totalHeat = (BigDecimal) result.get("totalHeat");
+        }
+
+        JSONObject obj = new JSONObject();
+        obj.put("preselectionStartTime", salesBatch.getPreselectionStartTime());
+        obj.put("preselectionEndTime", salesBatch.getPreselectionEndTime());
+        obj.put("salesNumber", totalHouses == null ? 0 : totalHouses);
+        obj.put("preselectionNumber", totalRealHeat == null ? 0 : totalRealHeat);
+        obj.put("heatNumber", totalHeat == null ? 0 : totalHeat);
+        responseBean.addSuccess(obj);
+        return responseBean;
+    }
+
+    /**
+     * 获取销售批次详情
+     *
+     * @param salesBatchId
+     * @return
+     */
+    @Override
+    public ResponseBean getSalesBatchById(Integer salesBatchId) {
+        logger.info("getSalesBatchById 接收参数：saleBatchId：{}", salesBatchId);
+
+        ResponseBean responseBean = new ResponseBean();
+        TaSalesBatch result = getById(salesBatchId);
+        if (result == null) {
+            responseBean.addSuccess(null);
+            return responseBean;
+        }
+
+        // 获取海报信息
+        QueryWrapper<TaPoster> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("target_id", salesBatchId + "");
+        queryWrapper.eq("target_type", "house");
+        queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
+        List<TaPoster> posterList = taPosterService.list(queryWrapper);
+
+        // 获取分享内容信息
+        List<TaShareContent> shareContentList = shareContentService.getPostersForTarget(salesBatchId + "", "house");
+
+        List<TaPoster> resultPosterList = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(posterList)) {
+            for (TaPoster poster : posterList) {
+                QueryWrapper<TdPosterTemplate> templateQueryWrapper = new QueryWrapper<>();
+                templateQueryWrapper.eq("status", "1");
+                templateQueryWrapper.eq("type ", "HousingChoice ");
+                List<TdPosterTemplate> posterTemplate = tdPosterTemplateService.list(templateQueryWrapper);
+
+                poster.setTemplates(posterTemplate);
+                resultPosterList.add(poster);
+            }
+        }
+
+        result.setPosters(resultPosterList);
+        result.setShareContents(shareContentList);
+        responseBean.addSuccess(result);
+        return responseBean;
+    }
 }

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

@@ -1,6 +1,7 @@
 package com.huiju.estateagents.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+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;
@@ -11,6 +12,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -37,6 +39,10 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
 
     @Autowired
     private TaSharePersonFromMapper taSharePersonFromMapper;
+
+    @Autowired
+    private  TaSalesBatchMapper taSalesBatchMapper;
+
     /**
      * 添加客户分享记录
      *
@@ -99,4 +105,17 @@ public class TaSharePersonFromServiceImpl extends ServiceImpl<TaSharePersonFromM
         taSharePersonFromMapper.insert(taSharePersonFrom);
         return taSharePersonFrom;
     }
+
+    @Override
+    public ResponseBean selectHouseVisitList(Integer pageNum, Integer pageSize, Integer orgId, String personType, String sceneType, String phone, String saleBatchId) {
+        Page page = new Page(pageNum,pageSize);
+        // 分页查询
+        List<TaSharePersonFrom> list = taSharePersonFromMapper.selectHouseVisitList(page, orgId, personType, sceneType, phone, saleBatchId);
+        TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
+        page.setRecords(list);
+        return ResponseBean.success(page);
+    }
 }

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

@@ -191,9 +191,9 @@ public class TaShareServiceImpl extends ServiceImpl<TaShareMapper, TaShare> impl
         // 分页查询
         List<TaShare> list = taShareMapper.selectHouseShareList(page, orgId, personType, shareType, phone, saleBatchId);
         TaSalesBatch taSalesBatch = taSalesBatchMapper.selectById(saleBatchId);
-//        list.forEach(e -> {
-//            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
-//        });
+        list.forEach(e -> {
+            e.setSalesBatchName(taSalesBatch.getSalesBatchName());
+        });
         page.setRecords(list);
         return ResponseBean.success(page);
     }

src/main/resources/mapper/TaBuildingTermMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huiju.estateagents.mapper.TaBuildingTermMapper">
+
+</mapper>

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -4,109 +4,218 @@
 
     <select id="listHousingResources" 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.inside_area,
-        t2.building_area
+          *
         FROM
-        ta_housing_resources t,
-        ta_building_apartment t2
+          (
+        SELECT
+            t.house_id,
+            (
+            CASE
+            WHEN ( SELECT num_char_extract ( t.term_name, 2 ) + 0 ) = 0 THEN
+            ( SELECT num_char_extract ( t.term_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.term_name, 2 ) + 0 )
+            END
+            ) termNamePre,
+            (
+            CASE
+            WHEN ( SELECT num_char_extract ( t.block_name, 2 ) + 0 ) = 0 THEN
+            ( SELECT num_char_extract ( t.block_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.block_name, 2 ) + 0 )
+            END
+            ) blockNamePre,
+            (
+            CASE
+            WHEN ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 ) = 0 THEN
+            ( SELECT num_char_extract ( t.unit_name, 2 ) ) ELSE ( SELECT num_char_extract ( t.unit_name, 2 ) + 0 )
+            END
+            ) unitNamePre,
+            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.inside_area,
+            t2.building_area,
+            t2.apartment_name,
+            t3.term_id,
+            t.term_name
+        FROM
+          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
         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
+            t.sales_batch_id = #{salesBatchId}
+            AND t.org_id = #{orgId}
+            <choose>
+                <when test=" endPrice != null and startPrice == null">
+                    AND t.price &lt;= #{endPrice}
+                </when>
+                <when test=" startPrice != null and endPrice == null">
+                    AND t.price &gt;= #{startPrice}
+                </when>
+                <when test="startPrice != null and endPrice != null ">
+                    AND ( t.price BETWEEN #{startPrice} AND #{endPrice} )
+                </when>
+                <otherwise>
+                </otherwise>
+            </choose>
+            <if test="apartmentId != null and apartmentId != ''">
+                AND t.apartment_id = #{apartmentId}
+            </if>
+            <choose>
+                <when test="type == 1">
+                    AND t.`status` > 0
+                </when>
+                <otherwise>
+                    AND t.`status` > -1
+                </otherwise>
+            </choose>
+
+          ) t5
         ORDER BY
-        t.create_date DESC
+            t5.termNamePre,
+            t5.blockNamePre,
+            t5.unitNamePre,
+            ( SELECT num_char_extract ( t5.floor_name, 2 ) + 0 ) DESC,
+            ( SELECT num_char_extract ( t5.room_name, 2 ) + 0)
     </select>
 
     <select id="listBuildApartmentBySalesBatchId" resultType="com.huiju.estateagents.entity.TaBuildingApartment">
-        SELECT
+	    SELECT
             t3.apartment_id,
             t3.apartment_name,
             t3.apartment_type,
             t3.inside_area,
-            t3.building_area
+            t3.building_area,
+            t2.apartment_id
+        FROM
+            (
+        SELECT
+            t.sales_batch_id,
+            t.apartment_id
         FROM
-            ( SELECT t.sales_batch_id, t.apartment_id FROM ta_housing_resources t WHERE t.sales_batch_id = #{salesBatchId} GROUP BY t.apartment_id ) t2
+            ta_housing_resources t
+        WHERE
+            t.sales_batch_id = #{salesBatchId}
+            AND t.`status` > 0
+            AND t.apartment_id IS NOT NULL
+        GROUP BY
+            t.apartment_id
+            ) t2
             LEFT JOIN ta_building_apartment t3 ON t2.apartment_id = t3.apartment_id
         ORDER BY
-	      t3.apartment_name
+            t3.apartment_name
     </select>
 
     <update id="updateForAddHeat" parameterType="java.lang.String">
         UPDATE ta_housing_resources t
-        SET t.heat = t.heat + 1
+        SET t.real_heat = IFNULL(t.real_heat, 0) + 1
         WHERE
             t.house_id = #{houseId}
-            AND t.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 = IFNULL(t.real_heat, 0) - 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,
+            t.term_id,
+            t.term_name,
+            t2.apartment_name,
+            t2.inside_area,
+            t2.building_area,
+            t3.preselection_start_time,
+            t3.preselection_end_time,
+            t3.`status` saleBatchStatus,
+            t4.building_name buildingName
         FROM
-        ta_housing_resources t,
-        ta_building_apartment t2,
-        ta_sales_batch t3
+            ta_housing_resources t
+            LEFT JOIN ta_building_apartment t2 ON t.apartment_id = t2.apartment_id
+            LEFT JOIN ta_sales_batch t3 ON t.sales_batch_id = t3.sales_batch_id
+            LEFT JOIN ta_building t4 ON t.building_id = t4.building_id
         WHERE
-        t.house_id = #{houseId}
-        AND t.apartment_id = t2.apartment_id
-        AND t.sales_batch_id = t3.sales_batch_id
+            t.house_id = #{houseId}
         <if test="type != null and type == '1' ">
             AND t.`status` = 1
             AND t3.`status` = 1
         </if>
-        AND t2.`status` = 1
+    </select>
+
+    <select id="getHouseResourceList" resultType="com.huiju.estateagents.entity.TaHousingResources">
+        SELECT
+            t.* ,
+            a.apartment_name,
+            u.user_name as update_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` > -1
+        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 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>
+
+    <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">
+        select * from ta_housing_resources where org_id = #{orgId} and sales_batch_id in
+        <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+            #{taSalesBatch.salesBatchId}
+        </foreach>
     </select>
 
 </mapper>

src/main/resources/mapper/TaPersonMapper.xml

@@ -257,7 +257,7 @@ FROM
             FROM
                ta_person tp
              LEFT JOIN
-                ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
+            ( SELECT *, MAX(visit_time) as max_visit_time FROM ta_person_visit_record where org_id = #{org} GROUP BY  person_id  ) as tpvr
             ON tp.person_id = tpvr.person_id
              where tp.org_id = #{org} AND tp.person_type IN ('customer','drift','estate agent')
              GROUP BY DATE_FORMAT( tpvr.max_visit_time , '%Y-%m-%d' )

src/main/resources/mapper/TaPersonVisitRecordMapper.xml

@@ -336,6 +336,26 @@
             and t.person_id = #{personId} order by t.create_date desc limit 9999
             ) t
             group by t.target_id
+         union all
+
+        select * from (
+            select
+            t.be_share as target_id,
+            g.aerial_view_img as activity_img,
+            g.sales_batch_name as activity_name,
+            '1' as price,
+            '2' as building_name,
+            '3' as address,
+            1 as building_type_id,
+			left(t.tagert_type,5) as eventType,
+			t.create_date as visit_time
+            from ta_share t
+            left join ta_sales_batch g on t.be_share = g.sales_batch_id
+            where t.tagert_type like CONCAT('house' , '%')
+            and t.person_id = #{personId} order by t.create_date desc limit 9999
+            ) t
+            group by t.target_id
+
         ) t
         order by t.visit_time desc
     </select>

src/main/resources/mapper/TaPreselectionRecordMapper.xml

@@ -4,20 +4,40 @@
 
     <select id="listPreselectionRecord" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
         SELECT
-            t.*,
+            t3.*,
+            t4.building_name,
+            t5.`status` saleBatchStatus
+        FROM
+            (
+        SELECT
+            t.preselection_record_id,
+            t.person_id,
+            t.org_id,
+            t.house_id,
+            t.`status`,
+            t.create_date,
+            t2.term_name,
             t2.block_name,
             t2.unit_name,
             t2.floor_name,
             t2.room_name,
-            t2.price
+            t2.price,
+            t2.apartment_id,
+            t2.building_id buildingId,
+            t2.`status` housingStatus,
+            t2.sales_batch_id saleBatchId
         FROM
-            ta_preselection_record t ,
+            ta_preselection_record t,
             ta_housing_resources t2
         WHERE
-            t.person_id = #{persionId}
-            and t.house_id = t2.house_id
-        ORDER BY
-            t.create_date DESC;
+            t.person_id = #{personId}
+            AND t.org_id = #{orgId}
+            AND t.house_id = t2.house_id
+            ) 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
+         ORDER BY
+            t3.create_date DESC
     </select>
 
     <select id="getRecordByPersonIdAndHouseId" resultType="com.huiju.estateagents.entity.TaPreselectionRecord">
@@ -28,6 +48,46 @@
         WHERE
             t.person_id = #{personId}
             AND t.house_id = #{houseId}
+            AND t.status = 1
+    </select>
+
+    <select id="selectPreSelectRecordList" resultType="com.huiju.estateagents.po.TaPreselectionRecordPO">
+        select * from (
+        select t.house_id,
+        a.block_name,
+        a.unit_name,
+        a.floor_name,
+        a.room_name,
+        a.apartment_id,
+        b.nickname as nameOrnick,
+        b.`name`,
+        b.avatarurl,
+        b.phone,
+        a.term_name,
+        t.`status`,
+        t.update_date,
+        t.building_id,
+        t.sales_batch_id,
+        e.apartment_name,
+        b.person_id
+        from ta_preselection_record t
+        left join ta_housing_resources a on t.house_id = a.house_id
+        left join ta_person b on t.person_id = b.person_id
+        LEFT JOIN ta_building_apartment e ON a.apartment_id = e.apartment_id
+        where b.org_id = #{orgId} and a.sales_batch_id = #{salesBatchId}
+        <if test="houseId != null and houseId !=''">and t.house_id = #{houseId}
+        </if>
+        <if test="phone != null and phone != ''">
+            and b.
+            phone = #{phone}
+        </if>
+        <if test="apartmentId != null and apartmentId != ''">
+          and a.apartment_id = #{apartmentId}
+        </if>
+        <if test="status != null">
+          and t.status = #{status}
+        </if>
+        order by t.create_date desc) t group by t.house_id, t.person_id
     </select>
 
 </mapper>

src/main/resources/mapper/TaRecommendCustomerMapper.xml

@@ -111,13 +111,13 @@ FROM
         SELECT
         a.*,
         a.customer_id AS customerId,
-        if(b.NAME  = null, d.name, b.name) as consultantName,
-        if(b.tel  = null, d.tel, b.tel) AS consultTel,
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel,
         c.building_name as intentionName
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person d on a.realty_consultant = d.user_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -135,10 +135,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -170,12 +170,12 @@ FROM
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
-        LEFT JOIN ta_person c on a.recommend_person = c.person_id
         LEFT JOIN ta_user d on d.user_id = a.realty_consultant
         LEFT JOIN ta_person_from_record p ON a.person_id = p.person_id AND p.is_first_time = 1
         <if test="orgId != null">
             and p.org_id =  #{orgId}
         </if>
+        LEFT JOIN ta_person c on p.share_person_id = c.person_id
         LEFT JOIN td_wx_dict w ON p.scene_id = w.scene_id
         <where>
             a.status > 0
@@ -377,11 +377,12 @@ FROM
         a.phone as phone,
         c.building_name as intentionName,
         if(a.sex = 1, '男',if(a.sex = 2, '女', '未知')) as sex,
-        b.NAME AS consultantName,
-        b.tel AS consultTel
+        IFNULL(d.user_name, b.name) as consultantName,
+        IFNULL(d.phone, b.tel) as consultTel
         FROM
         ta_recommend_customer a
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
+        LEFT JOIN ta_user d on a.realty_consultant = d.user_id
         LEFT JOIN ta_building c ON a.building_id = c.building_id
         <where>
             a.status > 0
@@ -399,10 +400,10 @@ FROM
                 and a.phone like concat(concat("%",#{tel}),"%")
             </if>
             <if test="consultName != null and consultName !=''">
-                and b.name like CONCAT('%',#{consultName}, '%')
+                and IFNULL(d.user_name, b.name) like CONCAT('%',#{consultName}, '%')
             </if>
             <if test="consultTel != null and consultTel !=''">
-                and b.tel = #{consultTel}
+                and IFNULL(d.phone, b.tel) = #{consultTel}
             </if>
             <if test="entryType != null and entryType !=''">
                 and a.entry_type = #{entryType}
@@ -553,7 +554,7 @@ FROM
         </where>
         order by b.create_date desc
     </select>
-    <!--        limit #{pageCode}, #{pageSize}-->
+<!--    limit #{pageCode}, #{pageSize}-->
 
     <select id="getCustomerExportListCount" resultType="Integer" >
         SELECT
@@ -673,7 +674,7 @@ FROM
         group by a.customer_id,a.building_id
         order by a.create_date desc
     </select>
-    <!--        limit #{pageCode}, #{pageSize}-->
+<!--    limit #{pageCode}, #{pageSize}-->
 
     <select id="getMyCustStatistics" resultType="java.util.Map">
         SELECT

src/main/resources/mapper/TaSalesBatchMapper.xml

@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.huiju.estateagents.mapper.TaSalesBatchMapper">
+    <update id="updateSalesBatchStatus">
+      update ta_sales_batch t set t.status = -1
+      where t.org_id = #{orgId}
+      and t.sales_batch_id in
+      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+         #{taSalesBatch.salesBatchId}
+      </foreach>
+    </update>
 
     <select id="selectByCondition" resultType="com.huiju.estateagents.entity.TaSalesBatch">
         select t.*, a.building_name from ta_sales_batch t
         left join ta_building a on t.building_id = a.building_id
-        where t.org_id = #{orgId}
+        where t.org_id = #{orgId} and t.status != -1
         <if test="buildingId != null and buildingId != ''">
             and t.building_id = #{buildingId}
         </if>
@@ -16,4 +24,24 @@
             and t.status = #{status}
         </if>
     </select>
+
+    <select id="countPreSelectRecord" resultType="java.lang.Integer">
+      select count(*) from ta_preselection_record t
+      where t.org_id = #{orgId}
+      and t.sales_batch_id in
+      <foreach collection="taSalesBatchList" item="taSalesBatch" open="(" close=")" separator=",">
+          #{taSalesBatch.salesBatchId}
+      </foreach>
+    </select>
+
+    <select id="getTotalHousesAndHeat" resultType="java.util.Map">
+        SELECT
+            count( * ) totalHouses,
+            sum( t.real_heat ) totalRealHeat,
+            sum( t.heat) totalHeat
+        FROM
+            ta_housing_resources t
+        WHERE
+            t.STATUS = 1 and t.sales_batch_id = #{salesBatchId}
+    </select>
 </mapper>

src/main/resources/mapper/TaShareCountMapper.xml

@@ -25,9 +25,9 @@
         when e.building_name != null || e.building_name != '' then e.building_name
         when f.news_name != null || f.news_name != '' then f.news_name
         when g.`name` != null || g.`name` != '' then g.`name`
+        when h.sales_batch_name != null || h.sales_batch_name != '' then h.sales_batch_name
         else '空'
         end as shareTitle,t.create_date
-
         from ta_share_count t
         left join ta_building_dynamic a on t.be_share = a.dynamic_id and t.tagert_type = 'activity'
         left join ta_help_activity b on t.be_share = b.help_activity_id and t.tagert_type = 'help'
@@ -35,10 +35,11 @@
         LEFT JOIN ta_drainage d on t.be_share = d.drainage_id and t.tagert_type = 'h5'
         left join ta_building e on t.be_share = e.building_id and t.tagert_type = 'project'
         LEFT JOIN ta_news f on t.be_share = f.news_id and t.tagert_type = 'news'
+        LEFT JOIN ta_sales_batch h on t.be_share = h.sales_batch_id and t.tagert_type like CONCAT('house' , '%')
         left JOIN ta_person g on t.be_share = g.person_id and t.tagert_type = 'consultant'
         where t.person_id = #{personId}
         <if test="shareType != null and shareType != ''">
-            and t.tagert_type = #{shareType}
+            and (t.tagert_type = #{shareType} || t.tagert_type like CONCAT(#{shareType} , '%'))
         </if>
         <if test="shareTitle != null and shareTitle != ''">
             and
@@ -49,7 +50,8 @@
                 d.`name` like CONCAT('%', #{shareTitle} , '%') or
                 e.building_name like CONCAT('%', #{shareTitle} , '%') or
                 f.news_name like CONCAT('%', #{shareTitle} , '%') or
-                g.`name` like CONCAT('%', #{shareTitle} , '%')
+                g.`name` like CONCAT('%', #{shareTitle} , '%') or
+                h.sales_batch_name like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         order by t.create_date desc
@@ -64,7 +66,8 @@
                 when d.`name` != null || d.name != '' then d.`name`
                 when e.building_name != null || e.building_name != '' then e.building_name
                 when f.news_name != null || f.news_name != '' then f.news_name
-                when a.`name` != null || a.`name` != '' then a.`name`
+                when h.sales_batch_name != null || h.sales_batch_name !='' then h.sales_batch_name
+                WHEN y.`name` != NULL || y.`name` != '' THEN y.`name`
                 else '空'
                 end as shareTitle,
                         z.phone as personPhone,
@@ -80,7 +83,7 @@
                 LEFT JOIN ta_drainage d on t.target_id = d.drainage_id and t.target_type = 'h5_share'
                 left join ta_building e on t.target_id = e.building_id and t.target_type = 'building_share'
                 LEFT JOIN ta_news f on t.target_id = f.news_id and t.target_type = 'news_share'
-
+                left join ta_sales_batch h on t.target_id = h.sales_batch_id and t.target_type = 'house_share'
         LEFT JOIN ta_person a ON t.share_person = a.person_id
         LEFT JOIN ta_person y on t.share_person = y.user_id
         LEFT JOIN ta_person z ON t.person_id = z.person_id
@@ -102,6 +105,7 @@
             e.building_name like CONCAT('%', #{shareTitle} , '%') or
             f.news_name like CONCAT('%', #{shareTitle} , '%') or
             a.`name` like CONCAT('%', #{shareTitle} , '%')
+            h.sales_batch_name like like CONCAT('%', #{shareTitle} , '%')
             )
         </if>
         GROUP BY

src/main/resources/mapper/TaShareMapper.xml

@@ -3,9 +3,12 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaShareMapper">
 
     <select id="selectHouseShareList" resultType="com.huiju.estateagents.entity.TaShare">
-      select a.avatarurl as photoOravatar, a.nickname, a.name, a.phone, a.person_type, t.create_date From ta_share t
+      select a.avatarurl as photoOravatar, a.nickname as nameOrnick, a.name, a.phone, a.person_type, t.tagert_type, t.create_date From ta_share_count t
       left join ta_person a on t.person_id = a.person_id
+      left join ta_sales_batch b on t.be_share = b.sales_batch_id
       where a.org_id = #{orgId}
+      and t.tagert_type in ('housePost','houseApp')
+      and b.sales_batch_id = #{saleBatchId}
       <if test="personType != null and personType != ''">
           and a.person_Type = #{personType}
       </if>

src/main/resources/mapper/TaSharePersonFromMapper.xml

@@ -23,4 +23,35 @@
         GROUP BY t.person_id
         ) t
     </select>
+
+    <select id="selectHouseVisitList" resultType="com.huiju.estateagents.entity.TaSharePersonFrom">
+        select c.avatarurl as photoOravatar, c.nickname as nameOrnick, c.name, c.phone, c.person_type as sharePersonType, t.create_date, b.scene_type as sceneName
+        From ta_share_person_from t
+        LEFT JOIN ta_person_from_record a on t.person_id = a.person_id
+        left join td_wx_dict b on a.scene_id = b.scene_id
+        left join ta_person c on t.person_id = c.person_id
+        left join ta_housing_resources d on d.house_id = t.target_id
+        where a.org_id = #{orgId}
+        and t.target_type = 'house_share'
+        and t.target_id = #{saleBatchId}
+        <if test="personType != null and personType != ''">
+            and c.person_Type = #{personType}
+        </if>
+        <if test="sceneType != null and sceneType != ''">
+            <choose>
+                <when test="sceneType == 'share'">
+                    and b.scene_type like CONCAT('%', #{sceneType})
+                </when>
+                <otherwise>
+                    and b.scene_type = #{sceneType}
+                </otherwise>
+            </choose>
+        </if>
+        <if test="phone != null and phone != ''">
+            and c.phone = #{phone}
+        </if>
+        and t.share_person != t.person_id
+        GROUP BY t.target_id,t.target_type,t.person_id,t.share_person
+        order by t.create_date desc
+    </select>
 </mapper>