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

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

                                             HttpServletRequest request) {
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId,getUserId(request));
             logger.info("updateLockingStatus 返回结果：", JSONObject.toJSONString(responseBean));
         } catch (Exception e) {
             logger.error("updateLockingStatus 异常：", e);

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

 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
 //            List<PublicCustomerExport> publicList = null;
 //            do {
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
                 excelWriter.write(publicList, writeSheet);
 
 //                pageCode ++;

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

 package com.huiju.estateagents.entity;
 
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableName;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.*;
+
 import java.time.LocalDateTime;
 import java.io.Serializable;
 import lombok.Data;
     /**
      * 排序
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private Integer orderNo;
 }

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

      * @param consultTel
      * @return
      */
-    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType);
+    List<PublicCustomerExport> getPublicCustomerExportList(@Param("pageCode") Integer pageCode, @Param("pageSize") Integer pageSize, @Param("buildingId")String buildingId, @Param("name") String name, @Param("tel") String tel, @Param("entryType") String entryType, @Param("verifyStatus") String verifyStatus, @Param("sex") Integer sex, @Param("orgId") Integer orgId, @Param("consultTel")String consultTel, @Param("sceneType")String sceneType,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
     /**
      * 导出数据 私客总数

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

     ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
 
     /**
-     * 更新房源锁定状态
+     * 更新房源状态
      *
      * @param houseId
      * @param type
      * @param personId
      * @return
      */
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId);
 
     /**
      * 校验房源的认筹状态

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

     }
 
     @Override
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
-        logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
-                houseId, type, orgId, raiseHouseId, personId);
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId) {
+        logger.info("updateLockingStatus 接收参数：houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{},userId:{}",
+                houseId, type, orgId, raiseHouseId, personId, userId);
         ResponseBean responseBean = new ResponseBean();
 
         // 获取房源信息
             housingResources.setHouseLockingPerson(personId);
             housingResources.setUpdateDate(LocalDateTime.now());
             housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
+            housingResources.setUpdateUser(userId);
             updateById(housingResources);
 
             //更新认筹单房源锁定状态
             housingResources.setHouseLockingStatus("unlocked");
             housingResources.setHouseLockingPerson("");
             housingResources.setUpdateDate(LocalDateTime.now());
+            housingResources.setUpdateUser(userId);
             updateById(housingResources);
 
             //更新认筹单房源锁定状态

src/main/resources/mapper/TaRecommendCustomerMapper.xml

         ( IFNULL( b.NAME, '' ) != '', b.NAME, b.nickname ) AS sharePersonName
         FROM
         ta_person b
-        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id
+        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id AND r.is_first_time = 1 and r.org_id = #{orgId}
         LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
         <where>
             b.status > 0
                 and b.nickname like CONCAT('%',#{name}, '%')
             </if>
             <if test="buildingId != null and buildingId !=''">
-                AND r.building_id = #{buildingId}
+                AND b.building_id = #{buildingId}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND r.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
             </if>
             <if test="tel != null and tel!=''">
                 and b.phone like CONCAT('%',#{tel}, '%')