瀏覽代碼

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

魏超 5 年之前
父節點
當前提交
0c819f363b

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaHousingResourcesController.java 查看文件

@@ -529,7 +529,7 @@ public class TaHousingResourcesController extends BaseController {
529 529
                                             HttpServletRequest request) {
530 530
         ResponseBean responseBean = new ResponseBean();
531 531
         try {
532
-            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId);
532
+            responseBean = iTaHousingResourcesService.updateLockingStatus(houseId, type, getOrgId(request), raiseHouseId, personId, raiseRecordId,getUserId(request));
533 533
             logger.info("updateLockingStatus 返回结果:", JSONObject.toJSONString(responseBean));
534 534
         } catch (Exception e) {
535 535
             logger.error("updateLockingStatus 异常:", e);

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaRecommendCustomerController.java 查看文件

@@ -819,7 +819,7 @@ public class TaRecommendCustomerController extends BaseController {
819 819
 //            pageCount = count % pageSize == 0 ? count / pageSize : (count / pageSize) + 1;
820 820
 //            List<PublicCustomerExport> publicList = null;
821 821
 //            do {
822
-                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType);
822
+                List<PublicCustomerExport> publicList = taRecommendCustomerMapper.getPublicCustomerExportList(pageCode * pageSize, pageSize, buildingId, name, tel,  entryType, verifyStatus, sex, orgId,consultTel,sceneType,getTaPersonBuildingListByUserId(request));
823 823
                 excelWriter.write(publicList, writeSheet);
824 824
 
825 825
 //                pageCode ++;

+ 3
- 4
src/main/java/com/huiju/estateagents/entity/ExtendContent.java 查看文件

@@ -1,9 +1,7 @@
1 1
 package com.huiju.estateagents.entity;
2 2
 
3
-import com.baomidou.mybatisplus.annotation.TableField;
4
-import com.baomidou.mybatisplus.annotation.TableName;
5
-import com.baomidou.mybatisplus.annotation.IdType;
6
-import com.baomidou.mybatisplus.annotation.TableId;
3
+import com.baomidou.mybatisplus.annotation.*;
4
+
7 5
 import java.time.LocalDateTime;
8 6
 import java.io.Serializable;
9 7
 import lombok.Data;
@@ -104,5 +102,6 @@ public class ExtendContent implements Serializable {
104 102
     /**
105 103
      * 排序
106 104
      */
105
+    @TableField(strategy = FieldStrategy.IGNORED)
107 106
     private Integer orderNo;
108 107
 }

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaRecommendCustomerMapper.java 查看文件

@@ -119,7 +119,7 @@ public interface TaRecommendCustomerMapper extends BaseMapper<TaRecommendCustome
119 119
      * @param consultTel
120 120
      * @return
121 121
      */
122
-    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);
122
+    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);
123 123
 
124 124
     /**
125 125
      * 导出数据 私客总数

+ 2
- 2
src/main/java/com/huiju/estateagents/service/ITaHousingResourcesService.java 查看文件

@@ -162,7 +162,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
162 162
     ResponseBean listHouseByRaiseRecordId(Integer raiseRecordId, Integer orgId, Integer pageNumber, Integer pageSize);
163 163
 
164 164
     /**
165
-     * 更新房源锁定状态
165
+     * 更新房源状态
166 166
      *
167 167
      * @param houseId
168 168
      * @param type
@@ -170,7 +170,7 @@ public interface ITaHousingResourcesService extends IService<TaHousingResources>
170 170
      * @param personId
171 171
      * @return
172 172
      */
173
-    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId);
173
+    ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId);
174 174
 
175 175
     /**
176 176
      * 校验房源的认筹状态

+ 5
- 3
src/main/java/com/huiju/estateagents/service/impl/TaHousingResourcesServiceImpl.java 查看文件

@@ -650,9 +650,9 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
650 650
     }
651 651
 
652 652
     @Override
653
-    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId) {
654
-        logger.info("updateLockingStatus 接收参数:houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{}",
655
-                houseId, type, orgId, raiseHouseId, personId);
653
+    public ResponseBean updateLockingStatus(Integer houseId, String type, Integer orgId, Integer raiseHouseId, String personId, Integer raiseRecordId, Integer userId) {
654
+        logger.info("updateLockingStatus 接收参数:houseId:{},type:{},orgId:{},raiseHouseId:{},personId:{},userId:{}",
655
+                houseId, type, orgId, raiseHouseId, personId, userId);
656 656
         ResponseBean responseBean = new ResponseBean();
657 657
 
658 658
         // 获取房源信息
@@ -685,6 +685,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
685 685
             housingResources.setHouseLockingPerson(personId);
686 686
             housingResources.setUpdateDate(LocalDateTime.now());
687 687
             housingResources.setHouseLockingPerson(raiseRecord.getPersonId());
688
+            housingResources.setUpdateUser(userId);
688 689
             updateById(housingResources);
689 690
 
690 691
             //更新认筹单房源锁定状态
@@ -715,6 +716,7 @@ public class TaHousingResourcesServiceImpl extends ServiceImpl<TaHousingResource
715 716
             housingResources.setHouseLockingStatus("unlocked");
716 717
             housingResources.setHouseLockingPerson("");
717 718
             housingResources.setUpdateDate(LocalDateTime.now());
719
+            housingResources.setUpdateUser(userId);
718 720
             updateById(housingResources);
719 721
 
720 722
             //更新认筹单房源锁定状态

+ 8
- 2
src/main/resources/mapper/TaRecommendCustomerMapper.xml 查看文件

@@ -247,7 +247,7 @@ FROM
247 247
         ( IFNULL( b.NAME, '' ) != '', b.NAME, b.nickname ) AS sharePersonName
248 248
         FROM
249 249
         ta_person b
250
-        LEFT JOIN ta_person_from_record r ON r.share_person_id = b.person_id
250
+        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}
251 251
         LEFT JOIN td_wx_dict d ON r.scene_id = d.scene_id
252 252
         <where>
253 253
             b.status > 0
@@ -564,7 +564,13 @@ FROM
564 564
                 and b.nickname like CONCAT('%',#{name}, '%')
565 565
             </if>
566 566
             <if test="buildingId != null and buildingId !=''">
567
-                AND r.building_id = #{buildingId}
567
+                AND b.building_id = #{buildingId}
568
+            </if>
569
+            <if test="personBuildingList != null and personBuildingList.size > 0">
570
+                AND r.building_id in
571
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
572
+                    #{personBuilding.buildingId}
573
+                </foreach>
568 574
             </if>
569 575
             <if test="tel != null and tel!=''">
570 576
                 and b.phone like CONCAT('%',#{tel}, '%')