胡轶钦 5 lat temu
rodzic
commit
4624bb9c84

+ 1
- 1
src/main/java/com/huiju/estateagents/controller/TaBuildingDynamicController.java Wyświetl plik

161
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
161
                 return responseBean.error("验证人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
162
             }
162
             }
163
             TaPerson person = taPersons.get(0);
163
             TaPerson person = taPersons.get(0);
164
-            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person));
164
+            responseBean.addSuccess(iBuildingDynamicService.getJoinedActivity(pageNumber,pageSize,"",person,orgId));
165
         }else {
165
         }else {
166
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
166
             responseBean = iBuildingDynamicService.getWxBuildingDynamiceList(pageNumber,pageSize,buildingId,openid,cityId,orgId);
167
         }
167
         }

+ 3
- 0
src/main/java/com/huiju/estateagents/entity/TaRecommendCustomer.java Wyświetl plik

176
     @TableField(exist = false)
176
     @TableField(exist = false)
177
     private String recommendTel;
177
     private String recommendTel;
178
 
178
 
179
+    @TableField(exist = false)
180
+    private String intentionName;
181
+
179
     /**
182
     /**
180
      * 推广人
183
      * 推广人
181
      */
184
      */

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaBuildingDynamicService.java Wyświetl plik

83
      */
83
      */
84
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
84
     ResponseBean signList(Page<TaActivityDynamicEnlist> page,String dynamicId, Integer orgId,String isCheckin,String name,String phone);
85
 
85
 
86
-    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person);
86
+    IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize, String building, TaPerson person,Integer orgId);
87
 
87
 
88
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
88
     void setExtendInfo(TaBuildingDynamic taBuildingDynamic, TaPerson taPerson);
89
 
89
 

+ 2
- 1
src/main/java/com/huiju/estateagents/service/impl/TaBuildingDynamicServiceImpl.java Wyświetl plik

357
     }
357
     }
358
 
358
 
359
     @Override
359
     @Override
360
-    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person){
360
+    public IPage<TaBuildingDynamic> getJoinedActivity(int pageNumber, int pageSize,String building,TaPerson person,Integer orgId){
361
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
361
         QueryWrapper<TaActivityDynamicEnlist> activityDynamicEnlistQueryWrapper = new QueryWrapper<>();
362
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
362
         activityDynamicEnlistQueryWrapper.eq("phone",person.getPhone());
363
+        activityDynamicEnlistQueryWrapper.eq("org_id",orgId);
363
         if(!StringUtils.isEmpty(building)){
364
         if(!StringUtils.isEmpty(building)){
364
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
365
             activityDynamicEnlistQueryWrapper.eq("building_id",building);
365
         }
366
         }

+ 3
- 1
src/main/resources/mapper/TaRecommendCustomerMapper.xml Wyświetl plik

106
         a.*,
106
         a.*,
107
         a.customer_id AS customerId,
107
         a.customer_id AS customerId,
108
         b.NAME AS consultantName,
108
         b.NAME AS consultantName,
109
-        b.tel AS consultTel
109
+        b.tel AS consultTel,
110
+        c.building_name as intentionName
110
         FROM
111
         FROM
111
         ta_recommend_customer a
112
         ta_recommend_customer a
112
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
113
         LEFT JOIN ta_person b ON a.realty_consultant = b.person_id
114
+        LEFT JOIN ta_building c ON a.building_id = c.building_id
113
         <where>
115
         <where>
114
             a.status > 0
116
             a.status > 0
115
             and a.report_recommend_status = 1
117
             and a.report_recommend_status = 1