* 优化

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

@@ -415,7 +415,8 @@ public class TaHousingResourcesController extends BaseController {
                 return responseBean;
             }
 
-            responseBean = iTaHousingResourcesService.batchUpdateRaiseHeat(housingResources.getHouseIdList(), housingResources.getHeat(), housingResources.getSalesBatchId(), getOrgId(request));
+            responseBean = iTaHousingResourcesService.batchUpdateRaiseHeat(housingResources.getHouseIdList(), housingResources.getHeat(),
+                    housingResources.getSalesBatchId(), getOrgId(request), getUserId(request));
         } catch (Exception e) {
             logger.error("batchUpdateRaiseHeat -=- {}", e.toString());
             responseBean.addError(e.getMessage());

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

@@ -187,27 +187,26 @@ public class TaPreselectionRecordController extends BaseController {
     /**
      * 获取当前用户预选记录
      *
-     * @param pageNumber  页码
-     * @param pageSize 分页大小
-     * @param personId 用户ID
+     * @param pageNumber 页码
+     * @param pageSize   分页大小
+     * @param personId   用户ID
      * @return
      * @author gushaoyong
      */
     @RequestMapping(value = "/wx/listPreselectionRecord", method = RequestMethod.GET)
-    public ResponseBean listPreselectionRecord(
-                                                @RequestParam(value = "buildingId", required = false) String buildingId,
-                                                @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
-                                                @RequestParam(value = "apartmentId", required = false) String apartmentId,
-                                                @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
-                                                @RequestParam(value = "customerLocked", required = false) String customerLocked,
-                                                @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
-                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                                @RequestParam("personId") String personId,
-                                                HttpServletRequest request) {
+    public ResponseBean listPreselectionRecord(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                               @RequestParam(value = "salesBtchId", required = false) Integer salesBtchId,
+                                               @RequestParam(value = "apartmentId", required = false) String apartmentId,
+                                               @RequestParam(value = "houseLockingStatus", required = false) String houseLockingStatus,
+                                               @RequestParam(value = "customerLocked", required = false) String customerLocked,
+                                               @RequestParam(value = "pageNumber", defaultValue = "1") Integer pageNumber,
+                                               @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
+                                               @RequestParam("personId") String personId,
+                                               HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         Integer orgId = getOrgId(request);
         try {
-            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId,buildingId,salesBtchId,apartmentId,houseLockingStatus,customerLocked));
+            responseBean.addSuccess(iTaPreselectionRecordService.listPreselectionRecord(pageNumber, pageSize, orgId, personId, buildingId, salesBtchId, apartmentId, houseLockingStatus, customerLocked));
         } catch (Exception e) {
             logger.error("listPreselectionRecord -=- {}", e);
             responseBean.addError(e.getMessage());
@@ -256,7 +255,7 @@ public class TaPreselectionRecordController extends BaseController {
                                                    HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaPreselectionRecordService.batchDeletePreselectRecord(preselectionRecordList, getOrgId(request));
+            responseBean = iTaPreselectionRecordService.batchDeletePreselectRecord(preselectionRecordList, getOrgId(request), getUserId(request));
         } catch (Exception e) {
             e.printStackTrace();
             logger.error("batchDeletePreselectRecord -=- {}", e.toString());

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

@@ -111,6 +111,7 @@ public interface TaHousingResourcesMapper extends BaseMapper<TaHousingResources>
      */
     Integer batchUpdateRaiseHeat(@Param("housingResourcesList") List<TaHousingResources> housingResourcesList,
                                  @Param("raiseHeat") Integer raiseHeat,
+                                 @Param("updateUser") Integer updateUser,
                                  @Param("salesBatchId") Integer salesBatchId,
                                  @Param("orgId") Integer orgId);
 

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

@@ -33,8 +33,8 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      */
     IPage<TaPreselectionRecordPO> listPreselectionRecord(IPage<TaPreselectionRecordPO> iPage,
                                                          @Param("orgId") Integer orgId,
-                                                         @Param("personId") String personId,@Param("buildingId") String buildingId,@Param("salesBtchId") Integer salesBtchId,
-                                                         @Param("apartmentId") String apartmentId,@Param("houseLockingStatus") String houseLockingStatus,@Param("customerLocked") String customerLocked);
+                                                         @Param("personId") String personId, @Param("buildingId") String buildingId, @Param("salesBtchId") Integer salesBtchId,
+                                                         @Param("apartmentId") String apartmentId, @Param("houseLockingStatus") String houseLockingStatus, @Param("customerLocked") String customerLocked);
 
     /**
      * 根据房源ID和用户ID获取预选记录
@@ -62,5 +62,6 @@ public interface TaPreselectionRecordMapper extends BaseMapper<TaPreselectionRec
      * @param orgId
      */
     void batchDeletePreselectRecord(@Param("preselectionRecordList") List<TaPreselectionRecord> preselectionRecordList,
-                                    @Param("orgId") Integer orgId);
+                                    @Param("orgId") Integer orgId,
+                                    @Param("userId") Integer userId);
 }

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

@@ -2,6 +2,7 @@ package com.huiju.estateagents.po;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.huiju.estateagents.entity.TaBuildingImg;
+import com.huiju.estateagents.entity.TaHousingResources;
 import com.huiju.estateagents.entity.TaPreselectionRecord;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -103,4 +104,10 @@ public class TaPreselectionRecordPO extends TaPreselectionRecord {
      * 销售批次装填
      */
     private String saleBatchStatus;
+
+    /**
+     * 房源信息
+     */
+    @TableField(exist = false)
+    private TaHousingResources housingInfo;
 }

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

@@ -124,7 +124,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
      * @param orgId
      * @return
      */
-    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId);
+    ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId, Integer updateUser);
 
     /**
      * 根据认筹记录查询房源信息

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

@@ -28,7 +28,7 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      * @param personId
      * @return
      */
-    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId,String buildingId,Integer salesBtchId,String apartmentId,String houseLockingStatus,String customerLocked);
+    IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBtchId, String apartmentId, String houseLockingStatus, String customerLocked);
 
     /**
      * 添加预选记录预选
@@ -54,8 +54,9 @@ public interface ITaPreselectionRecordService extends IService<TaPreselectionRec
      *
      * @param preselectionRecordList
      * @param orgId
+     * @param userId
      * @return
      */
-    ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId);
+    ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId);
 
 }

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

@@ -240,21 +240,21 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
         resourcesPO.setPreselectionBtn(true);
         resourcesPO.setRaiseBtn(true);
         QueryWrapper<TaPreselection> taPreselectionQueryWrapper = new QueryWrapper<>();
-        taPreselectionQueryWrapper.eq("sales_batch_id",salesBatchId);
-        taPreselectionQueryWrapper.eq("org_id",orgId);
-        taPreselectionQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        taPreselectionQueryWrapper.eq("sales_batch_id", salesBatchId);
+        taPreselectionQueryWrapper.eq("org_id", orgId);
+        taPreselectionQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaPreselection taPreselection = taPreselectionMapper.selectOne(taPreselectionQueryWrapper);
-        if (null == taPreselection){
+        if (null == taPreselection) {
             resourcesPO.setPreselectionBtn(false);
         }
 
         //是否展示认筹按钮
         QueryWrapper<TaRaise> taRaiseQueryWrapper = new QueryWrapper<>();
-        taRaiseQueryWrapper.eq("sales_batch_id",salesBatchId);
-        taRaiseQueryWrapper.eq("org_id",orgId);
-        taRaiseQueryWrapper.eq("status",CommConstant.STATUS_NORMAL);
+        taRaiseQueryWrapper.eq("sales_batch_id", salesBatchId);
+        taRaiseQueryWrapper.eq("org_id", orgId);
+        taRaiseQueryWrapper.eq("status", CommConstant.STATUS_NORMAL);
         TaRaise taRaise = taRaiseMapper.selectOne(taRaiseQueryWrapper);
-        if (null == taRaise){
+        if (null == taRaise) {
             resourcesPO.setRaiseBtn(false);
         }
 
@@ -588,9 +588,10 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
     }
 
     @Override
-    public ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat, Integer salesBatchId, Integer orgId) {
+    public ResponseBean batchUpdateRaiseHeat(List<TaHousingResources> housingResourcesList, Integer raiseHeat,
+                                             Integer salesBatchId, Integer orgId, Integer updateUser) {
         ResponseBean responseBean = new ResponseBean();
-        if (taHousingResourcesMapper.batchUpdateRaiseHeat(housingResourcesList, raiseHeat, salesBatchId, orgId) > 0) {
+        if (taHousingResourcesMapper.batchUpdateRaiseHeat(housingResourcesList, raiseHeat, updateUser, salesBatchId, orgId) > 0) {
             responseBean.addSuccess("success");
         } else {
             responseBean.addError("fail");
@@ -639,6 +640,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("locked");
+                housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 
@@ -664,6 +666,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
                 TaHousingResources housingResources = new TaHousingResources();
                 housingResources.setHouseId(po.getHouseId());
                 housingResources.setHouseLockingStatus("unlocked");
+                housingResources.setUpdateUser(person.getUserId());
                 housingResources.setUpdateDate(LocalDateTime.now());
                 updateById(housingResources);
 

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

@@ -9,16 +9,14 @@ import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.bo.request.PresecretRecordRequestBO;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
-import com.huiju.estateagents.entity.TaApartmentImg;
-import com.huiju.estateagents.entity.TaBuildingImg;
-import com.huiju.estateagents.entity.TaPerson;
-import com.huiju.estateagents.entity.TaPreselectionRecord;
+import com.huiju.estateagents.entity.*;
 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.ITaHousingResourcesService;
 import com.huiju.estateagents.service.ITaPreselectionRecordService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -65,12 +63,16 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     @Autowired
     private TaPersonServiceImpl taPersonService;
 
+    @Autowired
+    private ITaHousingResourcesService taHousingResourcesService;
+
+
     @Override
-    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId,String buildingId,Integer salesBtchId,String apartmentId,String houseLockingStatus,String customerLocked) {
+    public IPage<TaPreselectionRecordPO> listPreselectionRecord(Integer pageNum, Integer pageSize, Integer orgId, String personId, String buildingId, Integer salesBtchId, String apartmentId, String houseLockingStatus, String customerLocked) {
         logger.info("listPreselectionRecord 接收参数：pageNum：{}，pageSize：{}，orgId：{}，personId：{}", pageNum, pageSize, orgId, personId);
 
         IPage<TaPreselectionRecordPO> iPage = new Page<>(pageNum, pageSize);
-        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId,buildingId,salesBtchId,apartmentId,houseLockingStatus,customerLocked);
+        iPage = taPreselectionRecordMapper.listPreselectionRecord(iPage, orgId, personId, buildingId, salesBtchId, apartmentId, houseLockingStatus, customerLocked);
 
         List<TaPreselectionRecordPO> poList = iPage.getRecords();
         if (CollectionUtils.isEmpty(poList)) {
@@ -96,6 +98,16 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
             }
             resultList.add(po);
         }
+
+        // 获取房源信息
+        resultList.stream().forEach(record -> {
+            QueryWrapper<TaHousingResources> housingQueryWrapper = new QueryWrapper<>();
+            housingQueryWrapper.eq("org_id", record.getOrgId());
+            housingQueryWrapper.eq("house_id", record.getHouseId());
+            housingQueryWrapper.ne("status", -1);
+            record.setHousingInfo(taHousingResourcesService.getOne(housingQueryWrapper));
+        });
+
         iPage.setRecords(resultList);
         return iPage;
     }
@@ -225,10 +237,10 @@ public class TaPreselectionRecordServiceImpl extends ServiceImpl<TaPreselectionR
     }
 
     @Override
-    public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId) {
+    public ResponseBean batchDeletePreselectRecord(List<TaPreselectionRecord> preselectionRecordList, Integer orgId, Integer userId) {
         ResponseBean responseBean = new ResponseBean();
 
-        taPreselectionRecordMapper.batchDeletePreselectRecord(preselectionRecordList, orgId);
+        taPreselectionRecordMapper.batchDeletePreselectRecord(preselectionRecordList, orgId, userId);
         responseBean.addSuccess("success");
         return responseBean;
     }

src/main/resources/mapper/TaHousingResourcesMapper.xml

@@ -226,7 +226,8 @@
 
     <update id="batchUpdateRaiseHeat">
         UPDATE ta_housing_resources t
-        SET t.heat = #{raiseHeat}
+        SET t.heat = #{raiseHeat},
+        t.update_user = #{updateUser}
         WHERE
         t.org_id = #{orgId}
         AND t.sales_batch_id = #{salesBatchId}

src/main/resources/mapper/TaRaiseRecordMapper.xml

@@ -6,12 +6,14 @@
         SELECT
             t.*,
             t4.apartment_name,
-            t2.raise_record_id
+            t2.raise_record_id,
+            t5.user_name updateName
         FROM
             ta_housing_resources t
             LEFT JOIN ta_raise_house t2 ON t.house_id = t2.house_id
             LEFT JOIN ta_raise_record t3 ON t2.raise_record_id = t3.raise_record_id
             LEFT JOIN ta_building_apartment t4 ON t.apartment_id = t4.apartment_id
+            LEFT JOIN ta_user t5 ON t5.user_id = t.update_user
         WHERE
             t.org_id = #{bo.orgId}
             AND t.`status` != - 1