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

src/main/java/com/huiju/estateagents/bo/request/RaiseRecordRequestBO.java

@@ -92,4 +92,9 @@ public class RaiseRecordRequestBO {
      * 结束时间
      */
     private String endTime;
+
+    /**
+     * 用户姓名
+     */
+    private String personName;
 }

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

@@ -81,13 +81,15 @@ public class TaHousingResourcesController extends BaseController {
                                                @RequestParam(value = "status", required = false) Integer status,
                                                @RequestParam(value = "houseId", required = false) String houseId,
                                                @RequestParam(value = "lockingStatus", required = false) String lockingStatus,
+                                               @RequestParam(value = "actulStartHot", required = false) String actulStartHot,
+                                               @RequestParam(value = "actulEndHot", required = false) String actulEndHot,
                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
                                                HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
             responseBean = iTaHousingResourcesService.selectPageList(salesBatchId, buildingId, pageNumber, pageSize, getOrgId(request), termName, blockName,
-                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus);
+                    unitName, floorName, roomName, apartmentId, status, houseId, lockingStatus,actulStartHot,actulEndHot);
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("taHousingResourcesList -=- {}", e.toString());
@@ -234,7 +236,7 @@ public class TaHousingResourcesController extends BaseController {
      */
     @RequestMapping(value = "/wx/listHousingResources", method = RequestMethod.GET)
     public ResponseBean listHousingResources(@RequestParam(value = "salesBatchId") String salesBatchId,
-                                             String startPrice, String endPrice, String apartmentId,@RequestParam(value = "source", required = false) String source,
+                                             String startPrice, String endPrice, String apartmentId, @RequestParam(value = "source", required = false) String source,
                                              HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
@@ -275,7 +277,7 @@ public class TaHousingResourcesController extends BaseController {
                     }
                 });
                 //我的认筹和锁定
-                if (CollectionUtils.isNotEmpty(taRaiseRecordList)){
+                if (CollectionUtils.isNotEmpty(taRaiseRecordList)) {
                     taRaiseHouseList.forEach(r -> {
                         //我的认筹
                         if (e.getHouseId().equals(r.getHouseId())) {
@@ -537,10 +539,10 @@ public class TaHousingResourcesController extends BaseController {
      * @return
      */
     @RequestMapping(value = "/wx/check/raise", method = RequestMethod.GET)
-    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds,HttpServletRequest request) {
+    public ResponseBean checkRaise(@RequestParam(value = "houseIds") String houseIds, HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds,getPersonId(request),getOrgId(request));
+            boolean state = iTaHousingResourcesService.checkRaiseState(houseIds, getPersonId(request), getOrgId(request));
             responseBean.addSuccess(state);
         } catch (Exception e) {
             logger.error("校验房源状态 -=- {}", e.getMessage());

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

@@ -120,7 +120,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
                                                    @Param("orgId") Integer orgId, @Param("termName") String termName, @Param("blockName") String blockName,
                                                    @Param("unitName") String unitName, @Param("floorName") String floorName, @Param("roomName") String roomName,
                                                    @Param("apartmentId") String apartmentId, @Param("status") Integer status, @Param("houseId") String houseId,
-                                                   @Param("lockingStatus") String lockingStatus);
+                                                   @Param("lockingStatus") String lockingStatus,@Param("actulStartHot") String actulStartHot,@Param("actulEndHot") String actulEndHot);
 
     List<TaHousingResources> selectHousingList(@Param("orgId") Integer orgId, @Param("taSalesBatchList") List<TaSalesBatch> taSalesBatchList);
 

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

@@ -1,6 +1,5 @@
 package com.huiju.estateagents.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuildingApartment;
@@ -29,7 +28,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param type  为1只展示已发布的房源
      * @return
      */
-    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId,String personId,String source );
+    List<TaHousingResourcesPO> listHousingResources(Integer orgId, String salesBatchId, String startPrice, String endPrice, String apartmentId, String personId, String source);
 
 
     /* 分页获取房源列表-后台管理端
@@ -95,7 +94,8 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @return
      */
     ResponseBean selectPageList(Integer salesBatchId, String buildingId, Integer pageNumber, Integer pageSize, Integer orgId, String termName,
-                                String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus);
+                                String blockName, String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus,
+                                String actulStartHot, String actulEndHot);
 
     /**
      * 更新房源信息
@@ -174,6 +174,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
 
     /**
      * 校验房源的认筹状态
+     *
      * @param houseIds
      * @param personId
      * @param orgId

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

@@ -24,7 +24,6 @@ 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 sun.util.locale.LocaleUtils;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
@@ -394,10 +393,11 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
      */
     @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, String lockingStatus) {
+                                       String unitName, String floorName, String roomName, String apartmentId, Integer status, String houseId, String lockingStatus,
+                                       String actulStartHot, String actulEndHot) {
         IPage<TaHousingResources> pg = new Page<>(pageNumber, pageSize);
         IPage<TaHousingResources> pageData = taHousingResourcesMapper.getHouseResourceList(pg, salesBatchId, buildingId, orgId, termName, blockName, unitName,
-                floorName, roomName, apartmentId, status, houseId, lockingStatus);
+                floorName, roomName, apartmentId, status, houseId, lockingStatus, actulStartHot, actulEndHot);
         return ResponseBean.success(pageData);
     }
 
@@ -673,64 +673,64 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
 
         // 更新为锁定状态
         if ("locked".equals(type)) {
-                // 校验当前房源状态
-                if ("locked".equals(po.getHouseLockingStatus())){
-                    responseBean.addError("房源已被锁定");
-                    return responseBean;
-                }
+            // 校验当前房源状态
+            if ("locked".equals(po.getHouseLockingStatus())) {
+                responseBean.addError("房源已被锁定");
+                return responseBean;
+            }
 
-                TaHousingResources housingResources = new TaHousingResources();
-                housingResources.setHouseId(po.getHouseId());
-                housingResources.setHouseLockingStatus("locked");
-                housingResources.setHouseLockingPerson(personId);
-                housingResources.setUpdateDate(LocalDateTime.now());
-                housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
-                updateById(housingResources);
-
-                //更新认筹单房源锁定状态
-                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
-                taRaiseRecord.setRaiseRecordId(raiseRecordId);
-                taRaiseRecord.setHouseLockingStatus("locked");
-                taRaiseRecordMapper.updateById(taRaiseRecord);
-
-                // 更新关联表状态
+            TaHousingResources housingResources = new TaHousingResources();
+            housingResources.setHouseId(po.getHouseId());
+            housingResources.setHouseLockingStatus("locked");
+            housingResources.setHouseLockingPerson(personId);
+            housingResources.setUpdateDate(LocalDateTime.now());
+            housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
+            updateById(housingResources);
+
+            //更新认筹单房源锁定状态
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setHouseLockingStatus("locked");
+            taRaiseRecordMapper.updateById(taRaiseRecord);
+
+            // 更新关联表状态
 //                TaRaiseHouse raiseHouse = new TaRaiseHouse();
 //                raiseHouse.setRaiseHouseId(raiseHouseId);
 //                raiseHouse.setHouseLockingStatus("locked");
 //            taRaiseHouseService.updateById(raiseHouse);
-                responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
-                return responseBean;
+            responseBean.addSuccess(taRaiseRecordMapper.updateById(taRaiseRecord));
+            return responseBean;
         }
 
         // 更新为解锁状态
         if ("unlocked".equals(type)) {
-                // 校验当前房源状态
-                if ("unlocked".equals(po.getHouseLockingStatus())){
-                    responseBean.addError("房源已被解锁");
-                    return responseBean;
-                }
+            // 校验当前房源状态
+            if ("unlocked".equals(po.getHouseLockingStatus())) {
+                responseBean.addError("房源已被解锁");
+                return responseBean;
+            }
 
-                TaHousingResources housingResources = new TaHousingResources();
-                housingResources.setHouseId(po.getHouseId());
-                housingResources.setHouseLockingStatus("unlocked");
-                housingResources.setHouseLockingPerson("");
-                housingResources.setUpdateDate(LocalDateTime.now());
-                updateById(housingResources);
+            TaHousingResources housingResources = new TaHousingResources();
+            housingResources.setHouseId(po.getHouseId());
+            housingResources.setHouseLockingStatus("unlocked");
+            housingResources.setHouseLockingPerson("");
+            housingResources.setUpdateDate(LocalDateTime.now());
+            updateById(housingResources);
 
-                //更新认筹单房源锁定状态
-                TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
-                taRaiseRecord.setRaiseRecordId(raiseRecordId);
-                taRaiseRecord.setHouseLockingStatus("unlocked");
-                taRaiseRecordMapper.updateById(taRaiseRecord);
+            //更新认筹单房源锁定状态
+            TaRaiseRecord taRaiseRecord = new TaRaiseRecord();
+            taRaiseRecord.setRaiseRecordId(raiseRecordId);
+            taRaiseRecord.setHouseLockingStatus("unlocked");
+            taRaiseRecordMapper.updateById(taRaiseRecord);
 
-                // 更新关联表状态
+            // 更新关联表状态
 //                TaRaiseHouse raiseHouse = new TaRaiseHouse();
 //                raiseHouse.setRaiseHouseId(raiseHouseId);
 ////                raiseHouse.setHouseLockingStatus("unlocked");
 ////                raiseHouse.setPersonId("");
 ////                raiseHouse.setPersonName("");
 //                responseBean.addSuccess(taRaiseHouseService.updateById(raiseHouse));
-                return responseBean;
+            return responseBean;
         }
         responseBean.addError("fail");
         return responseBean;
@@ -751,24 +751,24 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         TaHousingResources taHousingResources = taHousingResourcesMapper.selectById(houseIdArr[0]);
         //通过销售批次信息获取认筹信息
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
-        taRaiseQueryWrapper.eq("org_id",orgId);
-        taRaiseQueryWrapper.eq("sales_batch_id",taHousingResources.getSalesBatchId());
-        taRaiseQueryWrapper.eq("building_id",taHousingResources.getBuildingId());
-        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        taRaiseQueryWrapper.eq("org_id", orgId);
+        taRaiseQueryWrapper.eq("sales_batch_id", taHousingResources.getSalesBatchId());
+        taRaiseQueryWrapper.eq("building_id", taHousingResources.getBuildingId());
+        taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
         if (null == taRaise) {
             throw new Exception("认筹单已经作废");
         }
         //校验房源是否同一批次
-        for (String houseId : houseIdArr){
+        for (String houseId : houseIdArr) {
             TaHousingResources taHousingResourcesChecked = taHousingResourcesMapper.selectById(houseId);
-            if (!taHousingResources.getSalesBatchId().equals(taHousingResourcesChecked.getSalesBatchId())){
+            if (!taHousingResources.getSalesBatchId().equals(taHousingResourcesChecked.getSalesBatchId())) {
                 throw new Exception("非同一批次房源");
             }
             if (taHousingResourcesChecked.getStatus() != CommConstant.STATUS_NORMAL) {
                 throw new Exception("其中有房源已被取消发布");
             }
-            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResourcesChecked.getHouseLockingStatus())){
+            if (taRaise.getHouseLockingType().equals(CommConstant.HOUSE_LOCKING_TYPE_AUTO) && CommConstant.HOUSE_LOCKING_STATUS_LOCKED.equals(taHousingResourcesChecked.getHouseLockingStatus())) {
                 throw new Exception("房源已被其他客户锁定");
             }
             if (taRaise.getNeedPreselection()) {

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -293,6 +293,12 @@
         <if test="lockingStatus != null and lockingStatus != ''">
             AND t.house_locking_status = #{lockingStatus}
         </if>
+        <if test="actulStartHot != '' and actulStartHot != null">
+            and t.real_heat &gt;= #{actulStartHot}
+        </if>
+        <if test="actulEndHot != '' and actulEndHot != null">
+            and t.real_heat &lt;= #{actulEndHot}
+        </if>
     </select>
 
     <select id="selectHousingList" resultType="com.huiju.estateagents.entity.TaHousingResources">

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -128,6 +128,9 @@
         <if test = "bo.endTime != null and bo.endTime != ''">
             AND t.create_date &lt;= STR_TO_DATE(#{bo.endTime}, '%Y-%m-%d %H:%i:%s')
         </if>
+        <if test="bo.personName != null and bo.personName != ''">
+            AND t.name = #{bo.personName}
+        </if>
         GROUP BY
             t2.raise_record_id
         ORDER BY