魏超 5 years ago
parent
commit
08243f562b

+ 2
- 2
src/main/java/com/huiju/estateagents/controller/TaLiveActivityController.java View File

62
         ResponseBean responseBean = new ResponseBean();
62
         ResponseBean responseBean = new ResponseBean();
63
         try {
63
         try {
64
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
64
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, getOrgId(request),
65
-                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request));
65
+                    liveActivityTitle, cityId, buildingId, status, getTaPersonBuildingListByUserId(request), getUserId(request));
66
             responseBean.addSuccess(result);
66
             responseBean.addSuccess(result);
67
 
67
 
68
         } catch (Exception e) {
68
         } catch (Exception e) {
255
             status = status == null ? 1 : status;
255
             status = status == null ? 1 : status;
256
             Integer orgId = getOrgId(request);
256
             Integer orgId = getOrgId(request);
257
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
257
             IPage<TaLiveActivity> result = iTaLiveActivityService.listLiveActivityByCondition(pageNum, pageSize, orgId,
258
-                    liveActivityTitle, cityId, buildingId, status, null);
258
+                    liveActivityTitle, cityId, buildingId, status, null, null);
259
             responseBean.addSuccess(result);
259
             responseBean.addSuccess(result);
260
 
260
 
261
         } catch (Exception e) {
261
         } catch (Exception e) {

+ 1
- 1
src/main/java/com/huiju/estateagents/mapper/TaLiveActivityMapper.java View File

30
      */
30
      */
31
     Boolean addVisitNum(@Param("id") String id);
31
     Boolean addVisitNum(@Param("id") String id);
32
 
32
 
33
-    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
33
+    IPage<TaLiveActivity> selectLiveListByCondition(IPage<TaLiveActivity> pg, @Param("liveActivityTitle") String liveActivityTitle, @Param("cityId") String cityId, @Param("buildingId") String buildingId, @Param("status") Integer status, @Param("orgId") Integer orgId,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList, @Param("userId") Integer userId);
34
     /**
34
     /**
35
      * 批量更新直播活动状态
35
      * 批量更新直播活动状态
36
      *
36
      *

+ 1
- 1
src/main/java/com/huiju/estateagents/service/ITaLiveActivityService.java View File

41
      * @return
41
      * @return
42
      */
42
      */
43
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
43
     IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
44
-                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId);
44
+                                                      String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId);
45
 
45
 
46
     /**
46
     /**
47
      * 访问量自增
47
      * 访问量自增

+ 2
- 2
src/main/java/com/huiju/estateagents/service/impl/TaLiveActivityServiceImpl.java View File

104
 
104
 
105
     @Override
105
     @Override
106
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
106
     public IPage<TaLiveActivity> listLiveActivityByCondition(Integer pageNum, Integer pageSize, Integer orgId, String liveActivityTitle,
107
-                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId) {
107
+                                                             String cityId, String buildingId, Integer status, List<TaPersonBuilding> taPersonBuildingListByUserId, Integer userId) {
108
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数:pageNum:{},pageSize:{},orgId:{}," +
108
         logger.info("TaLiveActivityServiceImpl.listLiveActivityByCondition 接收参数:pageNum:{},pageSize:{},orgId:{}," +
109
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
109
                     "liveActivityTitle:{},cityId:{},buildingId:{},liveDetailType:{},status:{}", pageNum, pageSize,
110
                 liveActivityTitle, cityId, buildingId, status);
110
                 liveActivityTitle, cityId, buildingId, status);
111
 
111
 
112
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
112
         IPage<TaLiveActivity> pg = new Page<>(pageNum, pageSize);
113
-        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId);
113
+        return taLiveActivityMapper.selectLiveListByCondition(pg, liveActivityTitle, cityId, buildingId, status, orgId,taPersonBuildingListByUserId, userId);
114
     }
114
     }
115
 
115
 
116
     @Override
116
     @Override

+ 4
- 2
src/main/java/com/huiju/estateagents/statistic/controller/ActivityStatisticController.java View File

244
                                                @RequestParam(value = "activityId", required = false)String activityId,
244
                                                @RequestParam(value = "activityId", required = false)String activityId,
245
                                                @RequestParam(value = "activityType", required = false)String activityType,
245
                                                @RequestParam(value = "activityType", required = false)String activityType,
246
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
246
                                                @RequestParam(value = "buildingId", required = false)String buildingId,
247
+                                               @RequestParam(value = "province", required = false)String province,
247
                                                HttpServletRequest request) {
248
                                                HttpServletRequest request) {
248
-        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
249
+        return taActivityStaticService.selectActivityAddRegistNum(pageNum, pageSize, getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
249
     }
250
     }
250
 
251
 
251
     /**
252
     /**
259
                                                                @RequestParam(value = "activityId", required = false)String activityId,
260
                                                                @RequestParam(value = "activityId", required = false)String activityId,
260
                                                                @RequestParam(value = "activityType", required = false)String activityType,
261
                                                                @RequestParam(value = "activityType", required = false)String activityType,
261
                                                                @RequestParam(value = "buildingId", required = false)String buildingId,
262
                                                                @RequestParam(value = "buildingId", required = false)String buildingId,
263
+                                                               @RequestParam(value = "province", required = false)String province,
262
                                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
264
                                                                HttpServletRequest request, HttpServletResponse response) throws IOException {
263
         response.setContentType("application/octet-stream");
265
         response.setContentType("application/octet-stream");
264
         response.setCharacterEncoding("utf-8");
266
         response.setCharacterEncoding("utf-8");
266
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
268
         ExcelWriter excelWriter = EasyExcel.write(response.getOutputStream(), AddRegistNum.class).registerWriteHandler(new CustomCellWriteHandler()).build();
267
         // 设置 sheet, 同一个sheet只需要设置一次
269
         // 设置 sheet, 同一个sheet只需要设置一次
268
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
270
         WriteSheet writeSheet = EasyExcel.writerSheet("活动统计").build();
269
-        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, getTaPersonBuildingListByUserId(request), getUserId(request));
271
+        List<AddRegistNum> data = taActivityStaticService.selectActivityAddRegistNumExport(getOrgId(request), startDate, endDate, personFrom, activityId, activityType, buildingId, province, getTaPersonBuildingListByUserId(request), getUserId(request));
270
         excelWriter.write(data, writeSheet);
272
         excelWriter.write(data, writeSheet);
271
         // finish 会帮忙关闭流
273
         // finish 会帮忙关闭流
272
         excelWriter.finish();
274
         excelWriter.finish();

+ 2
- 0
src/main/java/com/huiju/estateagents/statistic/mapper/TaActicityStaticMapper.java View File

196
             @Param("activityId") String activityId,
196
             @Param("activityId") String activityId,
197
             @Param("activityType") String activityType,
197
             @Param("activityType") String activityType,
198
             @Param("buildingId") String buildingId,
198
             @Param("buildingId") String buildingId,
199
+            @Param("province") String province,
199
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
200
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
200
             @Param("userId") Integer userId
201
             @Param("userId") Integer userId
201
     );
202
     );
208
             @Param("activityId") String activityId,
209
             @Param("activityId") String activityId,
209
             @Param("activityType") String activityType,
210
             @Param("activityType") String activityType,
210
             @Param("buildingId") String buildingId,
211
             @Param("buildingId") String buildingId,
212
+            @Param("province") String province,
211
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
213
             @Param("taPersonBuildings") List<TaPersonBuilding> taPersonBuildings,
212
             @Param("userId") Integer userId
214
             @Param("userId") Integer userId
213
     );
215
     );

+ 4
- 4
src/main/java/com/huiju/estateagents/statistic/service/impl/TaActivityStaticServiceImpl.java View File

141
         return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
141
         return taActicityStaticMapper.selectActivityShareNumExport( orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), sharePersonType, sharePersonName, sharePhone, activityId, activityType, personId, buildingId, sortType, colKey, taPersonBuildings, userId);
142
     }
142
     }
143
 
143
 
144
-    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
144
+    public ResponseBean selectActivityAddRegistNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
145
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
145
         IPage<AddRegistNum> iPage = new Page<>(pageNum, pageSize);
146
-        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
146
+        IPage<AddRegistNum> data = taActicityStaticMapper.selectActivityAddRegistNum(iPage, orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
147
         return ResponseBean.success(data);
147
         return ResponseBean.success(data);
148
     }
148
     }
149
 
149
 
150
-    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, List<TaPersonBuilding> taPersonBuildings, Integer userId){
151
-        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, taPersonBuildings, userId);
150
+    public List<AddRegistNum> selectActivityAddRegistNumExport(Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String activityId, String activityType, String buildingId, String province, List<TaPersonBuilding> taPersonBuildings, Integer userId){
151
+        return taActicityStaticMapper.selectActivityAddRegistNumExport(orgId, LocalDateTime.of(startDate, LocalTime.MAX), LocalDateTime.of(endDate, LocalTime.MAX), personFrom, activityId, activityType, buildingId, province, taPersonBuildings, userId);
152
     }
152
     }
153
 
153
 
154
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){
154
     public ResponseBean selectActivityVisitNum(Integer pageNum, Integer pageSize, Integer orgId, LocalDate startDate, LocalDate endDate, String personFrom, String provice, String realtyConsultant, String realtyConsultantPhone, String activityId, String activityType, String personId, String buildingId){

+ 2
- 1
src/main/resources/mapper/TaLiveActivityMapper.xml View File

40
          and t.building_id = #{buildingId}
40
          and t.building_id = #{buildingId}
41
     </if>
41
     </if>
42
     <if test="personBuildingList != null and personBuildingList.size > 0">
42
     <if test="personBuildingList != null and personBuildingList.size > 0">
43
-        AND t.building_id in
43
+        AND (t.building_id in
44
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
44
         <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
45
             #{personBuilding.buildingId}
45
             #{personBuilding.buildingId}
46
         </foreach>
46
         </foreach>
47
+        or t.create_user = #{userId})
47
     </if>
48
     </if>
48
         order by t.weight desc
49
         order by t.weight desc
49
     </select>
50
     </select>

+ 33
- 17
src/main/resources/mapper/statistic/TaActivityStaticMapper.xml View File

170
         sequence a
170
         sequence a
171
         <trim prefix="where">
171
         <trim prefix="where">
172
             <if test="startDate != null or endDate != null">
172
             <if test="startDate != null or endDate != null">
173
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
173
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
174
             </if>
174
             </if>
175
         </trim>
175
         </trim>
176
         ) AS temp_date
176
         ) AS temp_date
248
         sequence a
248
         sequence a
249
         <trim prefix="where">
249
         <trim prefix="where">
250
             <if test="startDate != null or endDate != null">
250
             <if test="startDate != null or endDate != null">
251
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
251
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
252
             </if>
252
             </if>
253
         </trim>
253
         </trim>
254
         ) AS temp_date
254
         ) AS temp_date
326
         sequence a
326
         sequence a
327
         <trim prefix="where">
327
         <trim prefix="where">
328
             <if test="startDate != null or endDate != null">
328
             <if test="startDate != null or endDate != null">
329
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
329
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
330
             </if>
330
             </if>
331
         </trim>
331
         </trim>
332
         ) AS temp_date
332
         ) AS temp_date
376
         sequence a
376
         sequence a
377
         <trim prefix="where">
377
         <trim prefix="where">
378
             <if test="startDate != null or endDate != null">
378
             <if test="startDate != null or endDate != null">
379
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
379
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
380
             </if>
380
             </if>
381
         </trim>
381
         </trim>
382
         ) AS temp_date
382
         ) AS temp_date
425
         sequence a
425
         sequence a
426
         <trim prefix="where">
426
         <trim prefix="where">
427
             <if test="startDate != null or endDate != null">
427
             <if test="startDate != null or endDate != null">
428
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
428
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
429
             </if>
429
             </if>
430
         </trim>
430
         </trim>
431
         ) AS temp_date
431
         ) AS temp_date
481
         sequence a
481
         sequence a
482
         <trim prefix="where">
482
         <trim prefix="where">
483
             <if test="startDate != null or endDate != null">
483
             <if test="startDate != null or endDate != null">
484
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
484
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
485
             </if>
485
             </if>
486
         </trim>
486
         </trim>
487
         ) AS temp_date
487
         ) AS temp_date
694
         sequence a
694
         sequence a
695
         <trim prefix="where">
695
         <trim prefix="where">
696
             <if test="startDate != null or endDate != null">
696
             <if test="startDate != null or endDate != null">
697
-                a.rownum <![CDATA[ <= ]]> datediff(#{endDate}, #{startDate})
697
+                a.rownum <![CDATA[ < ]]> datediff(#{endDate}, #{startDate})
698
             </if>
698
             </if>
699
         </trim>
699
         </trim>
700
         ) AS temp_date
700
         ) AS temp_date
961
             and d.name like concat('%', #{activityName}, '%')
961
             and d.name like concat('%', #{activityName}, '%')
962
         </if>
962
         </if>
963
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
963
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
964
-            and d.building_id in
964
+            and (d.building_id in
965
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
965
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
966
                 #{taPersonBuilding.buildingId}
966
                 #{taPersonBuilding.buildingId}
967
             </foreach>
967
             </foreach>
968
+            or d.create_user = #{userId}
969
+            )
968
         </if>
970
         </if>
969
         union all
971
         union all
970
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
972
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
977
             and e.live_activity_title like concat('%', #{activityName}, '%')
979
             and e.live_activity_title like concat('%', #{activityName}, '%')
978
         </if>
980
         </if>
979
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
981
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
980
-            and e.building_id in
982
+            and (e.building_id in
981
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
983
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
982
                 #{taPersonBuilding.buildingId}
984
                 #{taPersonBuilding.buildingId}
983
             </foreach>
985
             </foreach>
986
+            or e.create_user = #{userId}
987
+            )
984
         </if>
988
         </if>
985
         ) as activity
989
         ) as activity
986
 
990
 
1169
             and d.name = #{activityName}
1173
             and d.name = #{activityName}
1170
         </if>
1174
         </if>
1171
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
1175
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
1172
-            and c.building_id in
1176
+            and (d.building_id in
1173
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
1177
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
1174
                 #{taPersonBuilding.buildingId}
1178
                 #{taPersonBuilding.buildingId}
1175
             </foreach>
1179
             </foreach>
1180
+            or d.create_user = #{userId}
1181
+            )
1176
         </if>
1182
         </if>
1177
         union all
1183
         union all
1178
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
1184
         select e.live_activity_id as activityId, e.live_activity_title as activityName, "live" as activityType From
1185
             and e.live_activity_title = #{activityName}
1191
             and e.live_activity_title = #{activityName}
1186
         </if>
1192
         </if>
1187
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
1193
         <if test="taPersonBuildings != null and taPersonBuildings.size > 0">
1188
-            and e.building_id in
1194
+            and (e.building_id in
1189
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
1195
             <foreach collection="taPersonBuildings" item="taPersonBuilding" open="(" close=")" separator=",">
1190
                 #{taPersonBuilding.buildingId}
1196
                 #{taPersonBuilding.buildingId}
1191
             </foreach>
1197
             </foreach>
1198
+            or e.create_user = #{userId}
1199
+            )
1192
         </if>
1200
         </if>
1193
         ) as activity
1201
         ) as activity
1194
 
1202
 
1416
         <if test="activityType != null and activityType != ''">
1424
         <if test="activityType != null and activityType != ''">
1417
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
1425
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
1418
         </if>
1426
         </if>
1419
-        and t.org_id = #{orgId} group by t.share_person ) t
1427
+        and t.org_id = #{orgId} ) t
1420
         left join ta_person a on t.share_person = a.person_id
1428
         left join ta_person a on t.share_person = a.person_id
1421
         left join ta_person b on t.share_person = b.user_id
1429
         left join ta_person b on t.share_person = b.user_id
1422
         ) as visitNum on visitNum.person_id = person.person_id
1430
         ) as visitNum on visitNum.person_id = person.person_id
1440
         left join ta_person a on t.share_person = a.person_id
1448
         left join ta_person a on t.share_person = a.person_id
1441
         left join ta_person b on t.share_person = b.user_id
1449
         left join ta_person b on t.share_person = b.user_id
1442
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1450
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1451
+        group by person.person_id
1443
         <if test="colKey == null or colKey == ''">
1452
         <if test="colKey == null or colKey == ''">
1444
             order by person.create_date desc
1453
             order by person.create_date desc
1445
         </if>
1454
         </if>
1555
         <if test="activityType != null and activityType != ''">
1564
         <if test="activityType != null and activityType != ''">
1556
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
1565
             and t.target_type = concat(REPLACE(#{activityType}, 'activity', 'dynamic'), '_share')
1557
         </if>
1566
         </if>
1558
-        and t.org_id = #{orgId} group by t.share_person ) t
1567
+        and t.org_id = #{orgId} ) t
1559
         left join ta_person a on t.share_person = a.person_id
1568
         left join ta_person a on t.share_person = a.person_id
1560
         left join ta_person b on t.share_person = b.user_id
1569
         left join ta_person b on t.share_person = b.user_id
1561
         ) as visitNum on visitNum.person_id = person.person_id
1570
         ) as visitNum on visitNum.person_id = person.person_id
1579
         left join ta_person a on t.share_person = a.person_id
1588
         left join ta_person a on t.share_person = a.person_id
1580
         left join ta_person b on t.share_person = b.user_id
1589
         left join ta_person b on t.share_person = b.user_id
1581
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1590
         ) as visitPersonNum on visitPersonNum.person_id = person.person_id
1591
+        group by person.person_id
1582
         <if test="colKey == null or colKey == ''">
1592
         <if test="colKey == null or colKey == ''">
1583
             order by person.create_date desc
1593
             order by person.create_date desc
1584
         </if>
1594
         </if>
1784
         a.nickname, a.phone,
1794
         a.nickname, a.phone,
1785
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
1795
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
1786
         a.province,
1796
         a.province,
1787
-        b1.scene_name as personFrom,
1797
+        b1.scene_alias as personFrom,
1788
         GROUP_CONCAT(c.name) as realtyConsultant,
1798
         GROUP_CONCAT(c.name) as realtyConsultant,
1789
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
1799
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
1790
         ifnull(e.nickname, f.user_name) as sharePersonName,
1800
         ifnull(e.nickname, f.user_name) as sharePersonName,
1791
         ifnull(e.phone, e.tel) as sharePersonPhone
1801
         ifnull(e.phone, e.tel) as sharePersonPhone
1792
         FROM ta_share_person_from t
1802
         FROM ta_share_person_from t
1793
         left join ta_person a on t.person_id = a.person_id
1803
         left join ta_person a on t.person_id = a.person_id
1794
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
1804
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
1795
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
1805
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
1796
         left join ta_recommend_customer c on c.person_id = t.person_id
1806
         left join ta_recommend_customer c on c.person_id = t.person_id
1797
         left join ta_person d on c.recommend_person = d.person_id
1807
         left join ta_person d on c.recommend_person = d.person_id
1808
         <if test="activityType != null and activityType != ''">
1818
         <if test="activityType != null and activityType != ''">
1809
             and t.target_type = concat(#{activityType}, '_share')
1819
             and t.target_type = concat(#{activityType}, '_share')
1810
         </if>
1820
         </if>
1821
+        <if test="province != null and province != ''">
1822
+            and a.province like concat('%', #{province}, '%')
1823
+        </if>
1811
         <if test="personFrom != null and personFrom != ''">
1824
         <if test="personFrom != null and personFrom != ''">
1812
             and b.scene_type = #{personFrom}
1825
             and b.scene_type = #{personFrom}
1813
         </if>
1826
         </if>
1823
         a.nickname, a.phone,
1836
         a.nickname, a.phone,
1824
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
1837
         if(a.gender = '1', '男', if(a.gender = '2', '女','未知') ) as gender,
1825
         a.province,
1838
         a.province,
1826
-        b1.scene_name as personFrom,
1839
+        b1.scene_alias as personFrom,
1827
         GROUP_CONCAT(c.name) as realtyConsultant,
1840
         GROUP_CONCAT(c.name) as realtyConsultant,
1828
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
1841
         ifnull(d.phone, d.tel) as realtyConsultantPhone,
1829
         ifnull(e.nickname, f.user_name) as sharePersonName,
1842
         ifnull(e.nickname, f.user_name) as sharePersonName,
1830
         ifnull(e.phone, e.tel) as sharePersonPhone
1843
         ifnull(e.phone, e.tel) as sharePersonPhone
1831
         FROM ta_share_person_from t
1844
         FROM ta_share_person_from t
1832
         left join ta_person a on t.person_id = a.person_id
1845
         left join ta_person a on t.person_id = a.person_id
1833
-        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = 84 and b.is_first_time =1
1846
+        left join ta_person_from_record b on a.person_id = b.person_id and b.org_id = #{orgId} and b.is_first_time =1
1834
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
1847
         left join td_wx_dict b1 on b.scene_id = b1.scene_id
1835
         left join ta_recommend_customer c on c.person_id = t.person_id
1848
         left join ta_recommend_customer c on c.person_id = t.person_id
1836
         left join ta_person d on c.recommend_person = d.person_id
1849
         left join ta_person d on c.recommend_person = d.person_id
1847
         <if test="activityType != null and activityType != ''">
1860
         <if test="activityType != null and activityType != ''">
1848
             and t.target_type = concat(#{activityType}, '_share')
1861
             and t.target_type = concat(#{activityType}, '_share')
1849
         </if>
1862
         </if>
1863
+        <if test="province != null and province != ''">
1864
+            and a.province like concat('%', #{province}, '%')
1865
+        </if>
1850
         <if test="personFrom != null and personFrom != ''">
1866
         <if test="personFrom != null and personFrom != ''">
1851
             and b.scene_type = #{personFrom}
1867
             and b.scene_type = #{personFrom}
1852
         </if>
1868
         </if>